diff --git a/backend/chat/chat-listeners/active-user-handler.js b/backend/chat/chat-listeners/active-user-handler.js index f3cb9d829..0a4529da1 100644 --- a/backend/chat/chat-listeners/active-user-handler.js +++ b/backend/chat/chat-listeners/active-user-handler.js @@ -190,7 +190,7 @@ exports.addActiveUser = async (chatUser, includeInOnline = false, forceActive = ...(chatUser.isVip ? ['vip'] : []) ], profilePicUrl: (await chatHelpers.getUserProfilePicUrl(chatUser.userId)), - disableViewerList: !!user.disableViewerList + disableViewerList: !!user?.disableViewerList }; if (user == null) { diff --git a/backend/effects/queues/effect-queue-runner.js b/backend/effects/queues/effect-queue-runner.js index 216c230f0..b4fc36f5d 100644 --- a/backend/effects/queues/effect-queue-runner.js +++ b/backend/effects/queues/effect-queue-runner.js @@ -51,12 +51,13 @@ class EffectQueue { }, this.interval * 1000); } else if (this.mode === "auto") { effectRunner.runEffects(runEffectsContext) - .then(() => { - resolve(this.runQueue()); - }) .catch(err => { logger.warn(`Error while processing effects for queue ${this.id}`, err); - resolve(this.runQueue()); + }) + .finally(() => { + setTimeout(() => { + resolve(this.runQueue()); + }, (this.interval || 0) * 1000); }); } else if (this.mode === "custom") { effectRunner.runEffects(runEffectsContext) @@ -66,16 +67,6 @@ class EffectQueue { setTimeout(() => { resolve(this.runQueue()); }, (duration || 0) * 1000); - } else if (this.mode === "sequential") { - effectRunner.runEffects(runEffectsContext) - .catch(err => { - logger.warn(`Error while processing effects for queue ${this.id}`, err); - }) - .finally(() => { - setTimeout(() => { - resolve(this.runQueue()); - }, (this.interval || 0) * 1000); - }); } else { resolve(); } diff --git a/gui/app/controllers/effect-queues.controller.js b/gui/app/controllers/effect-queues.controller.js index 2f59c963b..10996b9f6 100644 --- a/gui/app/controllers/effect-queues.controller.js +++ b/gui/app/controllers/effect-queues.controller.js @@ -37,9 +37,9 @@ } }, { - name: "INTERVAL", + name: "INTERVAL/DELAY", icon: "fa-clock", - cellTemplate: `{{(data.mode === 'interval' || data.mode === 'sequential') ? data.interval + 's' : 'n/a'}}`, + cellTemplate: `{{(data.mode === 'interval' || data.mode === 'auto') ? (data.interval || 0) + 's' : 'n/a'}}`, cellController: () => {} } ]; diff --git a/gui/app/directives/modals/effect-queues/addOrEditEffectQueueModal.js b/gui/app/directives/modals/effect-queues/addOrEditEffectQueueModal.js index 436c3228b..07909e6dd 100644 --- a/gui/app/directives/modals/effect-queues/addOrEditEffectQueueModal.js +++ b/gui/app/directives/modals/effect-queues/addOrEditEffectQueueModal.js @@ -47,8 +47,8 @@ -