Fixes (Holiber Feedback)

- Updated update timer, passes Date.now() - Removed unecessary injection - Removed uuid mentions - Added TODO comment
stream-labs · holiber · Feb 27, 2019 · Jul 31, 2018 · Jul 31, 2018 · Aug 1, 2018
commit f3a9325fea1a7251b865e0d94dcead292453f8fb
diff --git a/app/components/custom-source-properties/WidgetProperties.vue.ts b/app/components/custom-source-properties/WidgetProperties.vue.ts
@@ -3,7 +3,6 @@ import { Component, Prop } from 'vue-property-decorator';
 import { ISourceApi } from 'services/sources';
 import { WidgetType } from 'services/widgets';
 import { NavigationService } from 'services/navigation';
-import { ChatbotApiService } from 'services/chatbot';
 import { WindowsService } from 'services/windows';
 import { Inject } from 'util/injector';
 import { UserService } from 'services/user';
@@ -15,7 +14,6 @@ export default class WidgetProperties extends Vue {
   @Inject() navigationService: NavigationService;
   @Inject() windowsService: WindowsService;
   @Inject() userService: UserService;
-  @Inject() chatbotApiChatbotApiService: ChatbotApiService;
 
   get isLoggedIn() {
     return this.userService.isLoggedIn();

diff --git a/app/components/page-components/Chatbot/ChatbotModules.vue.ts b/app/components/page-components/Chatbot/ChatbotModules.vue.ts
@@ -41,6 +41,7 @@ export default class ChatbotModules extends ChatbotBase {
           });
         },
       },
+      //  TODO: Commented for the time being seeing as it's not ready
       /*{
         title: $t('Song Request'),
         description: $t(

diff --git a/app/components/page-components/Chatbot/windows/ChatbotCommandPreferencesWindow.vue.ts b/app/components/page-components/Chatbot/windows/ChatbotCommandPreferencesWindow.vue.ts
@@ -34,21 +34,18 @@ export default class ChatbotCommandPreferencesWindow extends ChatbotWindowsBase
         required: true,
         max: 450,
         placeholder: $t('Cost Message'),
-        uuid: $t('Cost Message'),
       }),
       permission: metadataHelper.text({
         type: EInputType.text,
         required: true,
         max: 450,
         placeholder: $t('Permission Message'),
-        uuid: $t('Permission Message'),
       }),
       cooldown: metadataHelper.text({
         type: EInputType.text,
         required: true,
         max: 450,
         placeholder: $t('Cooldown Message'),
-        uuid: $t('Cooldown Message'),
       }),
     };
   }

diff --git a/app/services/chatbot/chatbot-betting.ts b/app/services/chatbot/chatbot-betting.ts
@@ -75,9 +75,11 @@ export class ChatbotBettingApiService extends PersistentStatefulService<
       this.socket.removeAllListeners();
     }
 
-    this.UPDATE_TIMER();
+    this.UPDATE_TIMER(Date.now());
     // @ts-ignore - weird stuff going on with NodeJs.Timer & number ...
-    this.timer = setInterval(this.UPDATE_TIMER, 1000);
+    this.timer = setInterval(() => {
+      this.UPDATE_TIMER(Date.now());
+    }, 1000);
 
     this.socket = io.connect(
       this.socketUrl,
@@ -254,10 +256,12 @@ export class ChatbotBettingApiService extends PersistentStatefulService<
   //  Timer
   //
   @mutation()
-  private UPDATE_TIMER() {
+  private UPDATE_TIMER(now: number) {
     const activePoll = this.state.activeBettingResponse;
     const containsSettings =
-      activePoll.settings !== undefined && activePoll.settings.timer !== undefined;
+      activePoll.settings !== undefined &&
+      activePoll.settings.timer !== undefined &&
+      activePoll.settings.timer.enabled !== null;
 
     if (!containsSettings) {
       return;
@@ -267,13 +271,13 @@ export class ChatbotBettingApiService extends PersistentStatefulService<
     const startedTimer = activePoll.settings.timer.started_at !== undefined;
 
     if (containsSettings && containsTimer && startedTimer) {
-      const timeElapsed = Date.now() - activePoll.settings.timer.started_at;
+      const timeElapsed = now - activePoll.settings.timer.started_at;
       const timerLength = activePoll.settings.timer.time_remaining * 1000;
 
       const duration = moment.duration(Math.max(0, timerLength - timeElapsed));
       this.state.timeRemaining = moment.utc(duration.asMilliseconds()).format('HH:mm:ss');
     } else if (!activePoll.settings.timer.enabled) {
-      const timeElapsed = Date.now() - Date.parse(activePoll.created_at);
+      const timeElapsed = now - Date.parse(activePoll.created_at);
       const duration = moment.duration(Math.max(0, timeElapsed));
       this.state.timeRemaining = moment.utc(duration.asMilliseconds()).format('HH:mm:ss');
     }

diff --git a/app/services/chatbot/chatbot-poll.ts b/app/services/chatbot/chatbot-poll.ts
@@ -69,9 +69,11 @@ export class ChatbotPollApiService extends PersistentStatefulService<IChatbotPol
       this.socket.removeAllListeners();
     }
 
-    this.UPDATE_TIMER();
+    this.UPDATE_TIMER(Date.now());
     // @ts-ignore - weird stuff going on with NodeJs.Timer & number ...
-    this.timer = setInterval(this.UPDATE_TIMER, 1000);
+    this.timer = setInterval(() => {
+      this.UPDATE_TIMER(Date.now());
+    }, 1000);
 
     this.socket = io.connect(
       this.socketUrl,
@@ -238,10 +240,12 @@ export class ChatbotPollApiService extends PersistentStatefulService<IChatbotPol
   //  Timer
   //
   @mutation()
-  private UPDATE_TIMER() {
+  private UPDATE_TIMER(now: number) {
     const activePoll = this.state.activePollResponse;
     const containsSettings =
-      activePoll.settings !== undefined && activePoll.settings.timer !== undefined;
+      activePoll.settings !== undefined &&
+      activePoll.settings.timer !== undefined &&
+      activePoll.settings.timer.enabled !== null;
 
     if (!containsSettings) {
       return;
@@ -251,13 +255,13 @@ export class ChatbotPollApiService extends PersistentStatefulService<IChatbotPol
     const startedTimer = activePoll.settings.timer.started_at !== undefined;
 
     if (containsSettings && containsTimer && startedTimer) {
-      const timeElapsed = Date.now() - activePoll.settings.timer.started_at;
+      const timeElapsed = now - activePoll.settings.timer.started_at;
       const timerLength = activePoll.settings.timer.time_remaining * 1000;
-
       const duration = moment.duration(Math.max(0, timerLength - timeElapsed));
+
       this.state.timeRemaining = moment.utc(duration.asMilliseconds()).format('HH:mm:ss');
     } else if (!activePoll.settings.timer.enabled) {
-      const timeElapsed = Date.now() - Date.parse(activePoll.created_at);
+      const timeElapsed = now - Date.parse(activePoll.created_at);
       const duration = moment.duration(Math.max(0, timeElapsed));
       this.state.timeRemaining = moment.utc(duration.asMilliseconds()).format('HH:mm:ss');
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ export default class ChatbotModules extends ChatbotBase { @@
               });
             },
           },
+          //  TODO: Commented for the time being seeing as it's not ready
           /*{
             title: $t('Song Request'),
             description: $t(
@@ Expand Down @@