From a77516d672cdcf8e8b08918b381782c8c6a3e907 Mon Sep 17 00:00:00 2001
From: Lee <phroggster@users.noreply.github.com>
Date: Wed, 27 Nov 2024 20:49:39 -0600
Subject: [PATCH 01/54] feat: Add Some Arg-Less Examples for $user... Variables
 (#2904)

* feat: Add Some Arg-Less Examples for $user...

- Per feature request #2903
- Add argument-less examples to both of the $userId and $userDisplayName
  variables.

* fix: Pull user... vars from eventData

- We were mandating it from the outer-most metadata, but Dennis said I
  had to make it look at eventData first.
- That nullish coalesce in user-display-name L24 got a smile, thank you!
- Dennis's fault if this breaks anything for anyone.

* chore: arg-less first

---------

Co-authored-by: Erik Bigler <erikbigler@gmail.com>
---
 .../variables/builtin/user/user-display-name.ts  | 16 +++++++++++-----
 src/backend/variables/builtin/user/user-id.ts    | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/backend/variables/builtin/user/user-display-name.ts b/src/backend/variables/builtin/user/user-display-name.ts
index a96637262..21637da1d 100644
--- a/src/backend/variables/builtin/user/user-display-name.ts
+++ b/src/backend/variables/builtin/user/user-display-name.ts
@@ -8,18 +8,24 @@ import twitchApi from "../../../twitch-api/api";
 const model : ReplaceVariable = {
     definition: {
         handle: "userDisplayName",
-        usage: "userDisplayName[username]",
-        description: "Gets the formatted display name for the given username. Searches local viewer DB first, then Twitch API.",
+        usage: "userDisplayName",
+        description: "Gets the formatted display name of the associated user (if there is one) for the given trigger.",
         categories: [VariableCategory.USER],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.TEXT],
+        examples: [
+            {
+                usage: "userDisplayName[username]",
+                description: "The formatted display name for the given username. Searches local viewer DB first, then Twitch API."
+            }
+        ]
     },
     evaluator: async (trigger, username: string) => {
         if (username == null) {
-            const userDisplayName = trigger.metadata.userDisplayName ?? trigger.metadata.userDisplayName;
+            const userDisplayName = trigger.metadata?.eventData?.userDisplayName ?? trigger.metadata?.userDisplayName;
             if (userDisplayName != null) {
                 return userDisplayName;
             }
-            username = trigger.metadata.username;
+            username = trigger.metadata?.eventData?.username ?? trigger.metadata?.username;
             if (username == null) {
                 return "[No username available]";
             }
diff --git a/src/backend/variables/builtin/user/user-id.ts b/src/backend/variables/builtin/user/user-id.ts
index bd8532a68..27ac80027 100644
--- a/src/backend/variables/builtin/user/user-id.ts
+++ b/src/backend/variables/builtin/user/user-id.ts
@@ -8,18 +8,24 @@ import twitchApi from "../../../twitch-api/api";
 const model : ReplaceVariable = {
     definition: {
         handle: "userId",
-        usage: "userId[username]",
-        description: "Gets the user ID for the given username. Searches local viewer DB first, then Twitch API.",
+        usage: "userId",
+        description: "Gets the user ID of the associated user (if there is one) for the given trigger.",
         categories: [VariableCategory.USER],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.TEXT],
+        examples: [
+            {
+                usage: "userId[username]",
+                description: "The user ID for the given username. Searches local viewer DB first, then Twitch API."
+            }
+        ]
     },
     evaluator: async (trigger, username: string) => {
         if (username == null) {
-            const userId = trigger.metadata.userid ?? trigger.metadata.userId;
+            const userId = trigger.metadata?.eventData?.userid ?? trigger.metadata?.userId;
             if (userId != null) {
                 return userId;
             }
-            username = trigger.metadata.username;
+            username = trigger.metadata?.eventData?.username ?? trigger.metadata?.username;
             if (username == null) {
                 return "[No username available]";
             }

From 1b28f24cab050df8e6d496e3a14bed9c50652d50 Mon Sep 17 00:00:00 2001
From: Erik Bigler <erikbigler@gmail.com>
Date: Wed, 27 Nov 2024 21:35:41 -0600
Subject: [PATCH 02/54] fix: add names to raw ui extension functions if they
 don't have one (#2906)

* add names to raw ui extension functions if they dont have one

* fix cant reassign const
---
 .../ui-extensions/ui-extension-manager.ts     | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/backend/ui-extensions/ui-extension-manager.ts b/src/backend/ui-extensions/ui-extension-manager.ts
index b85eea304..665f4e8b4 100644
--- a/src/backend/ui-extensions/ui-extension-manager.ts
+++ b/src/backend/ui-extensions/ui-extension-manager.ts
@@ -37,33 +37,42 @@ class UIExtensionManager {
                 template: page.template,
                 fullPage: page.fullPage,
                 disableScroll: page.disableScroll,
-                controllerRaw: page.controller?.toString()
+                controllerRaw: this.prepareFunc(page.controller, "pageCtrl")
             })),
             providers: extension.providers
                 ? {
                     factories: extension.providers.factories?.map(factory => ({
                         name: factory.name,
-                        functionRaw: factory.function?.toString()
+                        functionRaw: this.prepareFunc(factory.function, "factoryFunc")
                     })),
                     components: extension.providers.components?.map(component => ({
                         name: component.name,
                         bindings: component.bindings,
                         template: component.template,
                         transclude: component.transclude,
-                        controllerRaw: component.controller?.toString()
+                        controllerRaw: this.prepareFunc(component.controller, "componentCtrl")
                     })),
                     directives: extension.providers.directives?.map(directive => ({
                         name: directive.name,
-                        functionRaw: directive.function?.toString()
+                        functionRaw: this.prepareFunc(directive.function, "directiveCtrl")
                     })),
                     filters: extension.providers.filters?.map(filter => ({
                         name: filter.name,
-                        functionRaw: filter.function?.toString()
+                        functionRaw: this.prepareFunc(filter.function, "filterFunc")
                     }))
                 }
                 : undefined
         };
     }
+
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    private prepareFunc(func: Function | undefined, name: string) {
+        let rawFunc = func?.toString() ?? "() => {}";
+        if (rawFunc.startsWith("function(")) {
+            rawFunc = rawFunc.replace("function(", `function ${name}(`);
+        }
+        return rawFunc;
+    }
 }
 
 const manager = new UIExtensionManager();

From 1d516f50ccb6f29db678a762bd99b3f69c4aa046 Mon Sep 17 00:00:00 2001
From: CKY <xx_cky_xx@hotmail.com>
Date: Thu, 28 Nov 2024 08:04:10 -0700
Subject: [PATCH 03/54] feat: built in variable api (#2899)

* feat: built in variable api

* requested changes

---------

Co-authored-by: Erik Bigler <erikbigler@gmail.com>
---
 src/server/api/v1/controllers/variableApiController.js | 10 ++++++++++
 src/server/api/v1/v1Router.js                          |  5 +++++
 2 files changed, 15 insertions(+)
 create mode 100644 src/server/api/v1/controllers/variableApiController.js

diff --git a/src/server/api/v1/controllers/variableApiController.js b/src/server/api/v1/controllers/variableApiController.js
new file mode 100644
index 000000000..102e4926b
--- /dev/null
+++ b/src/server/api/v1/controllers/variableApiController.js
@@ -0,0 +1,10 @@
+"use strict";
+
+const manager = require("../../../../backend//variables/replace-variable-manager");
+
+exports.getReplaceVariables = function(req, res) {
+    const sortedVariables = [...manager.getReplaceVariables()]
+        .sort((a, b) => a.definition.handle.localeCompare(b.definition.handle));
+
+    res.json(sortedVariables);
+};
\ No newline at end of file
diff --git a/src/server/api/v1/v1Router.js b/src/server/api/v1/v1Router.js
index 2cb8b8236..465162430 100644
--- a/src/server/api/v1/v1Router.js
+++ b/src/server/api/v1/v1Router.js
@@ -72,6 +72,11 @@ router
     .get(customVariables.getCustomVariable)
     .post(customVariables.setCustomVariable);
 
+// builtin variables
+const variableManager = require("./controllers/variableApiController");
+
+router.route("/variables").get(variableManager.getReplaceVariables);
+
 // viewers
 const viewers = require("./controllers/viewersApiController");
 

From a003614b6c0cac9d2680c3bf58731ff61c3ba039 Mon Sep 17 00:00:00 2001
From: Erik Bigler <erikbigler@gmail.com>
Date: Thu, 28 Nov 2024 11:17:13 -0600
Subject: [PATCH 04/54] feat: ability for eval js variable/effect to send
 strings through expressionish

#2910
---
 .../handlers/js-sandbox/sandbox-eval.ts       | 20 +++++++++++++++----
 src/backend/effects/builtin/eval-js.ts        |  2 +-
 .../variables/builtin/utility/eval-js.ts      |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/backend/common/handlers/js-sandbox/sandbox-eval.ts b/src/backend/common/handlers/js-sandbox/sandbox-eval.ts
index 4dec7d393..5a8d5c733 100644
--- a/src/backend/common/handlers/js-sandbox/sandbox-eval.ts
+++ b/src/backend/common/handlers/js-sandbox/sandbox-eval.ts
@@ -9,16 +9,26 @@ const htmlPath = join(__dirname, './sandbox.html');
 
 const { getCustomVariable } = require('../../custom-variable-manager');
 
+import replaceVariableManager from '../../../variables/replace-variable-manager';
+
 const charList = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-const handlers = new Map<string, (...args: unknown[]) => unknown>();
+const handlers = new Map<string, (trigger: Trigger, ...args: unknown[]) => unknown>();
 
-handlers.set('getCustomVariable', (name) => {
+handlers.set('getCustomVariable', (_trigger, name) => {
     if (name == null || typeof name !== 'string') {
         throw new Error('variable name must be a string');
     }
     return getCustomVariable(name);
 });
 
+handlers.set('evaluateVariableExpression', (trigger, expressionString) => {
+    if (expressionString == null || typeof expressionString !== 'string') {
+        throw new Error('variable expression must be a string');
+    }
+
+    return replaceVariableManager.evaluateText(expressionString, trigger?.metadata, trigger);
+});
+
 interface Sandbox {
     finished: boolean,
     tunnel: Electron.MessagePortMain,
@@ -29,7 +39,9 @@ interface Sandbox {
     reject?: (...args: unknown[]) => void
 }
 
-export const evalSandboxedJs = async (code: string, args: unknown[], metadata: Trigger["metadata"]) => {
+export const evalSandboxedJs = async (code: string, args: unknown[], trigger: Trigger) => {
+    const metadata = trigger.metadata;
+
     if (<unknown>code instanceof String) {
         code = `${code}`;
     }
@@ -119,7 +131,7 @@ export const evalSandboxedJs = async (code: string, args: unknown[], metadata: T
 
                 } else if (handlers.has(method)) {
                     try {
-                        const result = await handlers.get(method)(...parameters);
+                        const result = await handlers.get(method)(trigger, ...parameters);
                         if (sandbox.finished) {
                             return;
                         }
diff --git a/src/backend/effects/builtin/eval-js.ts b/src/backend/effects/builtin/eval-js.ts
index 5cd987166..8954e7f50 100644
--- a/src/backend/effects/builtin/eval-js.ts
+++ b/src/backend/effects/builtin/eval-js.ts
@@ -87,7 +87,7 @@ const model: EffectType<{
     },
     onTriggerEvent: async ({ effect, trigger }) => {
         try {
-            const result = await evalSandboxedJs(effect.code, effect.parameters ?? [], trigger.metadata);
+            const result = await evalSandboxedJs(effect.code, effect.parameters ?? [], trigger);
             return {
                 success: true,
                 outputs: {
diff --git a/src/backend/variables/builtin/utility/eval-js.ts b/src/backend/variables/builtin/utility/eval-js.ts
index 4df28674f..3393b590b 100644
--- a/src/backend/variables/builtin/utility/eval-js.ts
+++ b/src/backend/variables/builtin/utility/eval-js.ts
@@ -27,7 +27,7 @@ const model : ReplaceVariable = {
     },
     evaluator: async (trigger: Trigger, code: string, ...args: unknown[]) => {
         try {
-            return await evalSandboxedJs(code, args, trigger.metadata);
+            return await evalSandboxedJs(code, args, trigger);
 
         } catch (err) {
             err.javascript = code;

From c5e93aea2658ca0a032132911d6a8af5ae0291e0 Mon Sep 17 00:00:00 2001
From: CKY <xx_cky_xx@hotmail.com>
Date: Thu, 28 Nov 2024 10:22:30 -0700
Subject: [PATCH 05/54] feat: variable examples and description changes (#2908)

Co-authored-by: Erik Bigler <erikbigler@gmail.com>
---
 .../variables/extralife-donations.ts          |  2 +-
 .../variables/extralife-incentives.ts         |  2 +-
 .../extralife/variables/extralife-info.ts     |  2 +-
 .../variables/extralife-milestones.ts         |  2 +-
 .../builtin/obs/variables/group-item-id.ts    |  2 ++
 .../builtin/obs/variables/group-name.ts       |  2 ++
 .../builtin/obs/variables/input-active.ts     |  4 +++-
 .../obs/variables/input-audio-balance.ts      |  5 +++--
 .../obs/variables/input-audio-monitor-type.ts |  4 +++-
 .../obs/variables/input-audio-sync-offset.ts  |  4 +++-
 .../obs/variables/input-audio-tracks.ts       |  5 +++--
 .../builtin/obs/variables/input-kind.ts       |  4 +++-
 .../builtin/obs/variables/input-muted.ts      |  5 +++--
 .../builtin/obs/variables/input-name.ts       |  4 +++-
 .../builtin/obs/variables/input-settings.ts   |  4 +++-
 .../builtin/obs/variables/input-showing.ts    |  4 +++-
 .../builtin/obs/variables/input-uuid.ts       |  4 +++-
 .../builtin/obs/variables/input-volume-db.ts  |  4 +++-
 .../obs/variables/input-volume-multiplier.ts  |  4 +++-
 .../builtin/obs/variables/is-connected.ts     |  4 +++-
 .../builtin/obs/variables/is-recording.ts     |  4 +++-
 .../builtin/obs/variables/is-streaming.ts     |  4 +++-
 .../builtin/obs/variables/obs-color-value.ts  |  2 +-
 .../builtin/obs/variables/old-input-name.ts   |  2 ++
 .../builtin/obs/variables/profile-name.ts     |  2 ++
 .../obs/variables/replay-buffer-path.ts       |  2 ++
 .../obs/variables/scene-collection-name.ts    |  4 +++-
 .../obs/variables/scene-item-enabled.ts       |  2 ++
 .../builtin/obs/variables/scene-item-id.ts    |  2 ++
 .../builtin/obs/variables/scene-item-name.ts  |  2 ++
 .../obs/variables/scene-name-variable.ts      |  4 +++-
 .../obs/variables/transition-duration.ts      |  2 ++
 .../builtin/obs/variables/transition-name.ts  |  2 ++
 .../obs/variables/vendor-event-data.ts        |  2 ++
 .../obs/variables/vendor-event-type.ts        |  2 ++
 .../builtin/obs/variables/vendor-name.ts      |  2 ++
 .../variables/sloots-alert-message.js         |  2 +-
 .../streamloots/variables/sloots-card-name.js |  2 +-
 .../variables/sloots-card-rarity.js           |  2 +-
 .../streamloots/variables/sloots-giftee.js    |  2 +-
 .../streamloots/variables/sloots-image-url.js |  2 +-
 .../streamloots/variables/sloots-message.js   |  2 +-
 .../streamloots/variables/sloots-quantity.js  |  2 +-
 .../streamloots/variables/sloots-sound-url.js |  2 +-
 .../variables/builtin/array/array-find.ts     |  3 +--
 .../variables/builtin/array/array-from.ts     | 10 ++++++++++
 .../variables/builtin/array/array-join.ts     | 10 ++++++++++
 .../variables/builtin/array/array-length.ts   | 10 ++++++++++
 .../builtin/array/array-random-item.ts        | 10 ++++++++++
 .../variables/builtin/array/array-reverse.ts  | 10 ++++++++++
 .../variables/builtin/array/array-shuffle.ts  | 10 ++++++++++
 .../variables/builtin/counter/counter.ts      |  6 ++++++
 .../builtin/currency/currency-rank.ts         |  8 +++++++-
 .../variables/builtin/currency/currency.ts    | 10 ++++++++--
 .../builtin/currency/top-currency.ts          |  6 ++++++
 .../builtin/metadata/arg-array-raw.ts         |  2 +-
 .../effect-queue-length.ts}                   |  2 +-
 .../builtin/metadata/top-metadata.ts          |  6 ++++++
 .../variables/builtin/misc/view-time.ts       | 14 ++++++++++++--
 src/backend/variables/builtin/number/math.ts  | 12 +++++++++++-
 .../variables/builtin/number/number-ceil.ts   |  6 ++++++
 .../builtin/number/number-commafy.ts          |  6 ++++++
 .../variables/builtin/number/number-floor.ts  | 10 ++++++++++
 .../variables/builtin/number/number-max.ts    |  6 ++++++
 .../variables/builtin/number/number-min.ts    |  6 ++++++
 .../builtin/object/object-set-property.ts     | 14 ++++++++++++++
 .../variables/builtin/text/text-capitalize.ts |  6 ++++++
 .../variables/builtin/text/text-concat.ts     |  6 ++++++
 .../builtin/text/text-decode-from-html.ts     |  6 ++++++
 .../builtin/text/text-decode-from-url.ts      |  6 ++++++
 .../builtin/text/text-encode-for-html.ts      |  6 ++++++
 .../builtin/text/text-encode-for-url.ts       |  6 ++++++
 .../{user => twitch}/account-creation-date.ts |  0
 .../builtin/twitch/twitch-channel-url.ts      | 19 +++++++++++++++++--
 .../variables/builtin/user/chat-messages.ts   | 12 +++++++++++-
 src/backend/variables/builtin/user/index.ts   |  2 +-
 .../variables/builtin/user/user-exists.ts     |  2 +-
 .../variables/builtin/user/user-is-banned.ts  |  2 +-
 .../builtin/user/user-is-timed-out.ts         |  2 +-
 .../builtin/utility/audio-duration.ts         | 12 +++++++++++-
 .../builtin/utility/convert-from-json.ts      |  6 ++++++
 .../variables/builtin/utility/index.ts        |  2 +-
 .../builtin/utility/video-duration.ts         | 12 +++++++++++-
 .../directives/misc/replaceVariableMenu.js    | 10 ++++++++--
 .../modals/effects/add-new-effect-modal.js    |  2 +-
 src/gui/scss/core/_effects.scss               |  2 +-
 src/shared/variable-constants.js              |  4 +++-
 src/types/variables.d.ts                      |  4 +++-
 88 files changed, 373 insertions(+), 60 deletions(-)
 rename src/backend/variables/builtin/{utility/get-effect-queue-length.ts => metadata/effect-queue-length.ts} (95%)
 rename src/backend/variables/builtin/{user => twitch}/account-creation-date.ts (100%)

diff --git a/src/backend/integrations/builtin/extralife/variables/extralife-donations.ts b/src/backend/integrations/builtin/extralife/variables/extralife-donations.ts
index c588dc03e..c4c663329 100644
--- a/src/backend/integrations/builtin/extralife/variables/extralife-donations.ts
+++ b/src/backend/integrations/builtin/extralife/variables/extralife-donations.ts
@@ -33,7 +33,7 @@ const ExtraLifeDonations: ReplaceVariable = {
                 description: "Returns top 3 donations for current signed in extra life account in JSON format."
             }
         ],
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: (_, sortName: string, numResults: number, participantID: number, returnJson: boolean) => {
diff --git a/src/backend/integrations/builtin/extralife/variables/extralife-incentives.ts b/src/backend/integrations/builtin/extralife/variables/extralife-incentives.ts
index 20f586340..785e72fb4 100644
--- a/src/backend/integrations/builtin/extralife/variables/extralife-incentives.ts
+++ b/src/backend/integrations/builtin/extralife/variables/extralife-incentives.ts
@@ -29,7 +29,7 @@ const ExtraLifeIncentives: ReplaceVariable = {
                 description: "Returns ten incentives for current logged in extra life account in JSON format."
             }
         ],
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: async (_, rewardDesc: string, numResults: number, participantID: number, returnJson: boolean) => {
diff --git a/src/backend/integrations/builtin/extralife/variables/extralife-info.ts b/src/backend/integrations/builtin/extralife/variables/extralife-info.ts
index 704a3995d..4db6b6108 100644
--- a/src/backend/integrations/builtin/extralife/variables/extralife-info.ts
+++ b/src/backend/integrations/builtin/extralife/variables/extralife-info.ts
@@ -57,7 +57,7 @@ const ExtraLifeInfo: ReplaceVariable = {
                 description: "Get all profile data for the current logged in extra life account in JSON format."
             }
         ],
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: (_, infoPath: string, participantID: number, returnJson: boolean) => {
diff --git a/src/backend/integrations/builtin/extralife/variables/extralife-milestones.ts b/src/backend/integrations/builtin/extralife/variables/extralife-milestones.ts
index 5df3dc066..02315434c 100644
--- a/src/backend/integrations/builtin/extralife/variables/extralife-milestones.ts
+++ b/src/backend/integrations/builtin/extralife/variables/extralife-milestones.ts
@@ -29,7 +29,7 @@ const ExtraLifeMilestones: ReplaceVariable = {
                 description: "Returns three milestones in JSON format."
             }
         ],
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: async (_, milestoneGoal: string, numResults: number, participantID: number, returnJson: boolean) => {
diff --git a/src/backend/integrations/builtin/obs/variables/group-item-id.ts b/src/backend/integrations/builtin/obs/variables/group-item-id.ts
index 5b4075ab9..6903fd491 100644
--- a/src/backend/integrations/builtin/obs/variables/group-item-id.ts
+++ b/src/backend/integrations/builtin/obs/variables/group-item-id.ts
@@ -1,6 +1,7 @@
 import { TriggerType } from "../../../../common/EffectType";
 import { ReplaceVariable } from "../../../../../types/variables";
 import { OBS_EVENT_SOURCE_ID, OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -14,6 +15,7 @@ export const GroupItemIdVariable: ReplaceVariable = {
         description:
             "The group-unique numeric ID of the item in OBS that triggered the event, or -1 when the item is not grouped.",
         possibleDataOutput: ["number"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/group-name.ts b/src/backend/integrations/builtin/obs/variables/group-name.ts
index 40d8ba025..3758b3da2 100644
--- a/src/backend/integrations/builtin/obs/variables/group-name.ts
+++ b/src/backend/integrations/builtin/obs/variables/group-name.ts
@@ -1,6 +1,7 @@
 import { TriggerType } from "../../../../common/EffectType";
 import { ReplaceVariable } from "../../../../../types/variables";
 import { OBS_EVENT_SOURCE_ID, OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -14,6 +15,7 @@ export const GroupNameVariable: ReplaceVariable = {
         description:
             "The name of the OBS group containing the item that triggered the event, or 'Unknown' if the element isn't grouped.",
         possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/input-active.ts b/src/backend/integrations/builtin/obs/variables/input-active.ts
index 36471fac5..0cbde6ba7 100644
--- a/src/backend/integrations/builtin/obs/variables/input-active.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-active.ts
@@ -4,6 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_INPUT_ACTIVE_STATE_CHANGED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -15,7 +16,8 @@ export const InputActiveVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputActive",
         description: "Returns `true` if the OBS input is active or `false` if it is not.",
-        possibleDataOutput: ["bool"]
+        possibleDataOutput: ["bool"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputActive = trigger.metadata?.eventData?.inputActive;
diff --git a/src/backend/integrations/builtin/obs/variables/input-audio-balance.ts b/src/backend/integrations/builtin/obs/variables/input-audio-balance.ts
index dce56b82a..74f84bdc6 100644
--- a/src/backend/integrations/builtin/obs/variables/input-audio-balance.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-audio-balance.ts
@@ -4,7 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_INPUT_AUDIO_BALANCE_CHANGED_EVENT_ID
 } from "../constants";
-
+import { VariableCategory } from "../../../../../shared/variable-constants";
 const triggers = {};
 triggers[TriggerType.EVENT] = [
     `${OBS_EVENT_SOURCE_ID}:${OBS_INPUT_AUDIO_BALANCE_CHANGED_EVENT_ID}`
@@ -15,7 +15,8 @@ export const InputAudioBalanceVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputAudioBalance",
         description: "Returns the audio balance value of the OBS input.",
-        possibleDataOutput: ["number"]
+        possibleDataOutput: ["number"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputAudioBalance = trigger.metadata?.eventData?.inputAudioBalance;
diff --git a/src/backend/integrations/builtin/obs/variables/input-audio-monitor-type.ts b/src/backend/integrations/builtin/obs/variables/input-audio-monitor-type.ts
index 1d940ed73..2e7397328 100644
--- a/src/backend/integrations/builtin/obs/variables/input-audio-monitor-type.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-audio-monitor-type.ts
@@ -4,6 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_INPUT_AUDIO_MONITOR_TYPE_CHANGED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -15,7 +16,8 @@ export const InputAudioMonitorTypeVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputMonitorType",
         description: "Returns the audio monitor type of the OBS input. Values are `None`, `Monitor Only`, or `Monitor and Output`.",
-        possibleDataOutput: ["text"]
+        possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const monitorType = trigger.metadata?.eventData?.monitorType;
diff --git a/src/backend/integrations/builtin/obs/variables/input-audio-sync-offset.ts b/src/backend/integrations/builtin/obs/variables/input-audio-sync-offset.ts
index b672cc274..7831fd373 100644
--- a/src/backend/integrations/builtin/obs/variables/input-audio-sync-offset.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-audio-sync-offset.ts
@@ -4,6 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_INPUT_AUDIO_BALANCE_CHANGED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -15,7 +16,8 @@ export const InputAudioSyncOffsetVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputAudioSyncOffset",
         description: "Returns the audio sync offset (in milliseconds) of the OBS input.",
-        possibleDataOutput: ["number"]
+        possibleDataOutput: ["number"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputAudioSyncOffset = trigger.metadata?.eventData?.inputAudioSyncOffset;
diff --git a/src/backend/integrations/builtin/obs/variables/input-audio-tracks.ts b/src/backend/integrations/builtin/obs/variables/input-audio-tracks.ts
index d68685774..510736861 100644
--- a/src/backend/integrations/builtin/obs/variables/input-audio-tracks.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-audio-tracks.ts
@@ -4,7 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_INPUT_AUDIO_TRACKS_CHANGED_EVENT_ID
 } from "../constants";
-
+import { VariableCategory } from "../../../../../shared/variable-constants";
 const triggers = {};
 triggers[TriggerType.EVENT] = [
     `${OBS_EVENT_SOURCE_ID}:${OBS_INPUT_AUDIO_TRACKS_CHANGED_EVENT_ID}`
@@ -15,7 +15,8 @@ export const InputAudioTracksVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputAudioTracks",
         description: "Returns the raw OBS audio tracks object of the OBS input.",
-        possibleDataOutput: ["object"]
+        possibleDataOutput: ["object"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputAudioTracks = trigger.metadata?.eventData?.inputAudioTracks;
diff --git a/src/backend/integrations/builtin/obs/variables/input-kind.ts b/src/backend/integrations/builtin/obs/variables/input-kind.ts
index 75a447cfa..ed2d09e3b 100644
--- a/src/backend/integrations/builtin/obs/variables/input-kind.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-kind.ts
@@ -4,6 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_INPUT_CREATED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -15,7 +16,8 @@ export const InputKindVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputKind",
         description: "Returns the OBS internal name of the kind of OBS input.",
-        possibleDataOutput: ["text"]
+        possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputKind = trigger.metadata?.eventData?.inputKind;
diff --git a/src/backend/integrations/builtin/obs/variables/input-muted.ts b/src/backend/integrations/builtin/obs/variables/input-muted.ts
index 9916ad382..25ad80494 100644
--- a/src/backend/integrations/builtin/obs/variables/input-muted.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-muted.ts
@@ -4,7 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_INPUT_MUTE_STATE_CHANGED_EVENT_ID
 } from "../constants";
-
+import { VariableCategory } from "../../../../../shared/variable-constants";
 const triggers = {};
 triggers[TriggerType.EVENT] = [
     `${OBS_EVENT_SOURCE_ID}:${OBS_INPUT_MUTE_STATE_CHANGED_EVENT_ID}`
@@ -15,7 +15,8 @@ export const InputMutedVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputMuted",
         description: "Returns `true` if the OBS input is muted or `false` if it is not.",
-        possibleDataOutput: ["bool"]
+        possibleDataOutput: ["bool"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputMuted = trigger.metadata?.eventData?.inputMuted;
diff --git a/src/backend/integrations/builtin/obs/variables/input-name.ts b/src/backend/integrations/builtin/obs/variables/input-name.ts
index d1fc71046..2a5c70412 100644
--- a/src/backend/integrations/builtin/obs/variables/input-name.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-name.ts
@@ -15,6 +15,7 @@ import {
     OBS_INPUT_AUDIO_MONITOR_TYPE_CHANGED_EVENT_ID,
     OBS_INPUT_AUDIO_TRACKS_CHANGED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -37,7 +38,8 @@ export const InputNameVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputName",
         description: "Returns the name of the OBS input.",
-        possibleDataOutput: ["text"]
+        possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputName = trigger.metadata?.eventData?.inputName;
diff --git a/src/backend/integrations/builtin/obs/variables/input-settings.ts b/src/backend/integrations/builtin/obs/variables/input-settings.ts
index 735ec45ec..c1b9452c1 100644
--- a/src/backend/integrations/builtin/obs/variables/input-settings.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-settings.ts
@@ -5,6 +5,7 @@ import {
     OBS_INPUT_CREATED_EVENT_ID,
     OBS_INPUT_SETTINGS_CHANGED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -17,7 +18,8 @@ export const InputSettingsVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputSettings",
         description: "Returns the raw OBS settings object of the OBS input.",
-        possibleDataOutput: ["object"]
+        possibleDataOutput: ["object"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputSettings = trigger.metadata?.eventData?.inputSettings;
diff --git a/src/backend/integrations/builtin/obs/variables/input-showing.ts b/src/backend/integrations/builtin/obs/variables/input-showing.ts
index 49ed32691..900d10f40 100644
--- a/src/backend/integrations/builtin/obs/variables/input-showing.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-showing.ts
@@ -4,6 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_INPUT_SHOW_STATE_CHANGED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -15,7 +16,8 @@ export const InputShowingVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputShowing",
         description: "Returns `true` if the OBS input is currently showing or `false` if it is not.",
-        possibleDataOutput: ["bool"]
+        possibleDataOutput: ["bool"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputShowing = trigger.metadata?.eventData?.inputShowing;
diff --git a/src/backend/integrations/builtin/obs/variables/input-uuid.ts b/src/backend/integrations/builtin/obs/variables/input-uuid.ts
index 6459df4a0..de6b234e5 100644
--- a/src/backend/integrations/builtin/obs/variables/input-uuid.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-uuid.ts
@@ -15,6 +15,7 @@ import {
     OBS_INPUT_AUDIO_MONITOR_TYPE_CHANGED_EVENT_ID,
     OBS_INPUT_AUDIO_TRACKS_CHANGED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -37,7 +38,8 @@ export const InputUuidVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputUuid",
         description: "Returns the UUID of the OBS input.",
-        possibleDataOutput: ["text"]
+        possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputUuid = trigger.metadata?.eventData?.inputUuid;
diff --git a/src/backend/integrations/builtin/obs/variables/input-volume-db.ts b/src/backend/integrations/builtin/obs/variables/input-volume-db.ts
index dd5661e4d..c8d249701 100644
--- a/src/backend/integrations/builtin/obs/variables/input-volume-db.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-volume-db.ts
@@ -4,6 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_INPUT_VOLUME_CHANGED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -15,7 +16,8 @@ export const InputVolumeDbVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputVolumeDb",
         description: "Returns the volume level in dB of the OBS input.",
-        possibleDataOutput: ["number"]
+        possibleDataOutput: ["number"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputVolumeDb = trigger.metadata?.eventData?.inputVolumeDb;
diff --git a/src/backend/integrations/builtin/obs/variables/input-volume-multiplier.ts b/src/backend/integrations/builtin/obs/variables/input-volume-multiplier.ts
index 3de5ce1dd..9a9828edf 100644
--- a/src/backend/integrations/builtin/obs/variables/input-volume-multiplier.ts
+++ b/src/backend/integrations/builtin/obs/variables/input-volume-multiplier.ts
@@ -4,6 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_INPUT_VOLUME_CHANGED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -15,7 +16,8 @@ export const InputVolumeMultiplierVariable: ReplaceVariable = {
     definition: {
         handle: "obsInputVolumeMultiplier",
         description: "Returns the volume level multiplier of the OBS input.",
-        possibleDataOutput: ["number"]
+        possibleDataOutput: ["number"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const inputVolumeMultiplier = trigger.metadata?.eventData?.inputVolumeMultiplier;
diff --git a/src/backend/integrations/builtin/obs/variables/is-connected.ts b/src/backend/integrations/builtin/obs/variables/is-connected.ts
index 571ce8d59..bd08451a6 100644
--- a/src/backend/integrations/builtin/obs/variables/is-connected.ts
+++ b/src/backend/integrations/builtin/obs/variables/is-connected.ts
@@ -1,11 +1,13 @@
 import { ReplaceVariable } from "../../../../../types/variables";
 import { isConnected } from "../obs-remote";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 export const IsConnectedVariable: ReplaceVariable = {
     definition: {
         handle: "obsIsConnected",
         description: "Returns 'true' if OBS is currently connected or 'false' if it is not.",
-        possibleDataOutput: ["bool"]
+        possibleDataOutput: ["bool"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async () => {
         return isConnected() ?? false;
diff --git a/src/backend/integrations/builtin/obs/variables/is-recording.ts b/src/backend/integrations/builtin/obs/variables/is-recording.ts
index 476cd5208..478b4fca7 100644
--- a/src/backend/integrations/builtin/obs/variables/is-recording.ts
+++ b/src/backend/integrations/builtin/obs/variables/is-recording.ts
@@ -1,12 +1,14 @@
 import { ReplaceVariable } from "../../../../../types/variables";
 import { isRecording } from "../obs-remote";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 export const IsRecordingVariable: ReplaceVariable = {
     definition: {
         handle: "obsIsRecording",
         description:
       "Returns 'true' if OBS is currently recording or 'false' if it is not.",
-        possibleDataOutput: ["bool"]
+        possibleDataOutput: ["bool"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async () => {
         const recordState = await isRecording();
diff --git a/src/backend/integrations/builtin/obs/variables/is-streaming.ts b/src/backend/integrations/builtin/obs/variables/is-streaming.ts
index 7c67a625b..9b1455567 100644
--- a/src/backend/integrations/builtin/obs/variables/is-streaming.ts
+++ b/src/backend/integrations/builtin/obs/variables/is-streaming.ts
@@ -1,12 +1,14 @@
 import { ReplaceVariable } from "../../../../../types/variables";
 import { isStreaming } from "../obs-remote";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 export const IsStreamingVariable: ReplaceVariable = {
     definition: {
         handle: "obsIsStreaming",
         description:
       "Returns 'true' if OBS is currently streaming or 'false' if it is not.",
-        possibleDataOutput: ["bool"]
+        possibleDataOutput: ["bool"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async () => {
         const streamState = await isStreaming();
diff --git a/src/backend/integrations/builtin/obs/variables/obs-color-value.ts b/src/backend/integrations/builtin/obs/variables/obs-color-value.ts
index 4680fa49c..669f10ba0 100644
--- a/src/backend/integrations/builtin/obs/variables/obs-color-value.ts
+++ b/src/backend/integrations/builtin/obs/variables/obs-color-value.ts
@@ -6,7 +6,7 @@ export const ColorValueVariable: ReplaceVariable = {
     definition: {
         handle: "obsColorValue",
         description: "Returns an OBS color value based on either a hex color code (e.g. #0066FF) or an HTML color name.",
-        categories: [VariableCategory.ADVANCED],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         possibleDataOutput: ["number"]
     },
     evaluator: (_, ...args: string[]) => {
diff --git a/src/backend/integrations/builtin/obs/variables/old-input-name.ts b/src/backend/integrations/builtin/obs/variables/old-input-name.ts
index 32bc93571..4c724a4da 100644
--- a/src/backend/integrations/builtin/obs/variables/old-input-name.ts
+++ b/src/backend/integrations/builtin/obs/variables/old-input-name.ts
@@ -4,6 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_INPUT_NAME_CHANGED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -15,6 +16,7 @@ export const OldInputNameVariable: ReplaceVariable = {
     definition: {
         handle: "obsOldInputName",
         description: "Returns the previous name of the OBS input.",
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         possibleDataOutput: ["text"]
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/profile-name.ts b/src/backend/integrations/builtin/obs/variables/profile-name.ts
index b2ffc7b2b..406dfb076 100644
--- a/src/backend/integrations/builtin/obs/variables/profile-name.ts
+++ b/src/backend/integrations/builtin/obs/variables/profile-name.ts
@@ -4,6 +4,7 @@ import {
     OBS_CURRENT_PROFILE_CHANGED_EVENT_ID,
     OBS_EVENT_SOURCE_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -16,6 +17,7 @@ export const ProfileNameVariable: ReplaceVariable = {
         description:
       "The name of the OBS profile that triggered the event.",
         possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/replay-buffer-path.ts b/src/backend/integrations/builtin/obs/variables/replay-buffer-path.ts
index 6a22e4495..0bfc06080 100644
--- a/src/backend/integrations/builtin/obs/variables/replay-buffer-path.ts
+++ b/src/backend/integrations/builtin/obs/variables/replay-buffer-path.ts
@@ -4,6 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_REPLAY_BUFFER_SAVED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -16,6 +17,7 @@ export const ReplayBufferPathVariable: ReplaceVariable = {
         description:
       "The path of the replay buffer file that OBS saved.",
         possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/scene-collection-name.ts b/src/backend/integrations/builtin/obs/variables/scene-collection-name.ts
index 0d740f2ed..774ffa705 100644
--- a/src/backend/integrations/builtin/obs/variables/scene-collection-name.ts
+++ b/src/backend/integrations/builtin/obs/variables/scene-collection-name.ts
@@ -1,12 +1,14 @@
 import { ReplaceVariable } from "../../../../../types/variables";
 import { getCurrentSceneCollectionName } from "../obs-remote";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 export const SceneCollectionNameVariable: ReplaceVariable = {
     definition: {
         handle: "obsSceneCollectionName",
         description:
       "The name of the OBS scene collection that triggered the event, or the name of the current OBS scene collection if there is no event. If OBS isn't running, it returns 'Unknown'.",
-        possibleDataOutput: ["text"]
+        possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: async (trigger) => {
         const currentSceneCollectionName = trigger.metadata?.eventData?.sceneCollectionName ?? await getCurrentSceneCollectionName();
diff --git a/src/backend/integrations/builtin/obs/variables/scene-item-enabled.ts b/src/backend/integrations/builtin/obs/variables/scene-item-enabled.ts
index 8efc4fdf4..560a7499d 100644
--- a/src/backend/integrations/builtin/obs/variables/scene-item-enabled.ts
+++ b/src/backend/integrations/builtin/obs/variables/scene-item-enabled.ts
@@ -1,6 +1,7 @@
 import { TriggerType } from "../../../../common/EffectType";
 import { ReplaceVariable } from "../../../../../types/variables";
 import { OBS_EVENT_SOURCE_ID, OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -13,6 +14,7 @@ export const SceneItemEnabledVariable: ReplaceVariable = {
         description:
       "Returns `true` if the OBS scene item that triggered the event is enabled, or `false` otherwise.",
         possibleDataOutput: ["bool"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/scene-item-id.ts b/src/backend/integrations/builtin/obs/variables/scene-item-id.ts
index f2594f4ef..c5fdfe8a1 100644
--- a/src/backend/integrations/builtin/obs/variables/scene-item-id.ts
+++ b/src/backend/integrations/builtin/obs/variables/scene-item-id.ts
@@ -1,6 +1,7 @@
 import { TriggerType } from "../../../../common/EffectType";
 import { ReplaceVariable } from "../../../../../types/variables";
 import { OBS_EVENT_SOURCE_ID, OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -13,6 +14,7 @@ export const SceneItemIdVariable: ReplaceVariable = {
         description:
       "The numeric ID of the OBS scene item that triggered the event.",
         possibleDataOutput: ["number"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/scene-item-name.ts b/src/backend/integrations/builtin/obs/variables/scene-item-name.ts
index 1e23e6658..4aa682f52 100644
--- a/src/backend/integrations/builtin/obs/variables/scene-item-name.ts
+++ b/src/backend/integrations/builtin/obs/variables/scene-item-name.ts
@@ -2,6 +2,7 @@ import { TriggerType } from "../../../../common/EffectType";
 import { ReplaceVariable } from "../../../../../types/variables";
 import { OBS_EVENT_SOURCE_ID, OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID } from "../constants";
 import { getGroupItem, getSceneItem } from "../obs-remote";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -15,6 +16,7 @@ export const SceneItemNameVariable: ReplaceVariable = {
         description:
       "The name of the OBS scene item that triggered the event.",
         possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/scene-name-variable.ts b/src/backend/integrations/builtin/obs/variables/scene-name-variable.ts
index 03a992382..94fbc97e3 100644
--- a/src/backend/integrations/builtin/obs/variables/scene-name-variable.ts
+++ b/src/backend/integrations/builtin/obs/variables/scene-name-variable.ts
@@ -1,12 +1,14 @@
 import { ReplaceVariable } from "../../../../../types/variables";
 import { getCurrentSceneName } from "../obs-remote";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 export const SceneNameVariable: ReplaceVariable = {
     definition: {
         handle: "obsSceneName",
         description:
       "The name of the OBS scene that triggered the event, or the current OBS Scene if there is no event. If OBS isn't running, it returns 'Unknown'.",
-        possibleDataOutput: ["text"]
+        possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS]
     },
     evaluator: (trigger) => {
         const currentSceneName = trigger.metadata?.eventData?.sceneName ?? getCurrentSceneName();
diff --git a/src/backend/integrations/builtin/obs/variables/transition-duration.ts b/src/backend/integrations/builtin/obs/variables/transition-duration.ts
index 540ec8084..18d86d4cf 100644
--- a/src/backend/integrations/builtin/obs/variables/transition-duration.ts
+++ b/src/backend/integrations/builtin/obs/variables/transition-duration.ts
@@ -4,6 +4,7 @@ import {
     OBS_CURRENT_SCENE_TRANSITION_DURATION_CHANGED_EVENT_ID,
     OBS_EVENT_SOURCE_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -16,6 +17,7 @@ export const TransitionDurationVariable: ReplaceVariable = {
         description:
       "The new duration (in milliseconds) of the OBS transition that was updated.",
         possibleDataOutput: ["number"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/transition-name.ts b/src/backend/integrations/builtin/obs/variables/transition-name.ts
index 31c7cd325..fdd2f39c2 100644
--- a/src/backend/integrations/builtin/obs/variables/transition-name.ts
+++ b/src/backend/integrations/builtin/obs/variables/transition-name.ts
@@ -6,6 +6,7 @@ import {
     OBS_SCENE_TRANSITION_ENDED_EVENT_ID,
     OBS_SCENE_TRANSITION_STARTED_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -20,6 +21,7 @@ export const TransitionNameVariable: ReplaceVariable = {
         description:
       "The name of the OBS transition that triggered the event.",
         possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/vendor-event-data.ts b/src/backend/integrations/builtin/obs/variables/vendor-event-data.ts
index ae85cf6ad..c331c1740 100644
--- a/src/backend/integrations/builtin/obs/variables/vendor-event-data.ts
+++ b/src/backend/integrations/builtin/obs/variables/vendor-event-data.ts
@@ -9,6 +9,7 @@ const triggers = {};
 triggers[TriggerType.EVENT] = [
     `${OBS_EVENT_SOURCE_ID}:${OBS_VENDOR_EVENT_EVENT_ID}`
 ];
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 export const VendorEventDataVariable: ReplaceVariable = {
     definition: {
@@ -16,6 +17,7 @@ export const VendorEventDataVariable: ReplaceVariable = {
         description:
       "The vendor-specified raw JSON data from the OBS vendor event.",
         possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/vendor-event-type.ts b/src/backend/integrations/builtin/obs/variables/vendor-event-type.ts
index f4b136906..249c37985 100644
--- a/src/backend/integrations/builtin/obs/variables/vendor-event-type.ts
+++ b/src/backend/integrations/builtin/obs/variables/vendor-event-type.ts
@@ -9,6 +9,7 @@ const triggers = {};
 triggers[TriggerType.EVENT] = [
     `${OBS_EVENT_SOURCE_ID}:${OBS_VENDOR_EVENT_EVENT_ID}`
 ];
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 export const VendorEventTypeVariable: ReplaceVariable = {
     definition: {
@@ -16,6 +17,7 @@ export const VendorEventTypeVariable: ReplaceVariable = {
         description:
       "The vendor-specified type of event that triggered the OBS vendor event.",
         possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/obs/variables/vendor-name.ts b/src/backend/integrations/builtin/obs/variables/vendor-name.ts
index 5bdbf95c4..220e51bc4 100644
--- a/src/backend/integrations/builtin/obs/variables/vendor-name.ts
+++ b/src/backend/integrations/builtin/obs/variables/vendor-name.ts
@@ -4,6 +4,7 @@ import {
     OBS_EVENT_SOURCE_ID,
     OBS_VENDOR_EVENT_EVENT_ID
 } from "../constants";
+import { VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
 triggers[TriggerType.EVENT] = [
@@ -16,6 +17,7 @@ export const VendorNameVariable: ReplaceVariable = {
         description:
       "The name of the vendor that triggered the OBS vendor event.",
         possibleDataOutput: ["text"],
+        categories: [VariableCategory.ADVANCED, VariableCategory.INTEGRATION, VariableCategory.OBS],
         triggers: triggers
     },
     evaluator: async (trigger) => {
diff --git a/src/backend/integrations/builtin/streamloots/variables/sloots-alert-message.js b/src/backend/integrations/builtin/streamloots/variables/sloots-alert-message.js
index dd96f048e..c793e737f 100644
--- a/src/backend/integrations/builtin/streamloots/variables/sloots-alert-message.js
+++ b/src/backend/integrations/builtin/streamloots/variables/sloots-alert-message.js
@@ -12,7 +12,7 @@ const model = {
         handle: "slootsAlertMessage",
         description: "The alert message included with a StreamLoots Chest/Card.",
         triggers: triggers,
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: (trigger) => {
diff --git a/src/backend/integrations/builtin/streamloots/variables/sloots-card-name.js b/src/backend/integrations/builtin/streamloots/variables/sloots-card-name.js
index 0638dc875..346b07676 100644
--- a/src/backend/integrations/builtin/streamloots/variables/sloots-card-name.js
+++ b/src/backend/integrations/builtin/streamloots/variables/sloots-card-name.js
@@ -12,7 +12,7 @@ const model = {
         handle: "slootsCardName",
         description: "The name of a StreamLoots Card.",
         triggers: triggers,
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: (trigger) => {
diff --git a/src/backend/integrations/builtin/streamloots/variables/sloots-card-rarity.js b/src/backend/integrations/builtin/streamloots/variables/sloots-card-rarity.js
index 933b8c8c8..657cbfef4 100644
--- a/src/backend/integrations/builtin/streamloots/variables/sloots-card-rarity.js
+++ b/src/backend/integrations/builtin/streamloots/variables/sloots-card-rarity.js
@@ -12,7 +12,7 @@ const model = {
         handle: "slootsCardRarity",
         description: "The rarity of a StreamLoots Card.",
         triggers: triggers,
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: (trigger) => {
diff --git a/src/backend/integrations/builtin/streamloots/variables/sloots-giftee.js b/src/backend/integrations/builtin/streamloots/variables/sloots-giftee.js
index 5fe5f6bb1..02c8b3096 100644
--- a/src/backend/integrations/builtin/streamloots/variables/sloots-giftee.js
+++ b/src/backend/integrations/builtin/streamloots/variables/sloots-giftee.js
@@ -12,7 +12,7 @@ const model = {
         handle: "slootsGiftee",
         description: "The person who was gifted StreamLoots Chests.",
         triggers: triggers,
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: (trigger) => {
diff --git a/src/backend/integrations/builtin/streamloots/variables/sloots-image-url.js b/src/backend/integrations/builtin/streamloots/variables/sloots-image-url.js
index 345520ebc..69cf8a5e6 100644
--- a/src/backend/integrations/builtin/streamloots/variables/sloots-image-url.js
+++ b/src/backend/integrations/builtin/streamloots/variables/sloots-image-url.js
@@ -12,7 +12,7 @@ const model = {
         handle: "slootsImageUrl",
         description: "The image url for the StreamLoots Chest/Card",
         triggers: triggers,
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: (trigger) => {
diff --git a/src/backend/integrations/builtin/streamloots/variables/sloots-message.js b/src/backend/integrations/builtin/streamloots/variables/sloots-message.js
index 5bad8cddc..9652314df 100644
--- a/src/backend/integrations/builtin/streamloots/variables/sloots-message.js
+++ b/src/backend/integrations/builtin/streamloots/variables/sloots-message.js
@@ -12,7 +12,7 @@ const model = {
         handle: "slootsMessage",
         description: "The users message included with a StreamLoots Chest/Card.",
         triggers: triggers,
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: (trigger) => {
diff --git a/src/backend/integrations/builtin/streamloots/variables/sloots-quantity.js b/src/backend/integrations/builtin/streamloots/variables/sloots-quantity.js
index ae26a577b..780f8927f 100644
--- a/src/backend/integrations/builtin/streamloots/variables/sloots-quantity.js
+++ b/src/backend/integrations/builtin/streamloots/variables/sloots-quantity.js
@@ -12,7 +12,7 @@ const model = {
         handle: "slootsChestQuantity",
         description: "The number of purchased StreamLoots Chests.",
         triggers: triggers,
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
     evaluator: (trigger) => {
diff --git a/src/backend/integrations/builtin/streamloots/variables/sloots-sound-url.js b/src/backend/integrations/builtin/streamloots/variables/sloots-sound-url.js
index 14962e414..4c6e03af7 100644
--- a/src/backend/integrations/builtin/streamloots/variables/sloots-sound-url.js
+++ b/src/backend/integrations/builtin/streamloots/variables/sloots-sound-url.js
@@ -12,7 +12,7 @@ const model = {
         handle: "slootsSoundUrl",
         description: "The sound url for the StreamLoots Chest/Card.",
         triggers: triggers,
-        categories: [VariableCategory.COMMON, VariableCategory.TRIGGER],
+        categories: [VariableCategory.COMMON, VariableCategory.INTEGRATION],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: (trigger) => {
diff --git a/src/backend/variables/builtin/array/array-find.ts b/src/backend/variables/builtin/array/array-find.ts
index 9d6933924..911f86242 100644
--- a/src/backend/variables/builtin/array/array-find.ts
+++ b/src/backend/variables/builtin/array/array-find.ts
@@ -31,8 +31,7 @@ const model : ReplaceVariable = {
             }
         ],
         categories: [VariableCategory.ADVANCED],
-        possibleDataOutput: [OutputDataType.TEXT, OutputDataType.NUMBER],
-        hidden: true
+        possibleDataOutput: [OutputDataType.TEXT, OutputDataType.NUMBER]
     },
 
     evaluator: (
diff --git a/src/backend/variables/builtin/array/array-from.ts b/src/backend/variables/builtin/array/array-from.ts
index 2348eba82..7dfa8157b 100644
--- a/src/backend/variables/builtin/array/array-from.ts
+++ b/src/backend/variables/builtin/array/array-from.ts
@@ -6,6 +6,16 @@ const model : ReplaceVariable = {
         handle: "arrayFrom",
         usage: "arrayFrom[value, value, ...]",
         description: "Returns a raw array containing the listed values",
+        examples: [
+            {
+                usage: "arrayFrom[1, 2, 3]",
+                description: "Returns [1, 2, 3]."
+            },
+            {
+                usage: `arrayFrom["a", "b", "c"]`,
+                description: `Returns ["a", "b", "c"].`
+            }
+        ],
         categories: [VariableCategory.ADVANCED],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/array/array-join.ts b/src/backend/variables/builtin/array/array-join.ts
index e2ef3da60..ef1cfff95 100644
--- a/src/backend/variables/builtin/array/array-join.ts
+++ b/src/backend/variables/builtin/array/array-join.ts
@@ -6,6 +6,16 @@ const model : ReplaceVariable = {
         handle: "arrayJoin",
         description: "Returns a string with each array item joined together with the given separator",
         usage: "arrayJoin[array, separator]",
+        examples: [
+            {
+                usage: `arrayJoin["[1,2,3]", ", "]`,
+                description: `Returns "1, 2, 3".`
+            },
+            {
+                usage: `arrayJoin["["apple","banana","cherry"]", " - "]`,
+                description: `Returns "apple - banana - cherry".`
+            }
+        ],
         categories: [VariableCategory.ADVANCED],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/array/array-length.ts b/src/backend/variables/builtin/array/array-length.ts
index d4ba57208..e2ae3cd6a 100644
--- a/src/backend/variables/builtin/array/array-length.ts
+++ b/src/backend/variables/builtin/array/array-length.ts
@@ -6,6 +6,16 @@ const model : ReplaceVariable = {
         handle: "arrayLength",
         usage: "arrayLength[array]",
         description: "Returns the length of the input array.",
+        examples: [
+            {
+                usage: `arrayLength["[1,2,3]"]`,
+                description: "Returns 3."
+            },
+            {
+                usage: "arrayLength[rawArray]",
+                description: "Returns the length of the raw array."
+            }
+        ],
         categories: [VariableCategory.ADVANCED, VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/array/array-random-item.ts b/src/backend/variables/builtin/array/array-random-item.ts
index 8c20bc95c..df8bf7f74 100644
--- a/src/backend/variables/builtin/array/array-random-item.ts
+++ b/src/backend/variables/builtin/array/array-random-item.ts
@@ -6,6 +6,16 @@ const model : ReplaceVariable = {
         handle: "arrayRandomItem",
         usage: "arrayRandomItem[array]",
         description: "Returns a random item from the given array",
+        examples: [
+            {
+                usage: `arrayRandomItem["[1,2,3]"]`,
+                description: "Returns a random item from the array [1,2,3]."
+            },
+            {
+                usage: "arrayRandomItem[rawArray]",
+                description: "Returns a random item from the raw array."
+            }
+        ],
         categories: [VariableCategory.ADVANCED, VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/array/array-reverse.ts b/src/backend/variables/builtin/array/array-reverse.ts
index c2e8f1fa6..db98258c1 100644
--- a/src/backend/variables/builtin/array/array-reverse.ts
+++ b/src/backend/variables/builtin/array/array-reverse.ts
@@ -6,6 +6,16 @@ const model : ReplaceVariable = {
         handle: "arrayReverse",
         description: "Returns a new reversed array",
         usage: "arrayReverse[array]",
+        examples: [
+            {
+                usage: `arrayReverse["[1,2,3]"]`,
+                description: "Returns [3,2,1]."
+            },
+            {
+                usage: "arrayReverse[rawArray]",
+                description: "Returns the reversed raw array."
+            }
+        ],
         categories: [VariableCategory.ADVANCED],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/array/array-shuffle.ts b/src/backend/variables/builtin/array/array-shuffle.ts
index 45a8d0b52..dc59264ee 100644
--- a/src/backend/variables/builtin/array/array-shuffle.ts
+++ b/src/backend/variables/builtin/array/array-shuffle.ts
@@ -17,6 +17,16 @@ const model : ReplaceVariable = {
         handle: "arrayShuffle",
         description: "Returns a new shuffled array",
         usage: "arrayShuffle[array]",
+        examples: [
+            {
+                usage: `arrayShuffle["[1,2,3]"]`,
+                description: "Returns a shuffled version of [1,2,3], e.g., [2,1,3]."
+            },
+            {
+                usage: "arrayShuffle[rawArray]",
+                description: "Returns a shuffled version of the raw array."
+            }
+        ],
         categories: [VariableCategory.ADVANCED],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/counter/counter.ts b/src/backend/variables/builtin/counter/counter.ts
index 7f0125b71..fbdafa103 100644
--- a/src/backend/variables/builtin/counter/counter.ts
+++ b/src/backend/variables/builtin/counter/counter.ts
@@ -7,6 +7,12 @@ const model: ReplaceVariable = {
         handle: "counter",
         usage: "counter[name]",
         description: "Displays the value of the given counter.",
+        examples: [
+            {
+                usage: "counter[name]",
+                description: "Returns the value of the specified counter"
+            }
+        ],
         categories: [VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/currency/currency-rank.ts b/src/backend/variables/builtin/currency/currency-rank.ts
index 9833bca40..e60f4dbe8 100644
--- a/src/backend/variables/builtin/currency/currency-rank.ts
+++ b/src/backend/variables/builtin/currency/currency-rank.ts
@@ -7,8 +7,14 @@ import currencyManager from "../../../currency/currency-manager";
 const model : ReplaceVariable = {
     definition: {
         handle: "currencyRank",
-        description: "Returns the rank of the given user based on how much of the given currency they have.",
+        description: "Returns the rank of the current user based on how much of the given currency they have.",
         usage: "currencyRank[currencyName, username]",
+        examples: [
+            {
+                usage: "currencyRank[currencyName, username]",
+                description: "Returns the rank for the specified user in the specified currency"
+            }
+        ],
         categories: [VariableCategory.USER, VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/currency/currency.ts b/src/backend/variables/builtin/currency/currency.ts
index 9fbf6325d..802d3a2f9 100644
--- a/src/backend/variables/builtin/currency/currency.ts
+++ b/src/backend/variables/builtin/currency/currency.ts
@@ -7,8 +7,14 @@ import currencyManager from "../../../currency/currency-manager";
 const model : ReplaceVariable = {
     definition: {
         handle: "currency",
-        description: "How much of the given currency the given user has.",
-        usage: "currency[currencyName, username]",
+        description: "How much of the given currency the current user has.",
+        usage: "currency[currencyName]",
+        examples: [
+            {
+                usage: "currency[currencyName, username]",
+                description: "Returns the amount of specified currency the given user fas"
+            }
+        ],
         categories: [VariableCategory.USER, VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/currency/top-currency.ts b/src/backend/variables/builtin/currency/top-currency.ts
index d3d3aec9c..dacb1becb 100644
--- a/src/backend/variables/builtin/currency/top-currency.ts
+++ b/src/backend/variables/builtin/currency/top-currency.ts
@@ -10,6 +10,12 @@ const model : ReplaceVariable = {
         handle: "topCurrency",
         description: "Comma separated list of users with the most of the given currency. Defaults to top 10, you can provide a custom number as a second argument.",
         usage: "topCurrency[currencyName]",
+        examples: [
+            {
+                usage: "topCurrency[Points, 5]",
+                description: "Returns comma-separated list of top 5 users with their Points amounts"
+            }
+        ],
         possibleDataOutput: [OutputDataType.TEXT]
     },
 
diff --git a/src/backend/variables/builtin/metadata/arg-array-raw.ts b/src/backend/variables/builtin/metadata/arg-array-raw.ts
index 6e042dd6a..404b9a3a3 100644
--- a/src/backend/variables/builtin/metadata/arg-array-raw.ts
+++ b/src/backend/variables/builtin/metadata/arg-array-raw.ts
@@ -10,7 +10,7 @@ triggers[EffectTrigger.MANUAL] = true;
 const model : ReplaceVariable = {
     definition: {
         handle: "rawArgArray",
-        description: "(Deprecated; use $argArray) Returns the raw array of command arguments",
+        description: "(Deprecated: use $argArray) Returns the raw array of command arguments",
         triggers: triggers,
         categories: [VariableCategory.ADVANCED],
         possibleDataOutput: [OutputDataType.ARRAY]
diff --git a/src/backend/variables/builtin/utility/get-effect-queue-length.ts b/src/backend/variables/builtin/metadata/effect-queue-length.ts
similarity index 95%
rename from src/backend/variables/builtin/utility/get-effect-queue-length.ts
rename to src/backend/variables/builtin/metadata/effect-queue-length.ts
index 432c8e383..68133c5e1 100644
--- a/src/backend/variables/builtin/utility/get-effect-queue-length.ts
+++ b/src/backend/variables/builtin/metadata/effect-queue-length.ts
@@ -12,7 +12,7 @@ const model : ReplaceVariable = {
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: async (_trigger, text = "") => {
-        const selectedQueue = effectQueueManager.getAllItems().find((queue) => queue.name === text);
+        const selectedQueue = effectQueueManager.getAllItems().find(queue => queue.name === text);
         if (selectedQueue) {
             return selectedQueue.length.toString();
         }
diff --git a/src/backend/variables/builtin/metadata/top-metadata.ts b/src/backend/variables/builtin/metadata/top-metadata.ts
index 9a4f4ef7b..79dbdfca8 100644
--- a/src/backend/variables/builtin/metadata/top-metadata.ts
+++ b/src/backend/variables/builtin/metadata/top-metadata.ts
@@ -9,6 +9,12 @@ const model : ReplaceVariable = {
         handle: "topMetadata",
         description: "Comma separated list of users with the most of the given metadata key. Defaults to top 10, you can provide a custom number as a second argument.",
         usage: "topMetadata[metadataKey]",
+        examples: [
+            {
+                usage: "topMetadata[deaths, 5]",
+                description: "Returns comma-separated list of top 5 users with their death counts"
+            }
+        ],
         possibleDataOutput: [OutputDataType.TEXT]
     },
 
diff --git a/src/backend/variables/builtin/misc/view-time.ts b/src/backend/variables/builtin/misc/view-time.ts
index 1d8c040f0..f1213a561 100644
--- a/src/backend/variables/builtin/misc/view-time.ts
+++ b/src/backend/variables/builtin/misc/view-time.ts
@@ -6,10 +6,20 @@ import viewerDatabase from "../../../viewers/viewer-database";
 const model : ReplaceVariable = {
     definition: {
         handle: "viewTime",
-        usage: "viewTime[username]",
+        usage: "viewTime",
         description: "Displays the view time (in hours) of a given viewer (leave blank to use current viewer)",
+        examples: [
+            {
+                usage: "viewTime",
+                description: "Returns view time for current viewer"
+            },
+            {
+                usage: "viewTime[username]",
+                description: "Returns view time for specified viewer"
+            }
+        ],
         categories: [VariableCategory.USER],
-        possibleDataOutput: [OutputDataType.NUMBER]
+        possibleDataOutput: [OutputDataType.NUMBER, OutputDataType.TEXT]
     },
     evaluator: async (trigger, username: string) => {
         if (username == null) {
diff --git a/src/backend/variables/builtin/number/math.ts b/src/backend/variables/builtin/number/math.ts
index 3956853a2..b810af262 100644
--- a/src/backend/variables/builtin/number/math.ts
+++ b/src/backend/variables/builtin/number/math.ts
@@ -7,8 +7,18 @@ const logger = require("../../../logwrapper");
 const model : ReplaceVariable = {
     definition: {
         handle: "math",
-        usage: "math[expression]",
+        usage: "math[expression]", 
         description: 'Evaluate a math equation using <a href="https://mathjs.org/docs/index.html">math.js</a>',
+        examples: [
+            {
+                usage: "math[2 + 2]",
+                description: "Simple addition calculation returns 4"
+            },
+            {
+                usage: "math[5 * (3 + 2)]",
+                description: "Complex calculation returns 25"
+            }
+        ],
         categories: [VariableCategory.COMMON, VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/number/number-ceil.ts b/src/backend/variables/builtin/number/number-ceil.ts
index 1ce8a2ab2..47ef56513 100644
--- a/src/backend/variables/builtin/number/number-ceil.ts
+++ b/src/backend/variables/builtin/number/number-ceil.ts
@@ -6,6 +6,12 @@ const model : ReplaceVariable = {
         handle: "ceil",
         description: "Rounds up the given number to the nearest whole number.",
         usage: "ceil[num]",
+        examples: [
+            {
+                usage: "ceil[3.2]",
+                description: "Returns 4"
+            }
+        ],
         categories: [VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/number/number-commafy.ts b/src/backend/variables/builtin/number/number-commafy.ts
index ed1ba668f..82313520d 100644
--- a/src/backend/variables/builtin/number/number-commafy.ts
+++ b/src/backend/variables/builtin/number/number-commafy.ts
@@ -6,6 +6,12 @@ const model : ReplaceVariable = {
         handle: "commafy",
         description: "Adds the appropriate commas to a number.",
         usage: "commafy[number]",
+        examples: [
+            {
+                usage: "commafy[1000000]",
+                description: "Returns \"1,000,000\""
+            }
+        ],
         categories: [VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/number/number-floor.ts b/src/backend/variables/builtin/number/number-floor.ts
index 9629e1b15..4985ccccc 100644
--- a/src/backend/variables/builtin/number/number-floor.ts
+++ b/src/backend/variables/builtin/number/number-floor.ts
@@ -6,6 +6,16 @@ const model : ReplaceVariable = {
         handle: "floor",
         description: "Rounds down the given number to the nearest whole number.",
         usage: "floor[num]",
+        examples: [
+            {
+                usage: "floor[3.7]",
+                description: "Returns 3"
+            },
+            {
+                usage: "floor[$presetListArg[Number]]",
+                description: "Rounds down the preset list argument value"
+            }
+        ],
         categories: [VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/number/number-max.ts b/src/backend/variables/builtin/number/number-max.ts
index 1f35b1f31..cc84bedfe 100644
--- a/src/backend/variables/builtin/number/number-max.ts
+++ b/src/backend/variables/builtin/number/number-max.ts
@@ -6,6 +6,12 @@ const model : ReplaceVariable = {
         handle: "max",
         description: "Returns the highest-value numbered passed",
         usage: "max[num1, num2, ...]",
+        examples: [
+            {
+                usage: "max[1, 5, 3, 10]",
+                description: "Returns 10, the highest value from the input numbers"
+            }
+        ],
         categories: [VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/number/number-min.ts b/src/backend/variables/builtin/number/number-min.ts
index 1a8654785..0cd31a402 100644
--- a/src/backend/variables/builtin/number/number-min.ts
+++ b/src/backend/variables/builtin/number/number-min.ts
@@ -6,6 +6,12 @@ const model : ReplaceVariable = {
         handle: "min",
         description: "Returns the lowest-value numbered passed",
         usage: "min[num1, num2, ...]",
+        examples: [
+            {
+                usage: "min[1, 5, 3, 10]",
+                description: "Returns 1, the lowest value from the input numbers"
+            }
+        ],
         categories: [VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NULL, OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/object/object-set-property.ts b/src/backend/variables/builtin/object/object-set-property.ts
index 531dcd54b..6af1c419f 100644
--- a/src/backend/variables/builtin/object/object-set-property.ts
+++ b/src/backend/variables/builtin/object/object-set-property.ts
@@ -8,6 +8,20 @@ const model : ReplaceVariable = {
         handle: "setObjectProperty",
         description: "Adds or updates a property's value in the given JSON object. For nested properties, you can use dot notation (e.g. some.property). Set value to null to remove property.",
         usage: "setObjectProperty[object, propertyPath, value]",
+        examples: [
+            {
+                usage: `setObjectProperty[{"name": "John"}, age, 25]`,
+                description: `Adds/updates the age property to 25. Result: {"name": "John", "age": 25}`
+            },
+            {
+                usage: `setObjectProperty[{"user": {"name": "John"}}, user.age, 25]`,
+                description: `Adds/updates a nested property using dot notation. Result: {"user": {"name": "John", "age": 25}}`
+            },
+            {
+                usage: `setObjectProperty[{"name": "John", "age": 25}, age, null]`,
+                description: `Removes the age property. Result: {"name": "John"}`
+            }
+        ],
         categories: [VariableCategory.ADVANCED],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/text/text-capitalize.ts b/src/backend/variables/builtin/text/text-capitalize.ts
index 74b10adf1..3689fb634 100644
--- a/src/backend/variables/builtin/text/text-capitalize.ts
+++ b/src/backend/variables/builtin/text/text-capitalize.ts
@@ -6,6 +6,12 @@ const model : ReplaceVariable = {
         handle: "capitalize",
         description: "Capitalizes the given text.",
         usage: "capitalize[text]",
+        examples: [
+            {
+                usage: `capitalize["hello world"]`,
+                description: `Returns "Hello world".`
+            }
+        ],
         categories: [VariableCategory.TEXT],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/text/text-concat.ts b/src/backend/variables/builtin/text/text-concat.ts
index 148d0b7f6..de00ab72c 100644
--- a/src/backend/variables/builtin/text/text-concat.ts
+++ b/src/backend/variables/builtin/text/text-concat.ts
@@ -7,6 +7,12 @@ const model : ReplaceVariable = {
         handle: "concat",
         description: "Appends text together",
         usage: "concat[text, text, ...]",
+        examples: [
+            {
+                usage: `concat[Hello, " ", World]`,
+                description: `Returns "Hello World"`
+            }
+        ],
         categories: [VariableCategory.TEXT],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/text/text-decode-from-html.ts b/src/backend/variables/builtin/text/text-decode-from-html.ts
index bd772f3e9..e7e802560 100644
--- a/src/backend/variables/builtin/text/text-decode-from-html.ts
+++ b/src/backend/variables/builtin/text/text-decode-from-html.ts
@@ -9,6 +9,12 @@ const model : ReplaceVariable = {
         handle: "decodeFromHtml",
         description: "Decodes input text from an HTML-encoded string",
         usage: "decodeFromHtml[text]",
+        examples: [
+            {
+                usage: `decodeFromHtml[&lt;p&gt;Hello &amp; Welcome!&lt;/p&gt;]`,
+                description: `Returns "<p>Hello & Welcome!</p>"`
+            }
+        ],
         categories: [VariableCategory.TEXT],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/text/text-decode-from-url.ts b/src/backend/variables/builtin/text/text-decode-from-url.ts
index 3e17cff34..cb99d0a4c 100644
--- a/src/backend/variables/builtin/text/text-decode-from-url.ts
+++ b/src/backend/variables/builtin/text/text-decode-from-url.ts
@@ -7,6 +7,12 @@ const model : ReplaceVariable = {
         handle: "decodeFromUrl",
         description: "Decodes input text from a URL-encoded string",
         usage: "decodeFromUrl[text]",
+        examples: [
+            {
+                usage: `decodeFromUrl["Hello%20World%21"]`,
+                description: "Returns Hello World!"
+            }
+        ],
         categories: [VariableCategory.TEXT],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/text/text-encode-for-html.ts b/src/backend/variables/builtin/text/text-encode-for-html.ts
index d19196c02..cf7dc8fa0 100644
--- a/src/backend/variables/builtin/text/text-encode-for-html.ts
+++ b/src/backend/variables/builtin/text/text-encode-for-html.ts
@@ -9,6 +9,12 @@ const model : ReplaceVariable = {
         handle: "encodeForHtml",
         description: "Encodes input text for safe use within HTML templates",
         usage: "encodeForHtml[text]",
+        examples: [
+            {
+                usage: "encodeForHtml[<p>Hello & Welcome!</p>]",
+                description: `Returns "&lt;p&gt;Hello &amp; Welcome!&lt;/p&gt;"`
+            }
+        ],
         categories: [VariableCategory.TEXT],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/text/text-encode-for-url.ts b/src/backend/variables/builtin/text/text-encode-for-url.ts
index efc4b73d3..8fdf0a440 100644
--- a/src/backend/variables/builtin/text/text-encode-for-url.ts
+++ b/src/backend/variables/builtin/text/text-encode-for-url.ts
@@ -7,6 +7,12 @@ const model : ReplaceVariable = {
         handle: "encodeForUrl",
         description: "Encodes input text for use in a URL",
         usage: "encodeForUrl[text]",
+        examples: [
+            {
+                usage: "encodeForUrl[Hello World!]",
+                description: `Returns "Hello%20World%21"`
+            }
+        ],
         categories: [VariableCategory.TEXT],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/user/account-creation-date.ts b/src/backend/variables/builtin/twitch/account-creation-date.ts
similarity index 100%
rename from src/backend/variables/builtin/user/account-creation-date.ts
rename to src/backend/variables/builtin/twitch/account-creation-date.ts
diff --git a/src/backend/variables/builtin/twitch/twitch-channel-url.ts b/src/backend/variables/builtin/twitch/twitch-channel-url.ts
index 5f6247e71..0c0c73945 100644
--- a/src/backend/variables/builtin/twitch/twitch-channel-url.ts
+++ b/src/backend/variables/builtin/twitch/twitch-channel-url.ts
@@ -4,12 +4,27 @@ import { OutputDataType, VariableCategory } from "../../../../shared/variable-co
 const model: ReplaceVariable = {
     definition: {
         handle: "twitchChannelUrl",
-        usage: "twitchChannelUrl[channel]",
-        description: "Returns the Twitch URL for the given channel name (e.g. https://www.twitch.tv/ReallyCoolFirebotUser).",
+        usage: "twitchChannelUrl[channelName]",
+        description: "Returns the Twitch URL for the given channel name (e.g. https://www.twitch.tv/reallycoolfirebotuser).",
+        examples: [
+            {
+                usage: "twitchChannelUrl[$streamer]",
+                description: "Returns the Twitch URL for the given channel name (e.g. https://www.twitch.tv/reallycoolfirebotuser)."
+            },
+            {
+                usage: "twitchChannelUrl[$username]",
+                description: "Returns the Twitch URL for the given channel name (e.g. https://www.twitch.tv/reallycoolfirebotuser)."
+            },
+            {
+                usage: "twitchChannelUrl[$target]",
+                description: "Returns the Twitch URL for the given channel name (e.g. https://www.twitch.tv/reallycoolfirebotuser).(Not all Display Names will work)"
+            }
+        ],
         categories: [VariableCategory.TEXT, VariableCategory.COMMON],
         possibleDataOutput: [OutputDataType.TEXT]
     },
     evaluator: (trigger, channelName: string) => {
+
         return `https://www.twitch.tv/${channelName}`;
     }
 };
diff --git a/src/backend/variables/builtin/user/chat-messages.ts b/src/backend/variables/builtin/user/chat-messages.ts
index 22309855d..936cebe0b 100644
--- a/src/backend/variables/builtin/user/chat-messages.ts
+++ b/src/backend/variables/builtin/user/chat-messages.ts
@@ -6,8 +6,18 @@ import viewerDatabase from "../../../viewers/viewer-database";
 const model : ReplaceVariable = {
     definition: {
         handle: "chatMessages",
-        usage: "chatMessages[username]",
+        usage: "chatMessages",
         description: "Displays the number of chat messages for a viewer (leave blank to use current viewer)",
+        examples: [
+            {
+                usage: "chatMessages",
+                description: "Returns the number of chat messages for the current viewer"
+            },
+            {
+                usage: "chatMessages[username]",
+                description: "Returns the number of chat messages for the specified user"
+            }
+        ],
         categories: [VariableCategory.USER],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/user/index.ts b/src/backend/variables/builtin/user/index.ts
index d6eb30a12..dbb812614 100644
--- a/src/backend/variables/builtin/user/index.ts
+++ b/src/backend/variables/builtin/user/index.ts
@@ -1,4 +1,4 @@
-import accountCreationDate from './account-creation-date';
+import accountCreationDate from '../twitch/account-creation-date';
 import chatMessages from './chat-messages';
 import isUserInChat from './is-user-in-chat';
 import metadataKey from './metadata-key';
diff --git a/src/backend/variables/builtin/user/user-exists.ts b/src/backend/variables/builtin/user/user-exists.ts
index d62f0f6d5..62c8eef19 100644
--- a/src/backend/variables/builtin/user/user-exists.ts
+++ b/src/backend/variables/builtin/user/user-exists.ts
@@ -9,7 +9,7 @@ const model : ReplaceVariable = {
         usage: "userExists[username]",
         description: "Outputs 'true' if a user exists in Firebot's database, 'false' if not",
         categories: [VariableCategory.ADVANCED],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.TEXT, OutputDataType.BOOLEAN]
     },
     evaluator: async (_, username: string) => {
         const user = await viewerDatabase.getViewerByUsername(username);
diff --git a/src/backend/variables/builtin/user/user-is-banned.ts b/src/backend/variables/builtin/user/user-is-banned.ts
index b105a144f..89c3ae091 100644
--- a/src/backend/variables/builtin/user/user-is-banned.ts
+++ b/src/backend/variables/builtin/user/user-is-banned.ts
@@ -8,7 +8,7 @@ const UserIsBannedVariable: ReplaceVariable = {
         usage: "userIsBanned[username]",
         description: "Returns `true` if the specified user is currently banned (not just timed out), otherwise returns `false`.",
         categories: [VariableCategory.COMMON, VariableCategory.TRIGGER, VariableCategory.USER],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.TEXT, OutputDataType.BOOLEAN]
     },
     evaluator: async (trigger, username: string) => {
         if (username == null || username === "") {
diff --git a/src/backend/variables/builtin/user/user-is-timed-out.ts b/src/backend/variables/builtin/user/user-is-timed-out.ts
index 6bb63b841..2bde9eb90 100644
--- a/src/backend/variables/builtin/user/user-is-timed-out.ts
+++ b/src/backend/variables/builtin/user/user-is-timed-out.ts
@@ -8,7 +8,7 @@ const UserIsTimedOutVariable: ReplaceVariable = {
         usage: "userIsTimedOut[username]",
         description: "Returns `true` if the specified user is currently timed out, otherwise returns `false`.",
         categories: [VariableCategory.COMMON, VariableCategory.TRIGGER, VariableCategory.USER],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.TEXT, OutputDataType.BOOLEAN]
     },
     evaluator: async (trigger, username: string) => {
         if (username == null || username === "") {
diff --git a/src/backend/variables/builtin/utility/audio-duration.ts b/src/backend/variables/builtin/utility/audio-duration.ts
index 9a26aecef..6659f2c85 100644
--- a/src/backend/variables/builtin/utility/audio-duration.ts
+++ b/src/backend/variables/builtin/utility/audio-duration.ts
@@ -8,8 +8,18 @@ const model : ReplaceVariable = {
         handle: "audioDuration",
         usage: "audioDuration[filePathOrUrl]",
         description: "Attempts to retrieve audio duration.",
+        examples: [
+            {
+                usage: `audioDuration["path/to/audio.mp3"]`,
+                description: "Returns the duration of the audio file in seconds."
+            },
+            {
+                usage: `audioDuration["https://example.com/audio.mp3"]`,
+                description: "Returns the duration of the audio file from a URL in seconds."
+            }
+        ],
         categories: [VariableCategory.ADVANCED],
-        possibleDataOutput: [OutputDataType.NUMBER]
+        possibleDataOutput: [OutputDataType.NUMBER, OutputDataType.TEXT]
     },
     evaluator: async (trigger, url) => {
         if (url == null) {
diff --git a/src/backend/variables/builtin/utility/convert-from-json.ts b/src/backend/variables/builtin/utility/convert-from-json.ts
index 7c1e5d44f..c848395d5 100644
--- a/src/backend/variables/builtin/utility/convert-from-json.ts
+++ b/src/backend/variables/builtin/utility/convert-from-json.ts
@@ -6,6 +6,12 @@ const model : ReplaceVariable = {
         handle: "convertFromJSON",
         description: "Converts JSON text into a raw object instance",
         usage: "convertFromJSON[json text]",
+        examples: [
+            {
+                usage: `convertFromJSON['{"name": "John", "age": 30}']`,
+                description: "Returns a raw object from JSON string"
+            }
+        ],
         categories: [VariableCategory.ADVANCED],
         possibleDataOutput: [OutputDataType.TEXT]
     },
diff --git a/src/backend/variables/builtin/utility/index.ts b/src/backend/variables/builtin/utility/index.ts
index 82c5e0dfe..27835a407 100644
--- a/src/backend/variables/builtin/utility/index.ts
+++ b/src/backend/variables/builtin/utility/index.ts
@@ -10,7 +10,7 @@ import fileLineCount from './file-line-count';
 import fileName from './file-name';
 import fileRead from './file-read';
 import filesInDirectory from './files-in-directory';
-import getEffectQueueLength from "./get-effect-queue-length";
+import getEffectQueueLength from "../metadata/effect-queue-length";
 import loopCount from './loop-count';
 import loopItem from './loop-item';
 import quickstore from './quick-store';
diff --git a/src/backend/variables/builtin/utility/video-duration.ts b/src/backend/variables/builtin/utility/video-duration.ts
index 70af1f679..26228c150 100644
--- a/src/backend/variables/builtin/utility/video-duration.ts
+++ b/src/backend/variables/builtin/utility/video-duration.ts
@@ -9,8 +9,18 @@ const model : ReplaceVariable = {
         handle: "videoDuration",
         usage: "videoDuration[filePathOrUrl]",
         description: "Attempts to retrieve video duration.",
+        examples: [
+            {
+                usage: "videoDuration[\"path/to/video.mp4\"]",
+                description: "Returns the duration of the video file in seconds."
+            },
+            {
+                usage: "videoDuration[\"https://example.com/video.mp4\"]",
+                description: "Returns the duration of the video file from a URL in seconds."
+            }
+        ],
         categories: [VariableCategory.ADVANCED],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.TEXT, OutputDataType.NUMBER]
     },
     evaluator: async (trigger, url) => {
         if (url == null) {
diff --git a/src/gui/app/directives/misc/replaceVariableMenu.js b/src/gui/app/directives/misc/replaceVariableMenu.js
index 87be6eb8a..7bff323d0 100644
--- a/src/gui/app/directives/misc/replaceVariableMenu.js
+++ b/src/gui/app/directives/misc/replaceVariableMenu.js
@@ -223,10 +223,16 @@
                                         <div class="category-text">All</div>
                                     </div>
                                     <div class="effect-category-wrapper dark" ng-repeat="category in categories" ng-class="{'selected': activeCategory === category}" ng-click="setActiveCategory(category);">
-                                        <div class="category-text">{{category}}</div>
+                                        <div class="category-text">{{category}}
+                                            <tooltip
+                                                style="margin-left: 5px"
+                                                ng-if="category === 'integrations' || category === 'obs'"
+                                                text="'Integrations need to be linked / configured in Settings -> Integrations in order for the variables to work.'"
+                                            ></tooltip>
+                                        </div>
                                     </div>
                                 </div>
-                                <div style="overflow-y: auto;width: 100%;" ng-style="{ height: hasMagicVariables ? '315px': '280px', padding: activeCategory === 'macros' ? '10px 0' : '10px' }">
+                                <div style="overflow-y: auto;width: 100%;" ng-style="{ height: hasMagicVariables ? '408px': '375px', padding: activeCategory === 'macros' ? '10px 0' : '10px' }">
                                     <div ng-hide="activeCategory === 'magic' || activeCategory === 'macros'" ng-repeat="variable in variables | orderBy:'handle' | variableCategoryFilter:activeCategory | variableSearch:variableSearchText" style="margin-bottom: 8px;">
                                         <div style="font-weight: 900;">\${{variable.usage ? variable.usage : variable.handle}} <i class="fal fa-plus-circle clickable" uib-tooltip="Add to textfield" style="color: #0b8dc6" ng-click="addVariable(variable)"></i></div>
                                         <div ng-if="variable.aliases && variable.aliases.length > 0">
diff --git a/src/gui/app/directives/modals/effects/add-new-effect-modal.js b/src/gui/app/directives/modals/effects/add-new-effect-modal.js
index dacc3320e..c79749af0 100644
--- a/src/gui/app/directives/modals/effects/add-new-effect-modal.js
+++ b/src/gui/app/directives/modals/effects/add-new-effect-modal.js
@@ -25,7 +25,7 @@ const { EffectCategory } = require("../../shared/effect-constants");
                                 <tooltip
                                     style="margin-left: 5px"
                                     ng-if="category === 'integrations'"
-                                    text="'Integrations need to be linked in Settings -> Integrations in order for the effects to work.'"
+                                    text="'Integrations need to be linked / configured in Settings -> Integrations in order for the effects to work.'"
                                 ></tooltip>
                             </div>
                         </div>
diff --git a/src/gui/scss/core/_effects.scss b/src/gui/scss/core/_effects.scss
index fa00a48b4..a21465603 100644
--- a/src/gui/scss/core/_effects.scss
+++ b/src/gui/scss/core/_effects.scss
@@ -35,7 +35,7 @@
     &.dark {
         background: $variable-category-bg;
         padding-top: 5px;
-        width: 125px;
+        width: 135px;
     }
 }
 
diff --git a/src/shared/variable-constants.js b/src/shared/variable-constants.js
index dfcb7c863..ef7ee773e 100644
--- a/src/shared/variable-constants.js
+++ b/src/shared/variable-constants.js
@@ -26,7 +26,9 @@ const VariableCategory = Object.freeze({
     USER: "user based",
     TEXT: "text",
     NUMBERS: "numbers",
-    ADVANCED: "advanced"
+    ADVANCED: "advanced",
+    INTEGRATION: "integrations",
+    OBS: "obs"
 });
 
 exports.OutputDataType = OutputDataType;
diff --git a/src/types/variables.d.ts b/src/types/variables.d.ts
index 372197777..1b03ee81d 100644
--- a/src/types/variables.d.ts
+++ b/src/types/variables.d.ts
@@ -6,7 +6,9 @@ export type VariableCategory =
     | "user based"
     | "text"
     | "numbers"
-    | "advanced";
+    | "advanced"
+    | "obs"
+    | "integrations";
 
 interface VariableDefinition {
     handle: string;

From ea0e6ec46a167827c0aa78a6546101304b73474d Mon Sep 17 00:00:00 2001
From: CKY <xx_cky_xx@hotmail.com>
Date: Thu, 28 Nov 2024 10:28:56 -0700
Subject: [PATCH 06/54] fix: command cooldown (#2909)

Co-authored-by: Erik Bigler <erikbigler@gmail.com>
---
 .../chat/commands/command-cooldown-manager.ts | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/backend/chat/commands/command-cooldown-manager.ts b/src/backend/chat/commands/command-cooldown-manager.ts
index 1ba82d247..ce87369ad 100644
--- a/src/backend/chat/commands/command-cooldown-manager.ts
+++ b/src/backend/chat/commands/command-cooldown-manager.ts
@@ -112,13 +112,11 @@ class CommandCooldownManager {
         );
 
         if (cooldown.global > 0) {
-            if (this._cooldownCache.get(globalCacheKey) == null) {
-                this._cooldownCache.set(
-                    globalCacheKey,
-                    DateTime.utc().plus({ seconds: cooldown.global }),
-                    cooldown.global
-                );
-            }
+            this._cooldownCache.set(
+                globalCacheKey,
+                DateTime.utc().plus({ seconds: cooldown.global }),
+                cooldown.global
+            );
         }
         if (cooldown.user > 0) {
             this._cooldownCache.set(
@@ -147,13 +145,11 @@ class CommandCooldownManager {
         );
 
         if (config.cooldown.global > 0) {
-            if (this._cooldownCache.get(globalCacheKey) == null) {
-                this._cooldownCache.set(
-                    globalCacheKey,
-                    DateTime.utc().plus({ seconds: config.cooldown.global }),
-                    config.cooldown.global
-                );
-            }
+            this._cooldownCache.set(
+                globalCacheKey,
+                DateTime.utc().plus({ seconds: config.cooldown.global }),
+                config.cooldown.global
+            );
         }
         if (config.cooldown.user > 0 && config.username != null) {
             this._cooldownCache.set(

From c3ec9dc35249f6793f321851c1830196cea0bd47 Mon Sep 17 00:00:00 2001
From: Dennis Rijsdijk <70665154+dennisrijsdijk@users.noreply.github.com>
Date: Fri, 29 Nov 2024 23:30:27 +0100
Subject: [PATCH 07/54] chore: replace variable examples (#2913)

* chore: move imports

* chore: remove redundant usages

* chore: semantics

* chore: quotes

* chore: typo

* chore: fix currencyRank usage
---
 src/backend/variables/builtin/counter/counter.ts           | 6 ------
 src/backend/variables/builtin/currency/currency-rank.ts    | 2 +-
 src/backend/variables/builtin/currency/currency.ts         | 2 +-
 src/backend/variables/builtin/metadata/index.ts            | 2 ++
 src/backend/variables/builtin/number/math.ts               | 6 +++---
 src/backend/variables/builtin/number/number-commafy.ts     | 2 +-
 src/backend/variables/builtin/number/number-floor.ts       | 4 ----
 src/backend/variables/builtin/number/number-max.ts         | 2 +-
 src/backend/variables/builtin/number/number-min.ts         | 2 +-
 src/backend/variables/builtin/text/text-capitalize.ts      | 6 +++++-
 src/backend/variables/builtin/text/text-decode-from-url.ts | 2 +-
 src/backend/variables/builtin/twitch/index.ts              | 2 ++
 src/backend/variables/builtin/user/index.ts                | 2 --
 src/backend/variables/builtin/utility/index.ts             | 2 --
 src/backend/variables/builtin/utility/video-duration.ts    | 4 ++--
 15 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/backend/variables/builtin/counter/counter.ts b/src/backend/variables/builtin/counter/counter.ts
index fbdafa103..7f0125b71 100644
--- a/src/backend/variables/builtin/counter/counter.ts
+++ b/src/backend/variables/builtin/counter/counter.ts
@@ -7,12 +7,6 @@ const model: ReplaceVariable = {
         handle: "counter",
         usage: "counter[name]",
         description: "Displays the value of the given counter.",
-        examples: [
-            {
-                usage: "counter[name]",
-                description: "Returns the value of the specified counter"
-            }
-        ],
         categories: [VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
diff --git a/src/backend/variables/builtin/currency/currency-rank.ts b/src/backend/variables/builtin/currency/currency-rank.ts
index e60f4dbe8..519936345 100644
--- a/src/backend/variables/builtin/currency/currency-rank.ts
+++ b/src/backend/variables/builtin/currency/currency-rank.ts
@@ -8,7 +8,7 @@ const model : ReplaceVariable = {
     definition: {
         handle: "currencyRank",
         description: "Returns the rank of the current user based on how much of the given currency they have.",
-        usage: "currencyRank[currencyName, username]",
+        usage: "currencyRank[currencyName]",
         examples: [
             {
                 usage: "currencyRank[currencyName, username]",
diff --git a/src/backend/variables/builtin/currency/currency.ts b/src/backend/variables/builtin/currency/currency.ts
index 802d3a2f9..6519f22cc 100644
--- a/src/backend/variables/builtin/currency/currency.ts
+++ b/src/backend/variables/builtin/currency/currency.ts
@@ -12,7 +12,7 @@ const model : ReplaceVariable = {
         examples: [
             {
                 usage: "currency[currencyName, username]",
-                description: "Returns the amount of specified currency the given user fas"
+                description: "Returns the amount of specified currency the given user has"
             }
         ],
         categories: [VariableCategory.USER, VariableCategory.NUMBERS],
diff --git a/src/backend/variables/builtin/metadata/index.ts b/src/backend/variables/builtin/metadata/index.ts
index c04face94..d3e3312f8 100644
--- a/src/backend/variables/builtin/metadata/index.ts
+++ b/src/backend/variables/builtin/metadata/index.ts
@@ -6,6 +6,7 @@ import commandTrigger from './command-trigger';
 import count from './count';
 import effectOutput from './effect-output';
 import effectQueueId from './effect-queue-id';
+import effectQueueLength from './effect-queue-length';
 import effectQueueName from './effect-queue-name';
 import effectQueueStatus from './effect-queue-status';
 import overlayInstance from './overlay-instance';
@@ -26,6 +27,7 @@ export default [
     count,
     effectOutput,
     effectQueueId,
+    effectQueueLength,
     effectQueueName,
     effectQueueStatus,
     overlayInstance,
diff --git a/src/backend/variables/builtin/number/math.ts b/src/backend/variables/builtin/number/math.ts
index b810af262..38147e899 100644
--- a/src/backend/variables/builtin/number/math.ts
+++ b/src/backend/variables/builtin/number/math.ts
@@ -7,16 +7,16 @@ const logger = require("../../../logwrapper");
 const model : ReplaceVariable = {
     definition: {
         handle: "math",
-        usage: "math[expression]", 
+        usage: "math[expression]",
         description: 'Evaluate a math equation using <a href="https://mathjs.org/docs/index.html">math.js</a>',
         examples: [
             {
                 usage: "math[2 + 2]",
-                description: "Simple addition calculation returns 4"
+                description: `Returns 4`
             },
             {
                 usage: "math[5 * (3 + 2)]",
-                description: "Complex calculation returns 25"
+                description: `Returns 25`
             }
         ],
         categories: [VariableCategory.COMMON, VariableCategory.NUMBERS],
diff --git a/src/backend/variables/builtin/number/number-commafy.ts b/src/backend/variables/builtin/number/number-commafy.ts
index 82313520d..0a8eb3fa6 100644
--- a/src/backend/variables/builtin/number/number-commafy.ts
+++ b/src/backend/variables/builtin/number/number-commafy.ts
@@ -9,7 +9,7 @@ const model : ReplaceVariable = {
         examples: [
             {
                 usage: "commafy[1000000]",
-                description: "Returns \"1,000,000\""
+                description: `Returns "1,000,000"`
             }
         ],
         categories: [VariableCategory.NUMBERS],
diff --git a/src/backend/variables/builtin/number/number-floor.ts b/src/backend/variables/builtin/number/number-floor.ts
index 4985ccccc..e6a6aa246 100644
--- a/src/backend/variables/builtin/number/number-floor.ts
+++ b/src/backend/variables/builtin/number/number-floor.ts
@@ -10,10 +10,6 @@ const model : ReplaceVariable = {
             {
                 usage: "floor[3.7]",
                 description: "Returns 3"
-            },
-            {
-                usage: "floor[$presetListArg[Number]]",
-                description: "Rounds down the preset list argument value"
             }
         ],
         categories: [VariableCategory.NUMBERS],
diff --git a/src/backend/variables/builtin/number/number-max.ts b/src/backend/variables/builtin/number/number-max.ts
index cc84bedfe..cc2677c54 100644
--- a/src/backend/variables/builtin/number/number-max.ts
+++ b/src/backend/variables/builtin/number/number-max.ts
@@ -4,7 +4,7 @@ import { OutputDataType, VariableCategory } from "../../../../shared/variable-co
 const model : ReplaceVariable = {
     definition: {
         handle: "max",
-        description: "Returns the highest-value numbered passed",
+        description: "Returns the highest-value number",
         usage: "max[num1, num2, ...]",
         examples: [
             {
diff --git a/src/backend/variables/builtin/number/number-min.ts b/src/backend/variables/builtin/number/number-min.ts
index 0cd31a402..336d2b05f 100644
--- a/src/backend/variables/builtin/number/number-min.ts
+++ b/src/backend/variables/builtin/number/number-min.ts
@@ -4,7 +4,7 @@ import { OutputDataType, VariableCategory } from "../../../../shared/variable-co
 const model : ReplaceVariable = {
     definition: {
         handle: "min",
-        description: "Returns the lowest-value numbered passed",
+        description: "Returns the lowest-value number",
         usage: "min[num1, num2, ...]",
         examples: [
             {
diff --git a/src/backend/variables/builtin/text/text-capitalize.ts b/src/backend/variables/builtin/text/text-capitalize.ts
index 3689fb634..2e56cba6c 100644
--- a/src/backend/variables/builtin/text/text-capitalize.ts
+++ b/src/backend/variables/builtin/text/text-capitalize.ts
@@ -4,12 +4,16 @@ import { OutputDataType, VariableCategory } from "../../../../shared/variable-co
 const model : ReplaceVariable = {
     definition: {
         handle: "capitalize",
-        description: "Capitalizes the given text.",
+        description: "Capitalizes the first letter of the given text, converting the rest into lowercase",
         usage: "capitalize[text]",
         examples: [
             {
                 usage: `capitalize["hello world"]`,
                 description: `Returns "Hello world".`
+            },
+            {
+                usage: `capitalize["HELLO WORLD"]`,
+                description: `Returns "Hello world".`
             }
         ],
         categories: [VariableCategory.TEXT],
diff --git a/src/backend/variables/builtin/text/text-decode-from-url.ts b/src/backend/variables/builtin/text/text-decode-from-url.ts
index cb99d0a4c..36ec4c7c6 100644
--- a/src/backend/variables/builtin/text/text-decode-from-url.ts
+++ b/src/backend/variables/builtin/text/text-decode-from-url.ts
@@ -10,7 +10,7 @@ const model : ReplaceVariable = {
         examples: [
             {
                 usage: `decodeFromUrl["Hello%20World%21"]`,
-                description: "Returns Hello World!"
+                description: `Returns "Hello World!"`
             }
         ],
         categories: [VariableCategory.TEXT],
diff --git a/src/backend/variables/builtin/twitch/index.ts b/src/backend/variables/builtin/twitch/index.ts
index 540a4ce3b..77cacd925 100644
--- a/src/backend/variables/builtin/twitch/index.ts
+++ b/src/backend/variables/builtin/twitch/index.ts
@@ -11,6 +11,7 @@ import rewardVariables from './reward';
 import streamVariables from './stream';
 import subVariables from './subs';
 
+import accountCreationDate from './account-creation-date';
 import followAge from './follow-age';
 import followCount from './follow-count';
 import predictionWinningOutcomeName from './prediction-winning-outcome-name';
@@ -32,6 +33,7 @@ export default [
     ...streamVariables,
     ...subVariables,
 
+    accountCreationDate,
     followAge,
     followCount,
     predictionWinningOutcomeName,
diff --git a/src/backend/variables/builtin/user/index.ts b/src/backend/variables/builtin/user/index.ts
index dbb812614..fde667945 100644
--- a/src/backend/variables/builtin/user/index.ts
+++ b/src/backend/variables/builtin/user/index.ts
@@ -1,4 +1,3 @@
-import accountCreationDate from '../twitch/account-creation-date';
 import chatMessages from './chat-messages';
 import isUserInChat from './is-user-in-chat';
 import metadataKey from './metadata-key';
@@ -25,7 +24,6 @@ import roleVariables from './roles';
 import rankVariables from './ranks';
 
 export default [
-    accountCreationDate,
     chatMessages,
     isUserInChat,
     metadataKey,
diff --git a/src/backend/variables/builtin/utility/index.ts b/src/backend/variables/builtin/utility/index.ts
index 27835a407..2f46d0bab 100644
--- a/src/backend/variables/builtin/utility/index.ts
+++ b/src/backend/variables/builtin/utility/index.ts
@@ -10,7 +10,6 @@ import fileLineCount from './file-line-count';
 import fileName from './file-name';
 import fileRead from './file-read';
 import filesInDirectory from './files-in-directory';
-import getEffectQueueLength from "../metadata/effect-queue-length";
 import loopCount from './loop-count';
 import loopItem from './loop-item';
 import quickstore from './quick-store';
@@ -31,7 +30,6 @@ export default [
     fileName,
     fileRead,
     filesInDirectory,
-    getEffectQueueLength,
     loopCount,
     loopItem,
     quickstore,
diff --git a/src/backend/variables/builtin/utility/video-duration.ts b/src/backend/variables/builtin/utility/video-duration.ts
index 26228c150..a02944482 100644
--- a/src/backend/variables/builtin/utility/video-duration.ts
+++ b/src/backend/variables/builtin/utility/video-duration.ts
@@ -11,11 +11,11 @@ const model : ReplaceVariable = {
         description: "Attempts to retrieve video duration.",
         examples: [
             {
-                usage: "videoDuration[\"path/to/video.mp4\"]",
+                usage: `videoDuration["path/to/video.mp4"]`,
                 description: "Returns the duration of the video file in seconds."
             },
             {
-                usage: "videoDuration[\"https://example.com/video.mp4\"]",
+                usage: `videoDuration["https://example.com/video.mp4"]`,
                 description: "Returns the duration of the video file from a URL in seconds."
             }
         ],

From 65eb69803b9177f27ca5f2d8f2f566f3f157430c Mon Sep 17 00:00:00 2001
From: Erik Bigler <erikbigler@gmail.com>
Date: Fri, 29 Nov 2024 17:17:32 -0600
Subject: [PATCH 08/54] feat(ui): implement selectable-input-editors component,
 use in metadata and websocket effects

---
 .../builtin/send-custom-websocket-event.ts    | 38 ++++++--
 .../effects/builtin/set-user-metadata.js      | 31 +++++-
 src/gui/app/app-main.js                       |  4 +
 .../app/directives/controls/firebot-input.js  | 58 ++++++++---
 .../controls/selectable-input-editors.js      | 63 ++++++++++++
 .../modals/misc/add-or-edit-metadata-modal.js | 95 ++++++++-----------
 src/gui/scss/core/_bootstrap-overrides.scss   |  5 +
 src/gui/scss/core/_live-events.scss           | 15 ++-
 8 files changed, 231 insertions(+), 78 deletions(-)
 create mode 100644 src/gui/app/directives/controls/selectable-input-editors.js

diff --git a/src/backend/effects/builtin/send-custom-websocket-event.ts b/src/backend/effects/builtin/send-custom-websocket-event.ts
index a25087ec7..6db975505 100644
--- a/src/backend/effects/builtin/send-custom-websocket-event.ts
+++ b/src/backend/effects/builtin/send-custom-websocket-event.ts
@@ -17,27 +17,49 @@ const model: EffectType<{
     },
     optionsTemplate: `
         <eos-container header="Event Name">
-            <p class="muted">Enter the name of the event you'd like to send. It will be sent as:<br/><code>custom-event:eventname</code></p>
+            <p class="muted">Enter the name of the event you'd like to send.</p>
             <firebot-input
                 model="effect.eventName"
                 placeholder-text="Enter event name"
                 menu-position="under"
             />
+            <p class="help-block">It will be sent as: <code>custom-event:{{effect.eventName || 'eventname'}}</code></p>
         </eos-container>
 
         <eos-container header="Event Data" pad-top="true">
             <p class="muted">Enter any event data that you'd like to include with the event.</p>
-            <firebot-input
+            <selectable-input-editors
+                editors="editors"
+                initial-editor-label="initialEditorLabel"
                 model="effect.eventData"
-                placeholder-text="Enter event data"
-                use-text-area="true"
-                rows="4"
-                cols="40"
-                menu-position="under"
             />
         </eos-container>
     `,
-    optionsController: () => { },
+    optionsController: ($scope) => {
+        $scope.editors = [
+            {
+                label: "Basic",
+                inputType: "text",
+                useTextArea: true,
+                placeholderText: "Enter event data",
+                menuPosition: "under"
+            },
+            {
+                label: "JSON",
+                inputType: "codemirror",
+                menuPosition: "under",
+                codeMirrorOptions: {
+                    mode: {name: "javascript", json: true},
+                    theme: 'blackboard',
+                    lineNumbers: true,
+                    autoRefresh: true,
+                    showGutter: true
+                }
+            }
+        ];
+
+        $scope.initialEditorLabel = $scope.effect?.eventData?.startsWith("{") || $scope.effect?.eventData?.startsWith("[") ? "JSON" : "Basic";
+    },
     optionsValidator: (effect) => {
         const errors = [];
         if (!(effect.eventName?.length > 0)) {
diff --git a/src/backend/effects/builtin/set-user-metadata.js b/src/backend/effects/builtin/set-user-metadata.js
index cd7c1e8fd..2eaa76b49 100644
--- a/src/backend/effects/builtin/set-user-metadata.js
+++ b/src/backend/effects/builtin/set-user-metadata.js
@@ -24,7 +24,11 @@ const effect = {
 
         <eos-container header="Data" pad-top="true">
             <p class="muted">This is the data that will be saved under the above key in the user's data. Can be text or another replace phrase.</p>
-            <textarea ng-model="effect.data" rows="3" class="form-control" id="data" placeholder="Enter text/data" replace-variables></textarea>
+            <selectable-input-editors
+                editors="editors"
+                initial-editor-label="initialEditorLabel"
+                model="effect.data"
+            />
             <p class="muted" style="font-size: 11px;"><b>Note:</b> If data is a valid JSON string, it will be parsed into an object or array.</p>
 
             <div style="margin-top: 10px;">
@@ -44,7 +48,30 @@ const effect = {
             </div>
         </eos-container>
     `,
-    optionsController: () => {},
+    optionsController: ($scope) => {
+        $scope.editors = [
+            {
+                label: "Basic",
+                inputType: "text",
+                useTextArea: true,
+                placeholderText: "Enter text/data"
+            },
+            {
+                label: "JSON",
+                inputType: "codemirror",
+                placeholderText: "Enter text/data",
+                codeMirrorOptions: {
+                    mode: {name: "javascript", json: true},
+                    theme: 'blackboard',
+                    lineNumbers: true,
+                    autoRefresh: true,
+                    showGutter: true
+                }
+            }
+        ];
+
+        $scope.initialEditorLabel = $scope.effect?.data?.startsWith("{") || $scope.effect?.data?.startsWith("[") ? "JSON" : "Basic";
+    },
     optionsValidator: (effect) => {
         const errors = [];
         if (effect.username == null || effect.username === "") {
diff --git a/src/gui/app/app-main.js b/src/gui/app/app-main.js
index 16cf2a9b3..5c32fb97c 100644
--- a/src/gui/app/app-main.js
+++ b/src/gui/app/app-main.js
@@ -87,6 +87,10 @@
         ]);
     });
 
+    app.config(function($animateProvider) {
+        $animateProvider.classNameFilter(/^(?:(?!ng-animate-disabled).)*$/);
+    });
+
     app.config([
         "ngToastProvider",
         function(ngToast) {
diff --git a/src/gui/app/directives/controls/firebot-input.js b/src/gui/app/directives/controls/firebot-input.js
index 98e128bf0..5d4970c1c 100644
--- a/src/gui/app/directives/controls/firebot-input.js
+++ b/src/gui/app/directives/controls/firebot-input.js
@@ -14,6 +14,7 @@
             disableVariables: "<",
             forceInput: "<?",
             onInputUpdate: "&",
+            codeMirrorOptions: "<?",
             model: "=",
             style: "@",
             menuPosition: "@?",
@@ -22,13 +23,13 @@
         },
         template: `
                 <div style="{{$ctrl.style}}" class="{{$ctrl.class}}">
-                    <div ng-if="$ctrl.useInputGroup" class="input-group">
+                    <div ng-if="$ctrl.useInputGroup && $ctrl.inputType != 'codemirror'" class="input-group">
                         <span class="input-group-addon" id="{{$ctrl.inputGroupId}}">{{$ctrl.inputTitle}}<tooltip ng-if="$ctrl.titleTooltip != null" text="$ctrl.titleTooltip"></tooltip></span>
                         <input
                             id="{{$ctrl.inputId}}"
                             ng-if="$ctrl.forceInputInternal"
                             type="{{$ctrl.disableVariables ? $ctrl.inputType || 'text' : 'text'}}"
-                            class="form-control"
+                            class="form-control ng-animate-disabled"
                             ng-model="$ctrl.model"
                             ng-change="$ctrl.onChange($ctrl.model)"
                             placeholder="{{$ctrl.placeholderText}}"
@@ -42,7 +43,7 @@
                             ng-if="!$ctrl.forceInputInternal"
                             ng-model="$ctrl.model"
                             ng-change="$ctrl.onChange($ctrl.model)"
-                            class="form-control disable-custom-scroll-styles"
+                            class="form-control disable-custom-scroll-styles ng-animate-disabled"
                             ng-class="{ 'single-line-textarea disable-custom-scroll-styles': !$ctrl.allowNewLines }"
                             placeholder="{{$ctrl.placeholderText}}"
                             rows="4"
@@ -57,11 +58,12 @@
                         ></textarea>
                     </div>
 
-                    <div ng-if="!$ctrl.useInputGroup">
+                    <div ng-if="!$ctrl.useInputGroup && $ctrl.inputType != 'codemirror'">
                         <input
                             id="{{$ctrl.inputId}}"
                             ng-if="$ctrl.forceInputInternal"
-                            type="{{$ctrl.disableVariables ? $ctrl.inputType || 'text' : 'text'}}" class="form-control"
+                            type="{{$ctrl.disableVariables ? $ctrl.inputType || 'text' : 'text'}}"
+                            class="form-control ng-animate-disabled"
                             ng-model="$ctrl.model"
                             ng-change="$ctrl.onChange($ctrl.model)"
                             placeholder="{{$ctrl.placeholderText}}"
@@ -75,7 +77,7 @@
                             ng-if="!$ctrl.forceInputInternal"
                             ng-model="$ctrl.model"
                             ng-change="$ctrl.onChange($ctrl.model)"
-                            class="form-control disable-custom-scroll-styles"
+                            class="form-control disable-custom-scroll-styles ng-animate-disabled"
                             ng-class="{ 'single-line-textarea disable-custom-scroll-styles': !$ctrl.allowNewLines }"
                             placeholder="{{$ctrl.placeholderText}}"
                             rows="4"
@@ -90,6 +92,18 @@
                         ></textarea>
                     </div>
 
+                    <div ng-if="$ctrl.inputType == 'codemirror' && $ctrl.codeMirrorOptions">
+                        <div
+                            ui-codemirror="{onLoad : $ctrl.codemirrorLoaded}"
+                            ui-codemirror-opts="$ctrl.codeMirrorOptions"
+                            ui-refresh='$ctrl.codeMirrorOptions'
+                            ng-model="$ctrl.model"
+                            replace-variables="{{$ctrl.dataType}}"
+                            disable-variable-menu="$ctrl.disableVariables"
+                            menu-position="{{$ctrl.menuPosition || 'under'}}"
+                        >
+                        </div>
+                    </div>
                 </div>
             `,
         controller: function ($timeout) {
@@ -104,27 +118,38 @@
 
             $ctrl.forceInputInternal = false;
 
+            $ctrl.cmEditor = null;
+
             $ctrl.onChange = (model) => {
                 if (!$ctrl.allowNewLines) {
                     model = model.replace(/\n/gm, "");
                 }
                 $ctrl.model = model;
                 $timeout(() => {
-                    $ctrl.onInputUpdate();
+                    $ctrl.onInputUpdate?.();
                 }, 25);
             };
 
-            $ctrl.$onInit = () => {
-                $ctrl.forceInputInternal = !$ctrl.useTextArea && ($ctrl.forceInput || $ctrl.disableVariables && $ctrl.inputType !== 'text');
+            const init = () => {
+
                 $ctrl.allowNewLines = $ctrl.useTextArea === true;
                 $ctrl.wrapMode = $ctrl.useTextArea ? "soft" : "off";
                 $ctrl.useInputGroup = $ctrl.inputTitle != null && $ctrl.inputTitle !== "";
 
+                $ctrl.forceInputInternal = !$ctrl.useTextArea && ($ctrl.forceInput || ($ctrl.disableVariables && $ctrl.inputType !== 'text'));
+
+                if ($ctrl.inputType === 'codemirror') {
+                    $ctrl.cmEditor?.refresh();
+                }
+
                 $timeout(() => {
-                    $ctrl.onInputUpdate();
+                    $ctrl.onInputUpdate?.();
                 }, 25);
             };
 
+            $ctrl.$onInit = init;
+            $ctrl.$onChanges = init;
+
             $ctrl.onResize = () => {
                 $ctrl.wrapMode = "soft";
             };
@@ -132,7 +157,7 @@
             // This is a hack to make the input field resize properly when it has a scrollbar
             $ctrl.$postLink = () => {
                 $timeout(() => {
-                    if ($ctrl.useTextArea || $ctrl.forceInputInternal) {
+                    if ($ctrl.inputType === "codemirror" || $ctrl.useTextArea || $ctrl.forceInputInternal) {
                         return;
                     }
 
@@ -153,6 +178,17 @@
                     }, 25);
                 }, 25);
             };
+
+            $ctrl.codemirrorLoaded = function(_editor) {
+                $ctrl.cmEditor = _editor;
+                $ctrl.cmEditor.refresh();
+                const cmResize = require("cm-resize");
+                cmResize(_editor, {
+                    minHeight: 200,
+                    resizableWidth: false,
+                    resizableHeight: true
+                });
+            };
         }
     });
 })();
diff --git a/src/gui/app/directives/controls/selectable-input-editors.js b/src/gui/app/directives/controls/selectable-input-editors.js
new file mode 100644
index 000000000..48b88d424
--- /dev/null
+++ b/src/gui/app/directives/controls/selectable-input-editors.js
@@ -0,0 +1,63 @@
+"use strict";
+
+(function () {
+    angular.module("firebotApp").component("selectableInputEditors", {
+        bindings: {
+            editors: "<",
+            initialEditorLabel: "<?",
+            model: "="
+        },
+        template: `
+        <div ng-class="{ 'input-editor-selector-container': $ctrl.editors.length > 1 }">
+            <div ng-if="$ctrl.editors.length > 1" class="flex items-center">
+                <div class="text-dropdown input-editor-dropdown" uib-dropdown uib-dropdown-toggle>
+                    <a href role="button" class="ddtext" style="font-size: 12px;">{{$ctrl.selectedEditor ? $ctrl.selectedEditor.label : ''}}<span class="fb-arrow down ddtext"></span></a>
+                    <ul class="dropdown-menu" uib-dropdown-menu role="menu">
+                        <li class="dropdown-header">Editor Types</li>
+                        <li ng-repeat="option in $ctrl.editors track by option.label" role="none">
+                            <a href class="pl-4" ng-click="$ctrl.selectedEditor = option" role="menuitem" aria-label="{{option.label}}">
+                                <span>{{option.label}}</span>
+                                <span
+                                    ng-show="$ctrl.selectedEditor && $ctrl.selectedEditor.label === option.label"
+                                    style="color:green;display: inline-block;"
+                                >
+                                    <i class="fas fa-check"></i>
+                                </span>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div ng-if="$ctrl.selectedEditor != null">
+                <firebot-input
+                    input-title="{{$ctrl.selectedEditor.inputTitle || ''}}"
+                    input-type="{{$ctrl.selectedEditor.inputType || ''}}"
+                    title-tooltip="{{$ctrl.selectedEditor.titleTooltip || ''}}"
+                    placeholder-text="{{$ctrl.selectedEditor.placeholderText || ''}}"
+                    data-type="{{$ctrl.selectedEditor.dataType || ''}}"
+                    use-text-area="$ctrl.selectedEditor.useTextArea"
+                    disable-variables="$ctrl.selectedEditor.disableVariables"
+                    force-input="$ctrl.selectedEditor.forceInput"
+                    on-input-update="$ctrl.selectedEditor.onInputUpdate"
+                    code-mirror-options="$ctrl.selectedEditor.codeMirrorOptions"
+                    model="$ctrl.model"
+                    style="{{$ctrl.selectedEditor.style || ''}}"
+                    menu-position="{{$ctrl.selectedEditor.menuPosition || ''}}"
+                    var-btn-position="{{$ctrl.selectedEditor.varBtnPosition || ''}}"
+                    class="{{$ctrl.selectedEditor.class || ''}}"
+                ></firebot-input>
+            </div>
+        </div>`,
+        controller: function () {
+            const $ctrl = this;
+
+            $ctrl.selectedEditor = null;
+
+            $ctrl.$onInit = () => {
+                $ctrl.selectedEditor = $ctrl.initialEditorLabel
+                    ? $ctrl.editors.find(o => o.label === $ctrl.initialEditorLabel) ?? $ctrl.editors[0]
+                    : $ctrl.editors[0];
+            };
+        }
+    });
+})();
\ No newline at end of file
diff --git a/src/gui/app/directives/modals/misc/add-or-edit-metadata-modal.js b/src/gui/app/directives/modals/misc/add-or-edit-metadata-modal.js
index 38eda5cde..c42873730 100644
--- a/src/gui/app/directives/modals/misc/add-or-edit-metadata-modal.js
+++ b/src/gui/app/directives/modals/misc/add-or-edit-metadata-modal.js
@@ -14,15 +14,15 @@
 
                         <div class="form-group" ng-class="{'has-error': $ctrl.formFieldHasError('key')}">
                             <label for="key" class="control-label">Key</label>
-                            <input 
+                            <input
                                 ng-if="$ctrl.isNew"
-                                type="text" 
-                                id="key" 
-                                name="key" 
-                                class="form-control input-lg" 
+                                type="text"
+                                id="key"
+                                name="key"
+                                class="form-control input-lg"
                                 placeholder="Enter key"
                                 ng-model="$ctrl.metadata.key"
-                                ui-validate="'$value != null && $value.length > 0'" 
+                                ui-validate="'$value != null && $value.length > 0'"
                                 required
                                 disable-variables="true"
                             />
@@ -31,34 +31,11 @@
 
                         <div class="form-group" ng-class="{'has-error': $ctrl.formFieldHasError('value')}">
                             <label for="value" class="control-label">Data</label>
-                            <input
-                                ng-if="expectedValueType === 'string' || expectedValueType === 'number'" 
-                                type="{{expectedValueType === 'number' ? 'number' : 'text'}}" 
-                                id="value" 
-                                name="value" 
-                                class="form-control input-lg" 
-                                placeholder="Enter value"
-                                ng-model="$ctrl.metadata.value"
-                                disable-variables="true"
+                            <selectable-input-editors
+                                editors="editors"
+                                model="$ctrl.metadata.value"
                             />
-                            <div
-                                ng-if="expectedValueType === 'json'"
-                                ui-codemirror="{ onLoad : codemirrorLoaded }"
-                                ui-codemirror-opts="editorSettings"
-                                ng-model="$ctrl.metadata.value"
-                            >
-                            </div>
                         </div>
-
-                        <div ng-show="$ctrl.isNew">
-                            <div>Data Editor Type</div>
-                            <dropdown-select 
-                                options="{ string: 'Text', number: 'Number', json: 'JSON' }" 
-                                selected="expectedValueType"
-                            >
-                            </dropdown-select>
-                        </div>
-                        
                     </form>
                 </div>
                 <div class="modal-footer">
@@ -74,32 +51,39 @@
             controller: function($scope) {
                 const $ctrl = this;
 
-                // string, number, json
-                $scope.expectedValueType = "string";
                 $scope.$watch("type", (newValue) => {
                     if (newValue === "json") {
                         $ctrl.metadata.value = ($ctrl.metadata.value || "").toString();
                     }
                 });
 
-                $scope.editorSettings = {
-                    mode: {name: "javascript", json: true},
-                    theme: 'blackboard',
-                    lineNumbers: true,
-                    autoRefresh: true,
-                    showGutter: true
-                };
-
-                $scope.codemirrorLoaded = function(_editor) {
-                    // Editor part
-                    _editor.refresh();
-                    const cmResize = require("cm-resize");
-                    cmResize(_editor, {
-                        minHeight: 200,
-                        resizableWidth: false,
-                        resizableHeight: true
-                    });
-                };
+                $scope.editors = [
+                    {
+                        label: "Text",
+                        inputType: "text",
+                        placeholderText: "Enter value",
+                        disableVariables: true
+                    },
+                    {
+                        label: "Number",
+                        inputType: "number",
+                        placeholderText: "Enter value",
+                        disableVariables: true,
+                        forceInput: true
+                    },
+                    {
+                        label: "JSON",
+                        inputType: "codemirror",
+                        disableVariables: true,
+                        codeMirrorOptions: {
+                            mode: {name: "javascript", json: true},
+                            theme: 'blackboard',
+                            lineNumbers: true,
+                            autoRefresh: true,
+                            showGutter: true
+                        }
+                    }
+                ];
 
                 $ctrl.isNew = true;
 
@@ -124,14 +108,13 @@
                         $ctrl.isNew = false;
 
                         const valueType = typeof $ctrl.metadata.value;
-                        console.log($ctrl.metadata.value, valueType);
                         if (valueType === "number") {
-                            $scope.expectedValueType = "number";
+                            $scope.editors = $scope.editors.filter(e => e.inputType !== "number");
                         } else if (valueType === "object") {
-                            $scope.expectedValueType = "json";
                             $ctrl.metadata.value = JSON.stringify($ctrl.metadata.value, null, 4);
+                            $scope.editors = $scope.editors.filter(e => e.inputType !== "codemirror");
                         } else {
-                            $scope.expectedValueType = "string";
+                            $scope.editors = $scope.editors.filter(e => e.inputType !== "text");
                         }
                     }
                 };
diff --git a/src/gui/scss/core/_bootstrap-overrides.scss b/src/gui/scss/core/_bootstrap-overrides.scss
index 50570dbd9..18401e37a 100644
--- a/src/gui/scss/core/_bootstrap-overrides.scss
+++ b/src/gui/scss/core/_bootstrap-overrides.scss
@@ -727,4 +727,9 @@ code {
 
 .input-group .form-control:has(~ .variables-btn.below:last-child) {
     border-bottom-right-radius: 0px;
+}
+
+.input-editor-selector-container .form-control,
+.input-editor-selector-container .CodeMirror {
+    border-top-left-radius: 0px !important;
 }
\ No newline at end of file
diff --git a/src/gui/scss/core/_live-events.scss b/src/gui/scss/core/_live-events.scss
index 52c1b6988..50609b670 100644
--- a/src/gui/scss/core/_live-events.scss
+++ b/src/gui/scss/core/_live-events.scss
@@ -21,7 +21,7 @@
     }
 }
 
-.filter-mode-dropdown {
+.filter-mode-dropdown, .input-editor-dropdown  {
     border-bottom: 0px solid #eaecec;
     display: inline-block;
     color: white;
@@ -53,6 +53,19 @@
     }
 }
 
+.input-editor-dropdown {
+    background: rgb(83, 83, 83);
+    padding: 2px 10px;
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+    &:hover, &.open {
+         background: rgb(69, 69, 69);
+    }
+    .dropdown-menu {
+        border-top-left-radius: 0;
+    }
+}
+
 .editior-column {
     width: 215px;
     height: 100%;

From 91868747aad64552354c394b3c93af732d798638 Mon Sep 17 00:00:00 2001
From: Erik Bigler <erikbigler@gmail.com>
Date: Fri, 29 Nov 2024 17:35:04 -0600
Subject: [PATCH 09/54] feat(ui): use selectable-input-editors component in the
 custom variable effect

---
 .../effects/builtin/custom-variable.js        | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/backend/effects/builtin/custom-variable.js b/src/backend/effects/builtin/custom-variable.js
index dbf23eb14..087f90c26 100644
--- a/src/backend/effects/builtin/custom-variable.js
+++ b/src/backend/effects/builtin/custom-variable.js
@@ -21,7 +21,11 @@ const fileWriter = {
 
         <eos-container header="Variable Data" pad-top="true">
             <p class="muted">This is the data that will be saved to the variable. Can be text or another replace phrase.</p>
-            <textarea ng-model="effect.variableData" rows="3" class="form-control" id="chat-text-setting" placeholder="Enter text/data" replace-variables></textarea>
+            <selectable-input-editors
+                editors="editors"
+                initial-editor-label="initialEditorLabel"
+                model="effect.variableData"
+            />
             <p class="muted" style="font-size: 11px;"><b>Note:</b> If variable data is a valid JSON string, it will be parsed into an object or array.</p>
         </eos-container>
 
@@ -59,6 +63,30 @@ const fileWriter = {
         $scope.openVariableInspector = function() {
             backendCommunicator.fireEvent("show-variable-inspector");
         };
+
+        $scope.editors = [
+            {
+                label: "Basic",
+                inputType: "text",
+                useTextArea: true,
+                placeholderText: "Enter variable data",
+                menuPosition: "under"
+            },
+            {
+                label: "JSON",
+                inputType: "codemirror",
+                menuPosition: "under",
+                codeMirrorOptions: {
+                    mode: {name: "javascript", json: true},
+                    theme: 'blackboard',
+                    lineNumbers: true,
+                    autoRefresh: true,
+                    showGutter: true
+                }
+            }
+        ];
+
+        $scope.initialEditorLabel = $scope.effect?.variableData?.startsWith("{") || $scope.effect?.variableData?.startsWith("[") ? "JSON" : "Basic";
     },
     optionsValidator: (effect) => {
         const errors = [];

From 950077a2b5a4b45e966c36c4985552697e7ca032 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Fri, 29 Nov 2024 22:18:22 -0500
Subject: [PATCH 10/54] feat: add custom WebSocket listeners, events to plugins

---
 .../builtin/send-custom-websocket-event.ts    |  4 +-
 src/server/http-server-manager.ts             | 13 ++++++
 src/server/websocket-server-manager.ts        | 46 ++++++++++++++++++-
 src/types/websocket.d.ts                      | 12 ++++-
 4 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/src/backend/effects/builtin/send-custom-websocket-event.ts b/src/backend/effects/builtin/send-custom-websocket-event.ts
index 6db975505..3004d98da 100644
--- a/src/backend/effects/builtin/send-custom-websocket-event.ts
+++ b/src/backend/effects/builtin/send-custom-websocket-event.ts
@@ -1,7 +1,7 @@
 import { EffectType } from "../../../types/effects";
 import { EffectCategory } from "../../../shared/effect-constants";
 import logger from "../../logwrapper";
-import WebSocketServerManager from "../../../server/websocket-server-manager";
+import HttpServerManager from "../../../server/http-server-manager";
 
 const model: EffectType<{
     eventName: string;
@@ -74,7 +74,7 @@ const model: EffectType<{
             try {
                 data = JSON.parse(effect.eventData);
             } catch { }
-            WebSocketServerManager.triggerEvent(`custom-event:${effect.eventName}`, data as object);
+            HttpServerManager.triggerCustomWebSocketEvent(effect.eventName, data as object);
         } catch (error) {
             logger.error(`Error sending custom WebSocket event ${effect.eventName}`, error);
         }
diff --git a/src/server/http-server-manager.ts b/src/server/http-server-manager.ts
index bcf9874c7..bd40b2a22 100644
--- a/src/server/http-server-manager.ts
+++ b/src/server/http-server-manager.ts
@@ -10,6 +10,7 @@ import { settings } from "../backend/common/settings-access";
 import effectManager from "../backend/effects/effectManager";
 import resourceTokenManager from "../backend/resourceTokenManager";
 import websocketServerManager from "./websocket-server-manager";
+import { CustomWebSocketHandler } from "../types/websocket";
 
 import dataAccess from "../backend/common/data-access";
 
@@ -237,6 +238,10 @@ class HttpServerManager extends EventEmitter {
         websocketServerManager.sendToOverlay(eventName, meta, overlayInstance);
     }
 
+    triggerCustomWebSocketEvent(eventType: string, payload: object) {
+        websocketServerManager.triggerEvent(`custom-event:${eventType}`, payload);
+    }
+
     createServerInstance() {
         const app = express();
 
@@ -394,6 +399,14 @@ class HttpServerManager extends EventEmitter {
             fullRoute
         };
     }
+
+    registerCustomWebSocketListener(pluginName: string, callback: CustomWebSocketHandler["callback"]): boolean {
+        return websocketServerManager.registerCustomWebSocketListener(pluginName, callback);
+    }
+
+    unregisterCustomWebSocketListener(pluginName: string): boolean {
+        return websocketServerManager.unregisterCustomWebSocketListener(pluginName);
+    }
 }
 
 const manager = new HttpServerManager();
diff --git a/src/server/websocket-server-manager.ts b/src/server/websocket-server-manager.ts
index 90fbf7dfa..9d8387dcc 100644
--- a/src/server/websocket-server-manager.ts
+++ b/src/server/websocket-server-manager.ts
@@ -5,7 +5,7 @@ import eventManager from "../backend/events/EventManager";
 import http from "http";
 import logger from "../backend/logwrapper";
 import WebSocket from "ws";
-import { OverlayConnectedData, Message, ResponseMessage, EventMessage } from "../types/websocket";
+import { OverlayConnectedData, Message, ResponseMessage, EventMessage, InvokePluginMessage, CustomWebSocketHandler } from "../types/websocket";
 import { WebSocketClient } from "./websocket-client";
 
 function sendResponse(ws: WebSocketClient, messageId: string | number, data: unknown = null) {
@@ -32,6 +32,7 @@ class WebSocketServerManager extends EventEmitter {
     overlayHasClients = false;
 
     private server: WebSocket.Server<typeof WebSocketClient>;
+    private customHandlers: CustomWebSocketHandler[] = [];
 
     createServer(httpServer: http.Server) {
         this.server = new WebSocket.Server<typeof WebSocketClient>({
@@ -87,6 +88,22 @@ class WebSocketServerManager extends EventEmitter {
 
                                     break;
                                 }
+                                case "plugin": {
+                                    const pluginName = (message as InvokePluginMessage).pluginName;
+                                    if (pluginName == null || pluginName === "") {
+                                        sendError(ws, message.id, "Must specify pluginName");
+                                        break;
+                                    }
+                                    const plugin = this.customHandlers.find(p => p.pluginName.toLowerCase() === pluginName.toLowerCase());
+
+                                    if (plugin != null) {
+                                        plugin.callback(message.data);
+                                    } else {
+                                        sendError(ws, message.id, "Unknown plugin name specified");
+                                    }
+
+                                    break;
+                                }
                                 default: {
                                     sendError(ws, message.id, "unknown command invocation");
                                     break;
@@ -196,6 +213,33 @@ class WebSocketServerManager extends EventEmitter {
             this.overlayHasClients = hasClients;
         }
     }
+
+    registerCustomWebSocketListener(pluginName: string, callback: CustomWebSocketHandler["callback"]): boolean {
+        if (this.customHandlers.findIndex(p => p.pluginName.toLowerCase() === pluginName.toLowerCase()) === -1) {
+            this.customHandlers.push({
+                pluginName,
+                callback
+            });
+            logger.info(`Registered custom WebSocket listener for plugin "${pluginName}"`);
+            return true;
+        }
+
+        logger.error(`Custom WebSocket listener "${pluginName}" already registered`);
+        return false;
+    }
+
+    unregisterCustomWebSocketListener(pluginName: string): boolean {
+        const pluginHandlerIndex = this.customHandlers.findIndex(p => p.pluginName.toLowerCase() === pluginName.toLowerCase());
+
+        if (pluginHandlerIndex !== -1) {
+            this.customHandlers.splice(pluginHandlerIndex, 1);
+            logger.info(`Unregistered custom WebSocket listener for plugin "${pluginName}"`);
+            return true;
+        }
+
+        logger.error(`Custom WebSocket listener "${pluginName}" is not registered`);
+        return false;
+    }
 }
 
 const manager = new WebSocketServerManager();
diff --git a/src/types/websocket.d.ts b/src/types/websocket.d.ts
index 6d06cb732..36d5ae9d5 100644
--- a/src/types/websocket.d.ts
+++ b/src/types/websocket.d.ts
@@ -42,7 +42,7 @@ interface Message {
 interface InvokeMessage extends Message {
     type: "invoke";
     id: string|number;
-    data: unknown[];
+    data: unknown;
 }
 interface ResponseMessage extends Message {
     type: "response";
@@ -53,6 +53,16 @@ interface EventMessage extends Message {
     type: "event"
 }
 
+interface InvokePluginMessage extends InvokeMessage {
+    name: "plugin";
+    pluginName: string;
+}
+
+interface CustomWebSocketHandler {
+    pluginName: string;
+    callback: (data: unknown | unknown[]) => Promise<void> | void;
+}
+
 export type OverlayConnectedData = {
     instanceName: string;
 }
\ No newline at end of file

From 5f53dc5cbf467ad33987ec13bc4509a34a803a34 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Sun, 8 Dec 2024 15:36:06 -0500
Subject: [PATCH 11/54] chore: add WebSocket request logging, make HTTP
 requests debug for Dennis

---
 src/server/api/v1/v1Router.js          | 2 +-
 src/server/websocket-server-manager.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/api/v1/v1Router.js b/src/server/api/v1/v1Router.js
index 465162430..b54ded93e 100644
--- a/src/server/api/v1/v1Router.js
+++ b/src/server/api/v1/v1Router.js
@@ -6,7 +6,7 @@ const logger = require("../../../backend/logwrapper");
 
 router.use(function log(req, res, next) {
     // here we could do stuff for every request if we wanted
-    logger.info(`API Request from: ${req.socket.remoteAddress}, for path: ${req.originalUrl}`);
+    logger.debug(`API Request from: ${req.socket.remoteAddress}, for path: ${req.originalUrl}`);
     next();
 });
 
diff --git a/src/server/websocket-server-manager.ts b/src/server/websocket-server-manager.ts
index 9d8387dcc..a566bede6 100644
--- a/src/server/websocket-server-manager.ts
+++ b/src/server/websocket-server-manager.ts
@@ -46,6 +46,8 @@ class WebSocketServerManager extends EventEmitter {
             }, 5000);
 
             ws.on('message', (data) => {
+                logger.debug(`Incoming WebSocket message from: ${req.socket.remoteAddress}, message data: ${data.toString().replace(/(\n|\s+)/g, " ")}`);
+
                 try {
                     const message = JSON.parse(data.toString()) as Message;
 

From 9f0957eabfd81008ee9d815f4d99b7800994e9b0 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Sun, 8 Dec 2024 16:45:05 -0500
Subject: [PATCH 12/54] chore: update UUID ref, change all to v4

---
 package-lock.json                             | 33 ++++++----
 package.json                                  |  3 +-
 .../commands/builtin/command-management.ts    | 10 +--
 src/backend/chat/commands/command-manager.ts  |  4 +-
 src/backend/common/effect-runner.js           |  2 +-
 src/backend/common/frontend-communicator.ts   |  4 +-
 .../custom-scripts/custom-script-runner.js    |  2 +-
 src/backend/database/json-db-manager.ts       |  4 +-
 src/backend/effects/builtin/celebration.js    |  8 +--
 src/backend/effects/builtin/play-sound.js     |  2 +-
 src/backend/effects/builtin/play-video.js     | 18 +++---
 src/backend/effects/builtin/shoutout.js       |  8 +--
 src/backend/events/activity-feed-manager.js   |  8 +--
 .../import/v4/areas/v4-hotkeys-importer.js    |  2 +-
 .../v4/areas/v4-viewergroups-importer.js      |  2 +-
 src/backend/import/v4/v4-effect-mapper.js     |  2 +-
 src/backend/import/v4/v4-permission-mapper.js |  2 +-
 .../aws/text-to-speech-polly-effect.js        |  2 +-
 .../notifications/notification-manager.ts     |  2 +-
 .../variables/builtin/utility/run-effect.ts   |  2 +-
 .../commands/simple-command-options.js        |  2 +-
 src/gui/app/directives/controls/effectList.js | 12 ++--
 src/gui/app/directives/misc/searchbar.js      |  8 +--
 .../addOrEditCustomCommandModal.js            |  2 +-
 .../commands/addOrEditSubcommandModal.js      |  2 +-
 .../addOrEditCurrency/addOrEditCurrency.js    |  4 +-
 .../modals/events/addOrEditEventModal.js      |  4 +-
 .../addOrEditDiscordWebhookModal.js           |  2 +-
 .../misc/add-or-edit-poll-choice-modal.js     |  2 +-
 .../modals/misc/manage-sort-tags.js           |  2 +-
 .../modals/rank/add-or-edit-rank-modal.js     |  2 +-
 .../modals/roles/addOrEditCustomRoleModal.js  |  4 +-
 .../modals/setups/add-edit-setup-question.js  | 10 +--
 .../addOrEditStartupScriptModal.js            |  8 +--
 .../restrictions/restrictionsSection.js       |  4 +-
 .../services/backend-communicator.service.js  |  4 +-
 src/gui/app/services/chat-messages.service.js |  2 +-
 src/gui/app/services/events.service.js        |  4 +-
 src/gui/app/services/hot-key.service.js       |  4 +-
 .../services/object-copy-helper.service.js    |  2 +-
 src/resources/overlay/js/util.js              | 63 ++++++++++---------
 41 files changed, 136 insertions(+), 131 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e73a9467d..80644d2d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,7 +86,7 @@
                 "tiny-typed-emitter": "^2.1.0",
                 "tinycolor2": "^1.6.0",
                 "underscore": "^1.13.1",
-                "uuid": "^3.3.3",
+                "uuid": "^11.0.3",
                 "winston": "^2.4.4",
                 "winston-daily-rotate-file": "^1.7.2",
                 "ws": "^8.2.2",
@@ -99,7 +99,6 @@
                 "@types/fs-extra": "^11.0.4",
                 "@types/luxon": "^3.1.0",
                 "@types/node": "^18.18.2",
-                "@types/uuid": "^10.0.0",
                 "@typescript-eslint/eslint-plugin": "^5.62.0",
                 "@typescript-eslint/parser": "^5.62.0",
                 "electron": "^31.4.0",
@@ -3363,12 +3362,6 @@
             "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
             "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA=="
         },
-        "node_modules/@types/uuid": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
-            "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
-            "dev": true
-        },
         "node_modules/@types/ws": {
             "version": "8.5.10",
             "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
@@ -12087,6 +12080,16 @@
                 "node": ">=0.6"
             }
         },
+        "node_modules/request/node_modules/uuid": {
+            "version": "3.4.0",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+            "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+            "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+            "license": "MIT",
+            "bin": {
+                "uuid": "bin/uuid"
+            }
+        },
         "node_modules/require-directory": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -13648,12 +13651,16 @@
             }
         },
         "node_modules/uuid": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-            "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-            "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+            "version": "11.0.3",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz",
+            "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==",
+            "funding": [
+                "https://github.com/sponsors/broofa",
+                "https://github.com/sponsors/ctavan"
+            ],
+            "license": "MIT",
             "bin": {
-                "uuid": "bin/uuid"
+                "uuid": "dist/esm/bin/uuid"
             }
         },
         "node_modules/v8flags": {
diff --git a/package.json b/package.json
index 71dfa7ea3..db2a4ee40 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
         "@types/fs-extra": "^11.0.4",
         "@types/luxon": "^3.1.0",
         "@types/node": "^18.18.2",
-        "@types/uuid": "^10.0.0",
         "@typescript-eslint/eslint-plugin": "^5.62.0",
         "@typescript-eslint/parser": "^5.62.0",
         "electron": "^31.4.0",
@@ -120,7 +119,7 @@
         "tiny-typed-emitter": "^2.1.0",
         "tinycolor2": "^1.6.0",
         "underscore": "^1.13.1",
-        "uuid": "^3.3.3",
+        "uuid": "^11.0.3",
         "winston": "^2.4.4",
         "winston-daily-rotate-file": "^1.7.2",
         "ws": "^8.2.2",
diff --git a/src/backend/chat/commands/builtin/command-management.ts b/src/backend/chat/commands/builtin/command-management.ts
index 37f926d70..5ac1ac922 100644
--- a/src/backend/chat/commands/builtin/command-management.ts
+++ b/src/backend/chat/commands/builtin/command-management.ts
@@ -1,4 +1,4 @@
-import uuidv1 from "uuid/v1";
+import { v4 as uuid } from "uuid";
 
 import { SystemCommand } from "../../../../types/commands";
 import util from "../../../utility";
@@ -277,10 +277,10 @@ export const CommandManagementSystemCommand: SystemCommand = {
                         global: 0
                     },
                     effects: {
-                        id: uuidv1(),
+                        id: uuid(),
                         list: [
                             {
-                                id: uuidv1(),
+                                id: uuid(),
                                 type: "firebot:chat",
                                 message: remainingData
                             }
@@ -326,7 +326,7 @@ export const CommandManagementSystemCommand: SystemCommand = {
                     chatEffect.message = remainingData;
                 } else {
                     const chatEffect = {
-                        id: uuidv1(),
+                        id: uuid(),
                         type: "firebot:chat",
                         message: remainingData
                     };
@@ -473,7 +473,7 @@ export const CommandManagementSystemCommand: SystemCommand = {
                 }
 
                 restrictions.push({
-                    id: uuidv1(),
+                    id: uuid(),
                     type: "firebot:permissions",
                     mode: "roles",
                     roleIds: roleIds
diff --git a/src/backend/chat/commands/command-manager.ts b/src/backend/chat/commands/command-manager.ts
index f8a2f87ac..a15879080 100644
--- a/src/backend/chat/commands/command-manager.ts
+++ b/src/backend/chat/commands/command-manager.ts
@@ -335,8 +335,8 @@ class CommandManager extends TypedEmitter<Events> {
         if (command.id == null || command.id === "") {
             eventType = "created-item";
             // generate id for new command
-            const uuidv1 = require("uuid/v1");
-            command.id = uuidv1();
+            const { v4: uuid } = require("uuid");
+            command.id = uuid();
 
             command.createdBy = user
                 ? user
diff --git a/src/backend/common/effect-runner.js b/src/backend/common/effect-runner.js
index 69237cc61..565e98920 100644
--- a/src/backend/common/effect-runner.js
+++ b/src/backend/common/effect-runner.js
@@ -9,7 +9,7 @@ const effectQueueManager = require("../effects/queues/effect-queue-manager");
 const effectQueueRunner = require("../effects/queues/effect-queue-runner");
 const webServer = require("../../server/http-server-manager");
 const util = require("../utility");
-const uuid = require("uuid/v4");
+const { v4: uuid } = require("uuid");
 const {
     addEffectAbortController,
     removeEffectAbortController
diff --git a/src/backend/common/frontend-communicator.ts b/src/backend/common/frontend-communicator.ts
index aa586acd6..169041fa1 100644
--- a/src/backend/common/frontend-communicator.ts
+++ b/src/backend/common/frontend-communicator.ts
@@ -1,5 +1,5 @@
 import { ipcMain } from "electron";
-import uuidv1 from "uuid/v1";
+import { v4 as uuid } from "uuid";
 
 import { FrontendCommunicatorModule } from "../../types/script-modules";
 
@@ -44,7 +44,7 @@ class FrontendCommunicator implements FrontendCommunicatorModule {
         callback: (...args: ExpectedArgs) => ReturnPayload,
         async = false
     ): string {
-        const id = uuidv1(),
+        const id = uuid(),
             event = {
                 id: id,
                 callback: callback,
diff --git a/src/backend/common/handlers/custom-scripts/custom-script-runner.js b/src/backend/common/handlers/custom-scripts/custom-script-runner.js
index aa772347e..dada6bbf7 100644
--- a/src/backend/common/handlers/custom-scripts/custom-script-runner.js
+++ b/src/backend/common/handlers/custom-scripts/custom-script-runner.js
@@ -1,6 +1,6 @@
 "use strict";
 const { ipcMain, shell } = require("electron");
-const uuid = require("uuid/v4");
+const { v4: uuid } = require("uuid");
 const logger = require("../../../logwrapper");
 const { settings } = require("../../settings-access");
 const utils = require("../../../utility");
diff --git a/src/backend/database/json-db-manager.ts b/src/backend/database/json-db-manager.ts
index 70347eba0..4eb04343e 100644
--- a/src/backend/database/json-db-manager.ts
+++ b/src/backend/database/json-db-manager.ts
@@ -2,7 +2,7 @@
 
 import profileManager from "../common/profile-manager";
 import logger from "../logwrapper";
-import uuidv1 from "uuid/v1";
+import { v4 as uuid } from "uuid";
 import { TypedEmitter, type ListenerSignature } from "tiny-typed-emitter";
 import { type JsonDB } from "node-json-db";
 
@@ -94,7 +94,7 @@ class JsonDbManager<T extends Item, E extends ListenerSignature<E> = DefaultEven
 
         let isCreating = false;
         if (item.id == null) {
-            item.id = uuidv1();
+            item.id = uuid();
             isCreating = true;
         }
 
diff --git a/src/backend/effects/builtin/celebration.js b/src/backend/effects/builtin/celebration.js
index 8e72c869e..ee4aa56f5 100644
--- a/src/backend/effects/builtin/celebration.js
+++ b/src/backend/effects/builtin/celebration.js
@@ -75,7 +75,7 @@ const celebration = {
    * When the effect is triggered by something
    * Used to validate fields in the option template.
    */
-    optionsValidator: effect => {
+    optionsValidator: (effect) => {
         const errors = [];
         if (effect.celebration == null) {
             errors.push("Please select how you'd like to celebrate.");
@@ -85,7 +85,7 @@ const celebration = {
     /**
    * When the effect is triggered by something
    */
-    onTriggerEvent: async event => {
+    onTriggerEvent: async (event) => {
         // What should this do when triggered.
         const effect = event.effect;
 
@@ -122,7 +122,7 @@ const celebration = {
         },
         event: {
             name: "celebrate",
-            onOverlayEvent: data => {
+            onOverlayEvent: (data) => {
 
                 // Celebrate Packet
                 //{"event": "celebration", "celebrationType": celebrationType, "celebrationDuration":celebrationDuration};
@@ -131,7 +131,7 @@ const celebration = {
 
                 // Generate UUID to use as class name.
                 // eslint-disable-next-line no-undef
-                const divClass = uuidv4();
+                const divClass = uuid();
 
                 if (type === "Fireworks") {
                     const canvas = `<canvas id="fireworks" class="${divClass}-fireworks celebration ${type}" style="display:none; z-index: 99;"></canvas>`;
diff --git a/src/backend/effects/builtin/play-sound.js b/src/backend/effects/builtin/play-sound.js
index 65825a556..29e894b68 100644
--- a/src/backend/effects/builtin/play-sound.js
+++ b/src/backend/effects/builtin/play-sound.js
@@ -211,7 +211,7 @@ const playSound = {
 
                 // Generate UUID to use as class name.
                 // eslint-disable-next-line no-undef
-                const uuid = uuidv4();
+                const uuid = uuid();
 
                 const filepath = data.isUrl ? data.url : data.filepath.toLowerCase();
                 let mediaType;
diff --git a/src/backend/effects/builtin/play-video.js b/src/backend/effects/builtin/play-video.js
index 0fd4b3c39..8df8498ac 100644
--- a/src/backend/effects/builtin/play-video.js
+++ b/src/backend/effects/builtin/play-video.js
@@ -125,8 +125,8 @@ const playVideo = {
                 placeholder-text="Ex: $streamer, $user, etc"
             />
             <div class="mt-10 form-group flex-row jspacebetween" style="margin-bottom: 0;">
-                <firebot-checkbox 
-                    label="Only Featured Clips" 
+                <firebot-checkbox
+                    label="Only Featured Clips"
                     model="effect.isFeatured"
                     style="margin: 0px 15px 0px 0px"
                 />
@@ -136,8 +136,8 @@ const playVideo = {
                 ng-class="{'has-error': $ctrl.formFieldHasError('clipSeconds')}"
             >
                 <div class="form-group flex-row jspacebetween" style="margin-bottom: 0;">
-                    <firebot-checkbox 
-                        label="Maximum Clip Age" 
+                    <firebot-checkbox
+                        label="Maximum Clip Age"
                         model="effect.useMaxClipAge"
                         style="margin: 0px 15px 0px 0px"
                     />
@@ -233,7 +233,7 @@ const playVideo = {
         </eos-container>
 
         <eos-overlay-position effect="effect" pad-top="true"></eos-overlay-position>
-        
+
         <eos-overlay-rotation effect="effect" pad-top="true"></eos-overlay-rotation>
 
         <eos-enter-exit-animations effect="effect" pad-top="true"></eos-enter-exit-animations>
@@ -672,7 +672,7 @@ const playVideo = {
 
                 // Generate UUID to use as id
                 // eslint-disable-next-line no-undef
-                const uuid = uuidv4();
+                const uuid = uuid();
                 const videoPlayerId = `${uuid}-video`;
 
                 const enterAnimation = data.enterAnimation ? data.enterAnimation : "fadeIn";
@@ -705,7 +705,7 @@ const playVideo = {
                     `;
 
                     // eslint-disable-next-line no-undef
-                    const wrapperId = uuidv4();
+                    const wrapperId = uuid();
                     const wrappedHtml = getPositionWrappedHTML(wrapperId, positionData, videoElement); // eslint-disable-line no-undef
 
                     $(".wrapper").append(wrappedHtml);
@@ -766,12 +766,12 @@ const playVideo = {
                     };
                 } else {
                     // eslint-disable-next-line no-undef
-                    const ytPlayerId = `yt-${uuidv4()}`;
+                    const ytPlayerId = `yt-${uuid()}`;
 
                     const youtubeElement = `<div id="${ytPlayerId}" style="display:none;${sizeStyles}"></div>`;
 
                     // eslint-disable-next-line no-undef
-                    const wrapperId = uuidv4();
+                    const wrapperId = uuid();
                     const wrappedHtml = getPositionWrappedHTML(wrapperId, positionData, youtubeElement); // eslint-disable-line no-undef
 
                     $(".wrapper").append(wrappedHtml);
diff --git a/src/backend/effects/builtin/shoutout.js b/src/backend/effects/builtin/shoutout.js
index f91e7e5e9..a7a4da903 100644
--- a/src/backend/effects/builtin/shoutout.js
+++ b/src/backend/effects/builtin/shoutout.js
@@ -232,7 +232,7 @@ const effect = {
             utilityService.showOverlayInfoModal(overlayInstance);
         };
     },
-    optionsValidator: effect => {
+    optionsValidator: (effect) => {
         const errors = [];
         if (effect.username == null || effect.username === "") {
             errors.push("Please provide a username.");
@@ -240,7 +240,7 @@ const effect = {
         return errors;
     },
 
-    onTriggerEvent: async event => {
+    onTriggerEvent: async (event) => {
         // What should this do when triggered.
         const { effect } = event;
 
@@ -293,7 +293,7 @@ const effect = {
         },
         event: {
             name: "shoutout",
-            onOverlayEvent: event => {
+            onOverlayEvent: (event) => {
 
                 const data = event;
 
@@ -305,7 +305,7 @@ const effect = {
                 const scale = data.scale == null ? 1.0 : data.scale;
 
                 // eslint-disable-next-line no-undef
-                const uniqueId = uuidv4();
+                const uniqueId = uuid();
 
                 const fittyId = `fit-text-${uniqueId}`;
 
diff --git a/src/backend/events/activity-feed-manager.js b/src/backend/events/activity-feed-manager.js
index c69196e0f..0f8b7ec49 100644
--- a/src/backend/events/activity-feed-manager.js
+++ b/src/backend/events/activity-feed-manager.js
@@ -1,7 +1,7 @@
 "use strict";
 const app = require('electron').app;
 const moment = require("moment");
-const uuid = require("uuid/v4");
+const { v4: uuid } = require("uuid");
 const frontendCommunicator = require("../common/frontend-communicator");
 const rewardManager = require("../channel-rewards/channel-reward-manager");
 
@@ -102,9 +102,3 @@ frontendCommunicator.onAsync("get-activity-feed-supported-events", async () => {
         .flat()
         .filter(e => e != null);
 });
-
-
-
-
-
-
diff --git a/src/backend/import/v4/areas/v4-hotkeys-importer.js b/src/backend/import/v4/areas/v4-hotkeys-importer.js
index e50c8fead..8cb1598e5 100644
--- a/src/backend/import/v4/areas/v4-hotkeys-importer.js
+++ b/src/backend/import/v4/areas/v4-hotkeys-importer.js
@@ -2,7 +2,7 @@
 
 const path = require("path");
 const logger = require("../../../logwrapper");
-const uuid = require("uuid/v1");
+const { v4: uuid } = require("uuid");
 const importHelpers = require("../import-helpers");
 const profileManager = require("../../../common/profile-manager");
 const frontendCommunicator = require("../../../common/frontend-communicator");
diff --git a/src/backend/import/v4/areas/v4-viewergroups-importer.js b/src/backend/import/v4/areas/v4-viewergroups-importer.js
index e6dc2eb9b..55fca9597 100644
--- a/src/backend/import/v4/areas/v4-viewergroups-importer.js
+++ b/src/backend/import/v4/areas/v4-viewergroups-importer.js
@@ -2,7 +2,7 @@
 
 const path = require("path");
 const logger = require("../../../logwrapper");
-const uuid = require("uuid/v1");
+const { v4: uuid } = require("uuid");
 const importHelpers = require("../import-helpers");
 
 const customRolesManager = require("../../../roles/custom-roles-manager");
diff --git a/src/backend/import/v4/v4-effect-mapper.js b/src/backend/import/v4/v4-effect-mapper.js
index 6887cba07..fc48033cf 100644
--- a/src/backend/import/v4/v4-effect-mapper.js
+++ b/src/backend/import/v4/v4-effect-mapper.js
@@ -4,7 +4,7 @@ const logger = require("../../logwrapper");
 
 const { IncompatibilityError } = require("./import-helpers").errors;
 
-const uuid = require("uuid/v1");
+const { v4: uuid } = require("uuid");
 
 //v4 effect types are keys, supported v5 types are values
 const v4EffectTypeMap = {
diff --git a/src/backend/import/v4/v4-permission-mapper.js b/src/backend/import/v4/v4-permission-mapper.js
index 75aaa694f..efe55bf4b 100644
--- a/src/backend/import/v4/v4-permission-mapper.js
+++ b/src/backend/import/v4/v4-permission-mapper.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const uuid = require("uuid/v1");
+const { v4: uuid } = require("uuid");
 
 function mapV4RolesToMixerRoles(permissions) {
     if (permissions == null || !Array.isArray(permissions) || permissions.length === 0) {
diff --git a/src/backend/integrations/builtin/aws/text-to-speech-polly-effect.js b/src/backend/integrations/builtin/aws/text-to-speech-polly-effect.js
index 34fcef532..d833ec871 100644
--- a/src/backend/integrations/builtin/aws/text-to-speech-polly-effect.js
+++ b/src/backend/integrations/builtin/aws/text-to-speech-polly-effect.js
@@ -4,7 +4,7 @@ const { getPathInTmpDir } = require("../../../common/data-access");
 const { settings } = require("../../../common/settings-access");
 const resourceTokenManager = require("../../../resourceTokenManager");
 const webServer = require("../../../../server/http-server-manager");
-const uuid = require("uuid/v4");
+const { v4: uuid } = require("uuid");
 const fs = require('fs');
 const fsp = require('fs/promises');
 const path = require("path");
diff --git a/src/backend/notifications/notification-manager.ts b/src/backend/notifications/notification-manager.ts
index 68698bcb7..7f92533ef 100644
--- a/src/backend/notifications/notification-manager.ts
+++ b/src/backend/notifications/notification-manager.ts
@@ -1,6 +1,6 @@
 import { JsonDB } from "node-json-db";
 import axios from "axios";
-import uuid from "uuid/v4";
+import { v4 as uuid } from "uuid";
 
 import logger from "../logwrapper";
 import profileManager from "../common/profile-manager";
diff --git a/src/backend/variables/builtin/utility/run-effect.ts b/src/backend/variables/builtin/utility/run-effect.ts
index 2eb60a7b9..c1b103873 100644
--- a/src/backend/variables/builtin/utility/run-effect.ts
+++ b/src/backend/variables/builtin/utility/run-effect.ts
@@ -1,7 +1,7 @@
 import { ReplaceVariable, Trigger } from "../../../../types/variables";
 import { OutputDataType, VariableCategory } from "../../../../shared/variable-constants";
 
-const uuid = require("uuid/v4");
+const { v4: uuid } = require("uuid");
 
 const logger = require("../../../logwrapper");
 const effectRunner = require("../../../common/effect-runner");
diff --git a/src/gui/app/directives/commands/simple-command-options.js b/src/gui/app/directives/commands/simple-command-options.js
index f9c603041..48868b461 100644
--- a/src/gui/app/directives/commands/simple-command-options.js
+++ b/src/gui/app/directives/commands/simple-command-options.js
@@ -1,6 +1,6 @@
 "use strict";
 (function() {
-    const uuid = require("uuid/v4");
+    const { v4: uuid } = require("uuid");
     angular.module("firebotApp").component("simpleCommandOptions", {
         bindings: {
             command: "="
diff --git a/src/gui/app/directives/controls/effectList.js b/src/gui/app/directives/controls/effectList.js
index b434edca8..55ded32e8 100644
--- a/src/gui/app/directives/controls/effectList.js
+++ b/src/gui/app/directives/controls/effectList.js
@@ -1,7 +1,7 @@
 "use strict";
 (function() {
 
-    const uuidv1 = require("uuid/v1");
+    const { v4: uuid } = require("uuid");
 
     angular
         .module('firebotApp')
@@ -237,7 +237,7 @@
                         ctrl.effectsData.list = [];
                     }
                     if (ctrl.effectsData.id == null) {
-                        ctrl.effectsData.id = uuidv1();
+                        ctrl.effectsData.id = uuid();
                     }
 
                     ctrl.effectsData.list.forEach((e) => {
@@ -264,7 +264,7 @@
                     ensureDefaultWeights();
                     const sumOfAllWeights = ctrl
                         .effectsData.list
-                        .filter((e) => e.active)
+                        .filter(e => e.active)
                         .reduce((acc, e) => acc + (e.percentWeight ?? 0.5), 0);
                     return sumOfAllWeights;
                 };
@@ -529,7 +529,7 @@
                         }
 
                         ctrl.effectsData.list = [{
-                            id: uuidv1(),
+                            id: uuid(),
                             type: "firebot:run-effect-list",
                             active: true,
                             listType: "preset",
@@ -693,7 +693,7 @@
 
                 ctrl.duplicateEffectAtIndex = function(index) {
                     const effect = JSON.parse(angular.toJson(ctrl.effectsData.list[index]));
-                    effect.id = uuidv1();
+                    effect.id = uuid();
                     ctrl.effectsData.list.splice(index + 1, 0, effect);
                     ctrl.effectsUpdate();
                 };
@@ -769,7 +769,7 @@
                             const { selectedEffectDef } = resp;
 
                             const newEffect = {
-                                id: uuidv1(),
+                                id: uuid(),
                                 type: selectedEffectDef.id,
                                 active: true
                             };
diff --git a/src/gui/app/directives/misc/searchbar.js b/src/gui/app/directives/misc/searchbar.js
index 2f9be28cb..fddf96c5a 100644
--- a/src/gui/app/directives/misc/searchbar.js
+++ b/src/gui/app/directives/misc/searchbar.js
@@ -1,7 +1,7 @@
 "use strict";
 
 (function() {
-    const uuidv1 = require("uuid/v1");
+    const { v4: uuid } = require("uuid");
 
     angular.module("firebotApp").component("searchbar", {
         bindings: {
@@ -13,8 +13,8 @@
           <div style="position: relative;">
             <input id="{{$ctrl.searchId}}" type="text" class="form-control" placeholder="{{$ctrl.placeholderText}}" ng-model="$ctrl.query" style="padding-left: 27px;padding-right: 27px;" ng-model-options="{debounce: 250}">
             <span class="searchbar-icon"><i class="far fa-search"></i></span>
-            <span 
-                ng-show="$ctrl.query && !!$ctrl.query.length" 
+            <span
+                ng-show="$ctrl.query && !!$ctrl.query.length"
                 class="searchbar-clear-btn clickable"
                 ng-click="$ctrl.query = ''">
                 <i class="fas fa-times-circle"></i>
@@ -25,7 +25,7 @@
             const $ctrl = this;
             $ctrl.$onInit = function() {
                 if ($ctrl.searchId == null || $ctrl.searchId === "") {
-                    $ctrl.searchId = uuidv1();
+                    $ctrl.searchId = uuid();
                 }
             };
         }
diff --git a/src/gui/app/directives/modals/commands/addOrEditCustomCommand/addOrEditCustomCommandModal.js b/src/gui/app/directives/modals/commands/addOrEditCustomCommand/addOrEditCustomCommandModal.js
index b49b6d124..ceebce9dc 100644
--- a/src/gui/app/directives/modals/commands/addOrEditCustomCommand/addOrEditCustomCommandModal.js
+++ b/src/gui/app/directives/modals/commands/addOrEditCustomCommand/addOrEditCustomCommandModal.js
@@ -3,7 +3,7 @@
 // Modal for adding or editing a command
 
 (function () {
-    const uuid = require("uuid/v4");
+    const { v4: uuid } = require("uuid");
 
     angular.module("firebotApp").component("addOrEditCustomCommandModal", {
         templateUrl:
diff --git a/src/gui/app/directives/modals/commands/addOrEditSubcommandModal.js b/src/gui/app/directives/modals/commands/addOrEditSubcommandModal.js
index 1e2b77ee2..81a5cd5a1 100644
--- a/src/gui/app/directives/modals/commands/addOrEditSubcommandModal.js
+++ b/src/gui/app/directives/modals/commands/addOrEditSubcommandModal.js
@@ -1,7 +1,7 @@
 "use strict";
 
 (function() {
-    const uuid = require("uuid/v4");
+    const { v4: uuid } = require("uuid");
     angular.module("firebotApp")
         .component("addOrEditSubcommandModal", {
             template: `
diff --git a/src/gui/app/directives/modals/currency/addOrEditCurrency/addOrEditCurrency.js b/src/gui/app/directives/modals/currency/addOrEditCurrency/addOrEditCurrency.js
index 45e5bbf87..dfc88fdc6 100644
--- a/src/gui/app/directives/modals/currency/addOrEditCurrency/addOrEditCurrency.js
+++ b/src/gui/app/directives/modals/currency/addOrEditCurrency/addOrEditCurrency.js
@@ -13,11 +13,11 @@
             modalInstance: "<"
         },
         controller: function($scope, utilityService, currencyService, viewerRolesService, logger) {
-            const uuidv1 = require("uuid/v1");
+            const { v4: uuid } = require("uuid");
             const $ctrl = this;
 
             $ctrl.currency = {
-                id: uuidv1(),
+                id: uuid(),
                 name: "Points",
                 active: true,
                 payout: 5,
diff --git a/src/gui/app/directives/modals/events/addOrEditEventModal.js b/src/gui/app/directives/modals/events/addOrEditEventModal.js
index e56c35cfd..bb4efe0af 100644
--- a/src/gui/app/directives/modals/events/addOrEditEventModal.js
+++ b/src/gui/app/directives/modals/events/addOrEditEventModal.js
@@ -4,7 +4,7 @@
 
 (function() {
 
-    const uuidv1 = require("uuid/v1");
+    const { v4: uuid } = require("uuid");
 
     angular.module("firebotApp").component("addOrEditEventModal", {
         template:
@@ -173,7 +173,7 @@
                 }
 
                 if ($ctrl.isNewEvent) {
-                    $ctrl.event.id = uuidv1();
+                    $ctrl.event.id = uuid();
                 }
 
                 $ctrl.close({
diff --git a/src/gui/app/directives/modals/integrations/addOrEditDiscordWebhookModal.js b/src/gui/app/directives/modals/integrations/addOrEditDiscordWebhookModal.js
index 350218c37..d754813a0 100644
--- a/src/gui/app/directives/modals/integrations/addOrEditDiscordWebhookModal.js
+++ b/src/gui/app/directives/modals/integrations/addOrEditDiscordWebhookModal.js
@@ -2,7 +2,7 @@
 
 (function() {
 
-    const uuid = require("uuid/v4");
+    const { v4: uuid } = require("uuid");
 
     angular.module("firebotApp")
         .component("addOrEditDiscordWebhookModal", {
diff --git a/src/gui/app/directives/modals/misc/add-or-edit-poll-choice-modal.js b/src/gui/app/directives/modals/misc/add-or-edit-poll-choice-modal.js
index 4ce8a4112..fd18343be 100644
--- a/src/gui/app/directives/modals/misc/add-or-edit-poll-choice-modal.js
+++ b/src/gui/app/directives/modals/misc/add-or-edit-poll-choice-modal.js
@@ -1,7 +1,7 @@
 "use strict";
 
 (function() {
-    const uuid = require("uuid/v4");
+    const { v4: uuid } = require("uuid");
 
     angular.module("firebotApp")
         .component("addOrEditPollChoiceModal", {
diff --git a/src/gui/app/directives/modals/misc/manage-sort-tags.js b/src/gui/app/directives/modals/misc/manage-sort-tags.js
index a51ed77af..a232a9556 100644
--- a/src/gui/app/directives/modals/misc/manage-sort-tags.js
+++ b/src/gui/app/directives/modals/misc/manage-sort-tags.js
@@ -1,7 +1,7 @@
 "use strict";
 
 (function() {
-    const uuid = require("uuid/v4");
+    const { v4: uuid } = require("uuid");
 
     angular.module("firebotApp")
         .component("manageSortTagsModal", {
diff --git a/src/gui/app/directives/modals/rank/add-or-edit-rank-modal.js b/src/gui/app/directives/modals/rank/add-or-edit-rank-modal.js
index 44118e929..ca6233722 100644
--- a/src/gui/app/directives/modals/rank/add-or-edit-rank-modal.js
+++ b/src/gui/app/directives/modals/rank/add-or-edit-rank-modal.js
@@ -1,7 +1,7 @@
 "use strict";
 (function() {
 
-    const uuid = require("uuid/v4");
+    const { v4: uuid } = require("uuid");
 
     angular.module("firebotApp").component("addOrEditRankModal", {
         template: `
diff --git a/src/gui/app/directives/modals/roles/addOrEditCustomRoleModal.js b/src/gui/app/directives/modals/roles/addOrEditCustomRoleModal.js
index 6c4ac8712..8f86ed8c8 100644
--- a/src/gui/app/directives/modals/roles/addOrEditCustomRoleModal.js
+++ b/src/gui/app/directives/modals/roles/addOrEditCustomRoleModal.js
@@ -2,7 +2,7 @@
 
 (function() {
 
-    const uuidv1 = require("uuid/v1");
+    const { v4: uuid } = require("uuid");
 
     angular.module("firebotApp").component("addOrEditCustomRoleModal", {
         template: `
@@ -145,7 +145,7 @@
                 }
 
                 if ($ctrl.isNewRole) {
-                    $ctrl.role.id = uuidv1();
+                    $ctrl.role.id = uuid();
                 }
 
                 $ctrl.close({
diff --git a/src/gui/app/directives/modals/setups/add-edit-setup-question.js b/src/gui/app/directives/modals/setups/add-edit-setup-question.js
index 26a8664df..8a67a3980 100644
--- a/src/gui/app/directives/modals/setups/add-edit-setup-question.js
+++ b/src/gui/app/directives/modals/setups/add-edit-setup-question.js
@@ -1,7 +1,7 @@
 "use strict";
 
 (function() {
-    const uuid = require("uuid/v4");
+    const { v4: uuid } = require("uuid");
     angular.module("firebotApp")
         .component("addOrEditSetupQuestion", {
             template: `
@@ -12,7 +12,7 @@
                 <div class="modal-body">
                     <h3>Question <tooltip text="'This is the question that will be asked when a user imports. Ie, What should be the default bet amount?'"/></h3>
                     <textarea type="text" class="form-control" rows="3" ng-model="$ctrl.question.question" placeholder="Enter question"></textarea>
-                    
+
                     <h3>Replace Token <tooltip text="'Firebot will replace any instances of this token with the users answer to this question. A token can be anything but you might want to use uncommon characters. Ie %WagerAmount%'"/></h3>
                     <input type="text" class="form-control" ng-model="$ctrl.question.replaceToken" placeholder="Enter text" />
 
@@ -20,10 +20,10 @@
                     <textarea type="text" class="form-control" rows="3" ng-model="$ctrl.question.helpText" placeholder="Optional"></textarea>
 
                     <h3>Answer Type</h3>
-                    <select 
-                        class="fb-select" 
+                    <select
+                        class="fb-select"
                         ng-model="$ctrl.question.answerType"
-                        ng-change="$ctrl.question.defaultAnswer = undefined"; 
+                        ng-change="$ctrl.question.defaultAnswer = undefined";
                         ng-options="answerType.id as answerType.name for answerType in $ctrl.answerTypes">
                         <option value="" disabled selected>Select answer type...</option>
                     </select>
diff --git a/src/gui/app/directives/modals/startup-scripts/addOrEditStartupScriptModal.js b/src/gui/app/directives/modals/startup-scripts/addOrEditStartupScriptModal.js
index bd3a87bc6..718985353 100644
--- a/src/gui/app/directives/modals/startup-scripts/addOrEditStartupScriptModal.js
+++ b/src/gui/app/directives/modals/startup-scripts/addOrEditStartupScriptModal.js
@@ -2,7 +2,7 @@
 
 (function() {
 
-    const uuid = require("uuid/v4");
+    const { v4: uuid } = require("uuid");
 
     angular.module("firebotApp")
         .component("addOrEditStartupScriptModal", {
@@ -13,9 +13,9 @@
             </div>
             <div class="modal-body">
                 <div style="margin-top: 20px;">
-                    <custom-script-settings 
-                        effect="$ctrl.scriptData" 
-                        modal-id="null" 
+                    <custom-script-settings
+                        effect="$ctrl.scriptData"
+                        modal-id="null"
                         trigger="'startup_script'"
                         allow-startup="true"
                     />
diff --git a/src/gui/app/directives/restrictions/restrictionsSection.js b/src/gui/app/directives/restrictions/restrictionsSection.js
index b266b7587..9dc388329 100644
--- a/src/gui/app/directives/restrictions/restrictionsSection.js
+++ b/src/gui/app/directives/restrictions/restrictionsSection.js
@@ -1,7 +1,7 @@
 "use strict";
 (function() {
 
-    const uuidv1 = require("uuid/v1");
+    const { v4: uuid } = require("uuid");
 
     angular
         .module('firebotApp')
@@ -191,7 +191,7 @@
                                 .filter(r => r.type !== selectedId);*/
 
                             $ctrl.restrictionData.restrictions.push({
-                                id: uuidv1(),
+                                id: uuid(),
                                 type: selectedId
                             });
 
diff --git a/src/gui/app/services/backend-communicator.service.js b/src/gui/app/services/backend-communicator.service.js
index bfe430447..52ae0e0f3 100644
--- a/src/gui/app/services/backend-communicator.service.js
+++ b/src/gui/app/services/backend-communicator.service.js
@@ -11,7 +11,7 @@
         .module("firebotApp")
         .factory("backendCommunicator", function($q) {
 
-            const uuidv1 = require("uuid/v1");
+            const { v4: uuid } = require("uuid");
 
             const service = {};
 
@@ -44,7 +44,7 @@
                     throw new Error("Can't register an event without a callback.");
                 }
 
-                const id = uuidv1(),
+                const id = uuid(),
                     event = {
                         id: id,
                         callback: callback,
diff --git a/src/gui/app/services/chat-messages.service.js b/src/gui/app/services/chat-messages.service.js
index b85fec715..35075e778 100644
--- a/src/gui/app/services/chat-messages.service.js
+++ b/src/gui/app/services/chat-messages.service.js
@@ -2,7 +2,7 @@
 (function() {
     const moment = require('moment');
 
-    const uuid = require("uuid/v4");
+    const { v4: uuid } = require("uuid");
 
     angular
         .module('firebotApp')
diff --git a/src/gui/app/services/events.service.js b/src/gui/app/services/events.service.js
index d3418cbfd..b15efadc0 100644
--- a/src/gui/app/services/events.service.js
+++ b/src/gui/app/services/events.service.js
@@ -2,7 +2,7 @@
 
 (function() {
     //This handles events
-    const uuidv1 = require("uuid/v1");
+    const { v4: uuid } = require("uuid");
 
     angular.module("firebotApp").factory("eventsService", function(backendCommunicator, objectCopyHelper) {
         const service = {};
@@ -72,7 +72,7 @@
         };
 
         service.createGroup = function(name) {
-            const newId = uuidv1();
+            const newId = uuid();
             const newGroup = {
                 id: newId,
                 name: name,
diff --git a/src/gui/app/services/hot-key.service.js b/src/gui/app/services/hot-key.service.js
index 3b6f93397..0e7dcbaa7 100644
--- a/src/gui/app/services/hot-key.service.js
+++ b/src/gui/app/services/hot-key.service.js
@@ -1,6 +1,6 @@
 "use strict";
 const profileManager = require("../../backend/common/profile-manager.js");
-const uuidv1 = require("uuid/v1");
+const { v4: uuid } = require("uuid");
 
 (function() {
     // This provides methods for handling hotkeys
@@ -272,7 +272,7 @@ const uuidv1 = require("uuid/v1");
             }
 
             service.saveHotkey = function(hotkey) {
-                hotkey.id = uuidv1();
+                hotkey.id = uuid();
 
                 userHotkeys.push(hotkey);
 
diff --git a/src/gui/app/services/object-copy-helper.service.js b/src/gui/app/services/object-copy-helper.service.js
index ee9c013a9..5f976c903 100644
--- a/src/gui/app/services/object-copy-helper.service.js
+++ b/src/gui/app/services/object-copy-helper.service.js
@@ -2,7 +2,7 @@
 
 (function() {
 
-    const uuid = require("uuid/v1");
+    const { v4: uuid } = require("uuid");
 
     angular
         .module("firebotApp")
diff --git a/src/resources/overlay/js/util.js b/src/resources/overlay/js/util.js
index f550da45e..308a88f53 100644
--- a/src/resources/overlay/js/util.js
+++ b/src/resources/overlay/js/util.js
@@ -1,6 +1,11 @@
 // Global
 notificationShown = false;
 
+// Shim for default generation
+function uuid() {
+    return uuidv4();
+}
+
 // https://stackoverflow.com/questions/105034/how-do-i-create-a-guid-uuid
 function uuidv4() {
 	return ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c =>
@@ -18,9 +23,9 @@ function notification(status, text){
 		notificationShown = true;
 		$('body').prepend('<div class="notification" style="display:none"><p>'+text+'</p></div>');
 		$('.notification').fadeIn('fast');
-		setTimeout(function(){ 
+		setTimeout(function(){
 			$(".notification p").text("I'll keep trying in the background...");
-			setTimeout(function(){ 
+			setTimeout(function(){
 				$(".notification").fadeOut(300, function() { $(this).remove(); });
 			}, 5000);
 		}, 30000);
@@ -62,29 +67,29 @@ $.fn.extend({
 				if(animationDelay) {
 					element.css("animation-delay", "");
 				}
-	
+
 				element.removeClass('animated ' + animationName);
 
 				callback(data);
 			});
 		} else {
 			callback(data);
-		}	
+		}
         return this;
     }
 });
 
 function showTimedAnimatedElement(
-	elementClass, 
-	enterAnimation, 
+	elementClass,
+	enterAnimation,
 	enterDuration,
 	inbetweenAnimation,
 	inbetweenDelay,
-	inbetweenDuration, 
+	inbetweenDuration,
 	inbetweenRepeat,
-	exitAnimation, 
-	exitDuration, 
-	duration, 
+	exitAnimation,
+	exitDuration,
+	duration,
 	tokenArg,
 	completeCallback = null) {
 	enterAnimation = enterAnimation ? enterAnimation : "fadeIn";
@@ -92,10 +97,10 @@ function showTimedAnimatedElement(
 	inbetweenAnimation = inbetweenAnimation ? inbetweenAnimation : "none";
 	var id = `${elementClass}`;
 	$(id).find(".inner-position").animateCss(enterAnimation, enterDuration, null, null, (data) => {
-		
+
 		$(data.id).find(".inner-position").animateCss(data.inbetweenAnimation, data.inbetweenDuration, data.inbetweenDelay, data.inbetweenRepeat);
 
-		setTimeout(function(){ 
+		setTimeout(function(){
 			if(data.inbetweenAnimation) {
 				$(data.id).find(".inner-position").css("animation-duration", "");
 				$(data.id).find(".inner-position").css("animation-delay", "");
@@ -109,10 +114,10 @@ function showTimedAnimatedElement(
 				}
 			}, data);
 		}, (duration === 0 || duration != null) ? duration : 5000);
-	}, { 
-		token: tokenArg, 
-		id: id, 
-		exitAnimation: exitAnimation, 
+	}, {
+		token: tokenArg,
+		id: id,
+		exitAnimation: exitAnimation,
 		exitDuration: exitDuration,
 		inbetweenAnimation: inbetweenAnimation,
 		inbetweenDuration: inbetweenDuration,
@@ -122,7 +127,7 @@ function showTimedAnimatedElement(
 }
 
 function getPositionWrappedHTML(uniqueId, positionData, html) {
-    
+
     // when using 'Custom' position, the user has defined exact top/left pixels
 	let styles = "";
 	if (positionData.position === "Custom") {
@@ -130,17 +135,17 @@ function getPositionWrappedHTML(uniqueId, positionData, html) {
 	}
 
 	//normalize position
-	let position = positionData.position ? 
+	let position = positionData.position ?
 		positionData.position.replace(/\s/, "-").toLowerCase() : "middle";
 
 	let positionWrappedHtml = `
 		<div id="${uniqueId}" class="position-wrapper ${position}">
 			<div class="inner-position" style="${styles}">
 				${html}
-			</div>		
+			</div>
 		</div>
     `;
-    
+
     return positionWrappedHtml;
 }
 
@@ -149,29 +154,29 @@ function showElement(
 	positionData,
 	animationData
 ){
-	let uniqueId = uuidv4();
+	let uniqueId = uuid();
 
 	let positionWrappedHtml = getPositionWrappedHTML(uniqueId, positionData, effectHTML);
 
 	$('.wrapper').append(positionWrappedHtml);
 
 	showTimedAnimatedElement(
-		"#" + uniqueId, 
-		animationData.enterAnimation, 
+		"#" + uniqueId,
+		animationData.enterAnimation,
 		animationData.enterDuration,
 		animationData.inbetweenAnimation,
 		animationData.inbetweenDelay,
-		animationData.inbetweenDuration, 
+		animationData.inbetweenDuration,
 		animationData.inbetweenRepeat,
-		animationData.exitAnimation, 
-		animationData.exitDuration, 
-		animationData.totalDuration, 
+		animationData.exitAnimation,
+		animationData.exitDuration,
+		animationData.totalDuration,
 		animationData.resourceToken
 	);
 }
 
 function getStylesForCustomCoords(customCoords) {
-	
+
 	var style = "position:absolute;margin:auto;"
 	if(customCoords.top !== null) {
 		style = style + "top:" + customCoords.top.toString() + "px;"
@@ -185,7 +190,7 @@ function getStylesForCustomCoords(customCoords) {
 	if(customCoords.right !== null) {
 		style = style + "right:" + customCoords.right.toString() + "px;"
 	}
-	
+
 	return style;
 }
 

From 64ecdfd45549945a0adff4e822e17cab5cc50caa Mon Sep 17 00:00:00 2001
From: ebiggz <erikbigler@gmail.com>
Date: Sun, 8 Dec 2024 15:54:35 -0600
Subject: [PATCH 13/54] fix: don't send failed dashboard slash commands to
 twitch chat

---
 src/backend/chat/twitch-chat.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/backend/chat/twitch-chat.ts b/src/backend/chat/twitch-chat.ts
index 5e66e21d9..e41b2cbb8 100644
--- a/src/backend/chat/twitch-chat.ts
+++ b/src/backend/chat/twitch-chat.ts
@@ -266,9 +266,13 @@ class TwitchChat extends EventEmitter {
                 message,
                 accountType === "bot"
             );
-            if (slashCommandResult === true) {
-                return;
+            if (!slashCommandResult) {
+                global.renderWindow.webContents.send("chatUpdate", {
+                    fbEvent: "ChatAlert",
+                    message: `Failed to execute "${message}"`
+                });
             }
+            return;
         }
         if (slashCommandValidationResult != null &&
             slashCommandValidationResult.success === false &&

From e0e451a2cf798366156dfb1ef9f0fd2d9e7961e3 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Sun, 8 Dec 2024 17:56:51 -0500
Subject: [PATCH 14/54] chore: Twitter is dead, long live Bluesky; fix Discord
 links

---
 .github/ISSUE_TEMPLATE/config.yml                |   8 ++++----
 .github/SUPPORT.md                               |   2 +-
 README.md                                        |   6 +++---
 .../app-management/electron/window-management.js |   8 ++++----
 .../controls/custom-script-settings.js           |   2 +-
 .../modals/backups/restoreBackupModal.js         |   4 ++--
 src/gui/app/directives/modals/misc/aboutModal.js |   4 ++--
 src/gui/images/icons/bluesky.png                 | Bin 0 -> 7699 bytes
 8 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 src/gui/images/icons/bluesky.png

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 1f6d4a533..d43f1abd8 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: Firebot Discord
-    url: https://discord.gg/crowbartools
+    url: https://discord.gg/crowbartools-372817064034959370
     about: Feel free to drop by our Discord to get support with an issue or ask a question!
-  - name: Firebot Twitter
-    url: https://twitter.com/firebotapp
-    about: Send us a tweet!
\ No newline at end of file
+  - name: Firebot Bluesky
+    url: https://bsky.app/profile/firebot.app
+    about: Send us a post!
\ No newline at end of file
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
index 5b2763a34..db4cdea6f 100644
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -1,2 +1,2 @@
 ### Need help or have a question?
-Please feel free to stop by our [Discord](https://discord.gg/tTmMbrG) or DM us on [Twitter](https://twitter.com/FirebotApp)!
\ No newline at end of file
+Please feel free to stop by our [Discord](https://discord.gg/crowbartools-372817064034959370) or connect with us on [Bluesky](https://bsky.app/profile/firebot.app)!
\ No newline at end of file
diff --git a/README.md b/README.md
index 7f966bb3e..fb99b446f 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,11 @@
 
 An all-in-one desktop bot for Twitch featuring support for Chat Commands, Events, Timers, Currencies, Third Party Integrations, and so much more. Visit Firebot's [website](https://firebot.app) for more info.
 
-![Build Status](https://github.com/crowbartools/Firebot/workflows/Build%20Status/badge.svg?branch=master)
+![Build Status](https://github.com/crowbartools/Firebot/workflows/Build%20and%20Draft%20Release/badge.svg?branch=master)
 ![Build Status](https://github.com/crowbartools/Firebot/workflows/Build%20Tests/badge.svg?branch=v5)
 [![Total Downloads](https://img.shields.io/github/downloads/crowbartools/firebot/total.svg)](https://firebot.app)
 [![Version](https://img.shields.io/github/release/crowbartools/firebot.svg)](https://github.com/crowbartools/Firebot/releases)
-[![Discord](https://img.shields.io/discord/372817064034959370.svg?label=Discord+(chat))](https://discord.gg/DegW792)
+[![Discord](https://img.shields.io/discord/372817064034959370.svg?label=Discord+(chat))](https://discord.gg/crowbartools-372817064034959370)
 
 ![Firebot Screenshot](https://i.imgur.com/Iu9BIix.png)
 
@@ -15,7 +15,7 @@ An all-in-one desktop bot for Twitch featuring support for Chat Commands, Events
 Head on over to [Firebot's website](https://firebot.app) and download the latest version!
 
 ### What if I have a question or need help?
-Please visit our [Discord server](https://discord.gg/DegW792) or send us a [Threads](https://threads.net/@FirebotApp) or [Bluesky](https://bsky.app/profile/firebot.app). We are more than happy to help.
+Please visit our [Discord server](https://discord.gg/crowbartools-372817064034959370) or send us a [Threads](https://threads.net/@FirebotApp) or [Bluesky](https://bsky.app/profile/firebot.app). We are more than happy to help.
 
 ### I found a bug, how do I report it?
 You can create a Bug Report [here](https://github.com/crowbartools/Firebot/issues/new?assignees=ebiggz%2C+LastMageTV&labels=bug&template=bug_report.md&title=%5BBUG%5D+). We'll reply as soon as we can.
diff --git a/src/backend/app-management/electron/window-management.js b/src/backend/app-management/electron/window-management.js
index 1f1efb658..76b4b2136 100644
--- a/src/backend/app-management/electron/window-management.js
+++ b/src/backend/app-management/electron/window-management.js
@@ -359,16 +359,16 @@ async function createMainWindow() {
                 {
                     label: 'Join our Discord',
                     click: () => {
-                        shell.openExternal("https://discord.gg/tTmMbrG");
+                        shell.openExternal("https://discord.gg/crowbartools-372817064034959370");
                     },
                     icon: await createIconImage("../../../gui/images/icons/discord.png")
                 },
                 {
-                    label: 'Follow @FirebotApp on Twitter',
+                    label: 'Follow @firebot.app on Bluesky',
                     click: () => {
-                        shell.openExternal("https://twitter.com/FirebotApp");
+                        shell.openExternal("https://bsky.app/profile/firebot.app");
                     },
-                    icon: await createIconImage("../../../gui/images/icons/mdi/twitter.png")
+                    icon: await createIconImage("../../../gui/images/icons/bluesky.png")
                 },
                 {
                     type: 'separator'
diff --git a/src/gui/app/directives/controls/custom-script-settings.js b/src/gui/app/directives/controls/custom-script-settings.js
index c387f8f30..563326ee5 100644
--- a/src/gui/app/directives/controls/custom-script-settings.js
+++ b/src/gui/app/directives/controls/custom-script-settings.js
@@ -114,7 +114,7 @@
                         }
 
                         if (!initialLoad && ($scope.scriptManifest == null || $scope.scriptManifest.firebotVersion !== "5")) {
-                            utilityService.showInfoModal("The selected script may not have been written for Firebot V5 and so might not function as expected. Please reach out to us on Discord or Twitter if you need assistance.");
+                            utilityService.showInfoModal("The selected script may not have been written for Firebot V5 and so might not function as expected. Please reach out to us on Discord or Bluesky if you need assistance.");
                         }
 
                         const currentParameters = $scope.effect.parameters;
diff --git a/src/gui/app/directives/modals/backups/restoreBackupModal.js b/src/gui/app/directives/modals/backups/restoreBackupModal.js
index 862f31cdf..530786a0c 100644
--- a/src/gui/app/directives/modals/backups/restoreBackupModal.js
+++ b/src/gui/app/directives/modals/backups/restoreBackupModal.js
@@ -75,7 +75,7 @@
                     } catch (error) {
                         logger.error("Unknown error while attempting to restore backup", error);
                         $ctrl.restoreHasError = true;
-                        $ctrl.errorMessage = "An unknown error occurred while attempting to restore the backup. Please reach out on Discord or Twitter. We are happy to help!";
+                        $ctrl.errorMessage = "An unknown error occurred while attempting to restore the backup. Please reach out on Discord or Bluesky. We are happy to help!";
                     }
                     resolve();
                 });
@@ -89,7 +89,7 @@
                 $timeout(() => {
                     if (!$ctrl.restoreComplete && !$ctrl.restoreHasError) {
                         $ctrl.restoreHasError = true;
-                        $ctrl.errorMessage = "Restore is taking longer than it should. There is likely an issue. You can close and try again. If you continue having issues, please reach out on Discord or Twitter. We are happy to help!";
+                        $ctrl.errorMessage = "Restore is taking longer than it should. There is likely an issue. You can close and try again. If you continue having issues, please reach out on Discord or Bluesky. We are happy to help!";
                     }
                 }, 30 * 1000);
             };
diff --git a/src/gui/app/directives/modals/misc/aboutModal.js b/src/gui/app/directives/modals/misc/aboutModal.js
index a4b6644b9..e5fe6ad89 100644
--- a/src/gui/app/directives/modals/misc/aboutModal.js
+++ b/src/gui/app/directives/modals/misc/aboutModal.js
@@ -27,8 +27,8 @@
                 <section>
                     <h5><b>Connect With Us</b></h5>
                     <div id="aboutModalSocialButtons" style="font-size: 28px;">
-                        <a href ng-click="$root.openLinkExternally('https://discord.gg/tTmMbrG')" title="Discord"><i class="fab fa-discord"></i></a>
-                        <a href ng-click="$root.openLinkExternally('https://twitter.com/FirebotApp')" title="Twitter"><i class="fab fa-twitter"></i></a>
+                        <a href ng-click="$root.openLinkExternally('https://discord.gg/crowbartools-372817064034959370')" title="Discord"><i class="fab fa-discord"></i></a>
+                        <a href ng-click="$root.openLinkExternally('https://bsky.app/profile/firebot.app')" title="Bluesky"><i class="fas fa-cloud"></i></a>
                         <a href ng-click="$root.openLinkExternally('https://github.com/crowbartools/Firebot')" title="GitHub"><i class="fab fa-github"></i></a>
                     </div>
                 </section>
diff --git a/src/gui/images/icons/bluesky.png b/src/gui/images/icons/bluesky.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd26a4b4c0e72bde4edb026d083ed6382ea03f6d
GIT binary patch
literal 7699
zcmW+*c|6oz7oQo17)$ms_9fXF`@R!Gr5ZyfqoIT}S;iWs?E8`>Ar!)3cqm&;NJ4gF
zj|!7zm>y&;?>z4x_j5n@oO91T=lt&P-tRd#@v6fmc2*cG003aOv9@po0Dy}0206z>
zr(h=APv{*B*4jA$08p0tuK`2Kjd1{g$VVFs(;Fd$)WzWZn^UcyeyK1>vdUUrvj9rr
z;OGx=ak35QM6Og=K)sUH9behE(158IUU!~JjtR9VHk4fBReWPAE&2Ni*taB*@xCMP
zdDKCAFo!4yWvH<6Anf4w$sdD}Na5ka+07#L9}mec_jZ~KbSQ7GT`v)$NugEHJ|$A4
zk~_L?Aob{Vl0NALsfM)WBE&h?bbn$dlv3o}7FdOod%i#CQ{V7OG~6pM^TvZ{!;SPh
zlgi^)L0<z9l4o64z_%ItKq}M5x0_{dG9lDUII(JuH2#}~7(P{&5P=X76sSn3$Ukpi
zZ1CJ~vCY{_4yx(R`#x-cTv^J7%)kLmW5R(uIh(4#8wB84NLQDQO1`^o+cMNhVOg-e
zQ?WP9a{)i_%=qwVORks3L5fYMLh5(f48wm<Doe4r&`^~gP9+a|DQ*A*2G^&7E(1Rb
z6(}<^y214UemT3C%z$k;Wx>>wEU*Q?KQ8UkT)me5ylS%L(T~ZfuPi!k`jqW};m2#I
zg6oCz6@|wGM@(t{!%8${L@CQ~>)+wlAk+ingh^3;mtR7f-p`IloR4&7br0Gmc2fhk
zU8k*!QXli&3s-4xnjLQ4ED8|P{UcU)&|{`xgy~DUc6KB$@}(#sPmdzgx&qyTy=g6d
zxF((IJxJ`=4So^ecfInA;UEm@WvTM2hqN}_T2mOHj#5MYu${c^J^uLKvf)UVevS)h
zf#XyZS>c+jt;Ho)^yo)l!%pXkciy-8kEBqOaH<*X5t}N3_Q4Ua37Ik2PLfm;fC5e}
z+t0fxHhJfLAnFOWfLf&`lw2gIv2_Ti6`Q>5Vj^gUw}t-@po3`TSJ4aJ9y<K><3R|r
zJSFxf=ZYk?E4z*eYI#S)cZ(u?&<*eWzr$fVLLqML87<CNYWxLRYraGa*_?^}qT<v2
z&t$jUQ7i9qk;3Qf82w5@IMtx!iRz&@*IqSpBl5(9GhZ7LOw59tPel;{9vw52!Ito2
z-k+QXWhm=HLgiFTitC3?0j#?J!-v*$05?*BVFm+>0>Pwjt0y`hpZd%vF?GKQrscQL
zGTKuuNYh?f`|j6P-updkf%ynOH4-KAbq{C+jI2UgyDBy%4U$xe+Ny$w%{U48ap?Bb
zg$yG5th3xVmgO7E0aUZ^=$@V(Mk6*?<`zC3%T^Azw~Tk!!jSD=i0`xC`eRn)27-FK
z!(1e3?#rgu^&7madJ%eDokHBAuaOCH?9uHRt+o3(K8dbma|POE0Y8ge&-D^i!oBzp
z!T6y3I}!!Q;_qvhJI@Gl2$K60U#lxck!tqLmt8HsSwfXFv{GWwPn@JJ+Ne><hee{!
zxmKcL8Xrb~*~s`zAjI?avzOLO`dnw0QZTGF>8aNISLPbIhjk^Z#&9zsa(zN$Gi@O|
z<OxpV8mnOwh`r`dG$#wTt&FLC3OIk?DN|J``UL-BAjm>~a+Fnra4gk6^!h#*NUUvA
zLR+AqxrjLhsCA=GO06^&QR2Q2z`n<Eu}qb6%-FUkF>WTZaUF~+OUswWAfla!!6t7>
zdJgRwj6OHxgY<<aI9e}lI?cseT%eX}-W|#x{mpK0&Y9!>MXDKh-AxhT60dN>Ej)hC
z(&9pGDc>^R7DZg($=gX~X)w9QyzW?QRab1bRPWq<NG%{9f5yx<rYvbme(=5UR*LJ6
z`@n$~R<*G>Vx#=q_i>V+habqm{<mLZ%~Y1&%18B_^(4jlIaGUwtn~Xzz8O_4kH;l>
zNX>v|6+@EW3k<AT!rwFEA=RubgYNX!cr1$edEcc)59D^R@bn^nqB%LiY}`zNNYpzY
z!n5xFd_$v(p_5!E33vzWnoyQxwPC3xb#H_$J8u;)x;(xfzg6PveQ*h#f#bT?AB)&s
z`*L%RQ;{&t6z46#m5>v}yG8K!9#1#<TCu&*s{XL!SKPrUOxNGT+C4~)=0ueQHI9cN
z$Ml(<zi8~Y1+IVBY_dud{#+U_x>2sgS;zGEHOc~wAYbcR%1fM-BmJNU?1PgRm>;1H
z$h$AVRl*nKaqpe*5(l#teH7bb?lVJlmx!IBl3M318NEYAh$ihx(fc4PpZ~aKKD`NC
z!jJdHGK;T|y=Uw=@B~HNWFDHXlf*IuRJ`aSZ_IsG`ZI+?S28mT6@YP$U3@u-Uk3Eh
znK(YdQHGFAKwVFwd=p5B$tcFv$Mbu06UQw4Q}08um5TLA6{##pEx(e>js1N*JHsWw
zCoh3au9wrmfTo)MjH2jAbkj>O=P4VUo$m5QEsmC&o5PrlK#aRzUXxtgIR?Ax7}YAL
z-iHT^hAiV7UmAOjil-SH<!4S@U9Oz7^cZ@ghmNING5OTQY_sJ@nu0<T6FbbJEAr2G
zmHzb7nZlg7Bb-lKu_&YeXLC#`9}>A38=I4>8$@!NyXi3lWE6G5$4-6eN3mIbI(0=q
zu0h$vi2w|$Q5L+c=Jc-(1ME#HOa9>3cr^TgamWm3pcVGlR6OdvO50CKqvM}aahzgx
zDBBx#jCG@QF$946LWfcSRL9%rK-3yFzJ$(M=4<XrWdsd7`iT-fMTo42cCApU;g5f_
zE`GK_A}@T*n_Mbjz%c}7xhC#6W-Vhq^8K>hb@yLfjYd(6HJ;+#=;3k?Ki?mA7wF8i
zM9t^vjVr;oGV55hC$Mb*QpS|K39AZ+%0xnZj@=dDVpDQ|h89VP5&JYOIyV}OfTb|Z
z`3PhJ?W6PXZ|7q3%hpK2c+JZV=O>8!_`GvyrP`Qq)|uPw=dO?6qoL5VR=l6dnI^gA
zHgDSTPn(lf*<GZFTan!>^E`)nI4<BZgtkO?$*PtM`Sy;vo-l-d?pT-{g9PpixDPb;
z36s@G>r;2+u@cw{y7bRjLMM9Mox_BOB1}5SNIVGAR8ZqvPqpKHG4OyPf`E#Vo3}+n
z(6{U2o1ybpH6K`k=I;w+nkk+0Xr5+sc8wy4a@T?G*5qKS_d#TZx=AEjohoT(nJe+0
zFog%>!X04E;J>d>7D)^Eg^OO}p3d7(Pf3lU2t8^nLER5V7Spk(dzMp%_jGEnoR;fv
zkFRKv!f(?3x~Tv|;*8zfP|REPC<{=K3GSZOx~B1gX(Za-Nw(KwQ@5mueyZ&faKMVY
z>i%LY%w!5{Y`&MK<yWx!cR2bM-HtDJ*Npl(7298`vdsfH=}`tmfzn2myDjeQpN2)E
zm2S%R_P*l8CgQk~jsbbz0`8L6HU0}G@l>$YP1&b2eP7l5A3dV~0XL}0Di@1%dnL&O
zVfJ-+`xRIm*P-s!O%y&7xy|VFo0yAsqMOb#+r}NK!;dI+w)hjaO}vZ7qYPkW)X#l?
z!@9tcWvH0M1;^zV3&yMrJ~A>E7rA~vkTYhiqwkR3JE__X5C$J6nH#|XR8w+-slu`#
z-2va+)w3Ru!mU2>T^9+#SfvJ@#?YfPSvG>)-wjn(Eg6E+O#LN9jq108g0u8)(!luq
zl5-FgTa4r4(t$dw^~F3$4KIW+4B|#U$9*u-UWIv&fuI$rm|tZdNG?x4Cyl)hHrfm=
zDaUd3C2OutC4<TD{(8fcv?Pl*El`laY31&aZyEXm2n99*cxGGI*`KlTxtGfxqcWM!
z*#(1xmsXZ8=c|kU+^7=IW}DAUdwk3<ZfKs(ejQ)?uNWOGn3@U<d31YGK?5{4euVQs
z<ifB9QUQ0Ah>ZJNM!yN=GT@)+r%lPKUu&DK+~^#a6*y1l1iq&^S@zDY|ITKsk1jQz
zcp-$(qO9=G8igw;W%L2d-RX<5oV*al_Bq4$0?-xu4@i+=l|k88*vUndAknjP+p}bz
z!&Dp>2`K%F<JG-dQAEQaOwXNXhe@xj-D%Y^OWQy*@(&<H`wV}_kZ{CHFvY0Z1Z;aj
z={CMAl*~isz_{m>NAEH(NAb=X^6R*iqOuitGZYr5uPPEraWPh|v5a{tO3}=QZ|`OK
zJZfOR3?{#ZLg4G)1H2Ap*HNb37Byw0W7R%0yS6}+w~y23Rie!enlR(;xCZ9hc+Y`H
zazsoD<so>1=f{!#afjO$9npCTRTr2^VGM%#f7@&19F@#GEeF;7JRI|Ix%j%0uUQQA
z_>NA!&AYNe5x#aTZwb49vcoPEqPE_oOLLB)+)8^e;Yn^{Ju-aZbeQO9NU)r#X0K@Z
zBxx{RghW1X{!(g<G+ifw@}XChWLAFz9MYBz!a<c*SW%whtidL2UgS>i)dZFvkx3&I
zZA6w8ZhG7?c@f4+_%$}|4jSWyy7WxDr4XbZ+QE5jAD5Mq8g&&XGG5_DZ$_Z>J!+IO
zwxR$0Up{M54YOf*<Ky(?xVri*&AaM~1}{>b2(h;BnFHqCq@9{)f<dWro)Q=8{Nu-`
z-B%4*h4~(t${0M5ZREA)N{(j7)b_q!JRv!h8_izjge+Hi`M~jQ^(mB76@Em;qYL3q
zqao<jWa4?Ax}J>9YTH@H!}pagc5Rw1qAnQo?w}0nhg+7;nJnWMO(@(i!`XDYF-kH;
z2!Iek;j&?AgD81gI{XqkTlm)XQ`SRN15s^N@Ct)FIF*@yW?ZZyLYqHyh}^2S+E(6h
z@fi<tM_hj$I+2g)*Q4oP8Yk%+^{qIwEKJR053ndQyIv2_l~GV0IXQG_mbaUG7G!CL
z$==o#x_+mX8Iz>L-1@%ztEblL22;l(eFD2;#=L4;RjGKk$db6>?p^w6f8+4nOlRRm
z1UGV?{Bj10Dce&Y=um0SB7s6gXSxcKQs5N{y8VV#o^tob4VRwt87)CEFn`kvSL&ML
z!88plw%pAl1rDxY5K%aK;ti@XRQ+dMMXfI%WXx1ty8@9H;RX$Xn4EqE^+B`M<5+uG
zt2f<O6~QiulaGD*cJt5V5t?-s@j1H_uud{G8zpdUm3ymsj|kWXI}lbG=^~*Fv-6Ge
z%}o6LLA)=>VcZxynWpl%`BQH}?locP2i+9-H~l!+j!l{*Q3g<Hi511zwJ-sCybW!5
z&ASVQq61#(J%`Icr80xgeE2=lKm!h8(N&gIc-3!Z+S4}<{6T0uVQ@inBO8Wsqy(&x
zU#wm$Qccn&n1us*Fgo>c8AE=Cb}o0MsR6zj^fPU*DFr^O&MD~mCE>XD5hFh-um88h
z$j87)jGdaj=^CM;_tC#CAO(sEZ1(dMlqbb0qj+ko1(u*s1f+e!Ey8624;aFw0-PEW
zf1tV@)0pFqy@#Mb?4!^n>2VQE{G_!0^9{)(R;loY{8V4@Zx8gf#mu`Sb{N_L(_wzo
zP@dY8jM~<YZNv5U_?(AP%Q&=tEhq)f_ky_)XizrRvLlM<Y#?!vJd-q`m;r6Z8K!a~
zXpv4FCfy{dG(q5f1WygD1T7aQQD8`j$i|<UedYi2&R?ky`imcXel(dehEMt;(f_vT
zZ-WJ~5XV-2OykB)kExu+=xYPb1PM9wZpSv@JqZY-jFM|A%NOi&*fN-EW@{6MUJYc7
ze4=>1rIxNN#zTvyy$oEIT6KZt<dO#7UBn8jQJSCAS+B<&mnD|{mMuMEb8c8;(5r-a
zHo=ogv0F6=j9uenrWBKHjZg@(<d#FwxG*vn$Ar5?PTL0imfcE&SLcGxfW;<XhYC!R
z!W_$Ec#%isOJT0_Qad{I<g2Tt^X|32UJo!$g2t`pZp3xSi+tmJL)eU+aHlhVD74wK
zj=03Jo)g5VC+<#e8VFEf%mr*pnoseY?7}uR*WYp<R{uq^_#&fj^Z*Al+!uM58J022
zhG@U9TpfyFgt-evL@9&j!pTySYofkVKO_0NW|7+qOkijN;>^sj%;;CgBkyR)E}P<2
z>;570C!V13UFRn;GkN`D&8eA7Ir|%3ckln9ASTZa29I|YnL265BGMUPglB<7&*0-s
z(K&wW9fCTyU*EGvwpL#>OqH)S52qnlbV|O1zd85TWaJog5q%kbeJaT=VNF8fH-F=|
zpR$CDH?zRGUP%jaSZE{1A4LB`F1%C8YOS(QGEclCWyoEyQ3R<EGPX4H_9=Pqt=Y$`
zEfT`h%KcbJtun{inU%nAt@DR%hQWFIQ@+M?&JK=Ko{;<mZ8`g=qYOR_EAodgrB0;Z
zPAPrL?;o<PYi(nB-Z2t$o}q>XtAW*P>?B*YtwMR)IWr`Fr1nck63ti%Mflxlb0SMX
zw*6pqWwbHqN6_WOOXu)GildxAOI_pPHvbA^HE9HTYH1sQE&>;(x}yA2<opz|7w|&?
z<#3`h<8W_oHoSuSRi;S6Cxz*2*&1N74T%qVRq%RpJHGSvURHtzA^R)XIb=%=i4?qE
zlbuoS<uIZA8fLTO{s-9N+I|iL+80;jJZ;5EtlD~`snNcehdZZ&JoQJ`UhGrKuZ3-d
zxr<plQe$)AM!swdoNS~2(Kg-L0m^iAmY;I0?Vs1L_TRpCL>ne7<ol+K?aDQt97|Kp
zl5A|zhAew@`~hX?SNmd^>G^>B0t<d0ijARzn0(EMR7KH@H>2alfn9tM1x%Kgh)44T
zwHflca<*p!vOt(>fmbL(@DBZc#v4tb8lJ|k0=UdkpA-aLJpto3s-3KZSNJbRcik5N
z>f!elxV4nE`ZPACNu_g^hjgs_bnAF*=-#Wod~3x^xHpI&?eS9r^kv4Y!Hs?$u$P8}
zihg~L+Q*t+DT$W)=rpSyqi|$6#@*BIoZq<j%sq6`MuQT@E+WmeYWJH0kqmaAP3FR7
zBD*HMCZ~nT9HbK?m|9;595T}#{Hiky`If&O?tY)sm(qUC4L>z?U0+79b4-~O^6T;v
z`!TEHj*agP!=&%}HhnJ`BD8-h5VZ~_(`@3H@ilZv)!?(!Zc3ju{@*Ooi<Y-8J+E$N
z(Au3XsV8}VuM&CnkjcMG_I1Rqz=<~%BnKm*JwBv@K{IAA^~=d2u30`sr6@vcO@YYW
z;8ObQJGmqM<@K8G!^Vb@z6dbc?g|x(asy!g{cD)Wxbx_qWCQ;H^!VaAc-w82!vou8
zH&`t6VTbay)tZLH|ESx_|IRRctx+`!rJA0w5@zYNFa*Fn+2C*Pj#-M+?&JR!tB@2@
zFTmQH#6`!hp$)e(LW^Gh=0je_I~g{61{%zfC`s&m_E4E4-yurO^Dmw;gTQwhw4-|w
ze0Mrr7$d&_WBL-WIfuE`SO1x`z+`kLp>^SWSu08YCHpZOAw9FSlw~Br%IM5fa0I@-
zTeZXVn2Bt=td&j`j2f6dUhkZ#QSA&}`mlIlRoxEQIrJUv^^+&w6ddtMU;K5xAdM7A
z*YnkS9|bGkR9)Zocs}wXb|~n%>JTXai9aKO4xgI6kTKG}L36$JUP2h70oyl}W}F@I
zZP>B0SG)_lg`l0*&A^;XXZT`YmRoW9u+V~IarS$nwX`EK&>-eb&!HxBxv>EZ52hL0
zQVYD;3ACfZ%>A$SZB>h{C49(<Yay2>ExcK$P^-Rq+OL<ynqg#C#pr+d=Czt@-d1`X
zJgb;jmmN0sv1_A*v+7v<1GwId>vy%%>;s-yA(MYqLK@ZLS-*(#lj@(%YfnA5-ggJD
zq68miQ8ambSoauw^swpv>=pjaU+?Unf1B+H+n-W43AaAi__=zKw@9=m<E3-M$7A_l
z+{9q&D)h>2NnlS1Rg}NKV6<yWx%(Lv?9HhVeIlh3|BJ#)1&Iq95(-CX9n|J3+lMP(
zvRs19lv7nd9{{jVa9kM#(p<V`FuT_0UGS((_pUwD+ca8)jA*TO|KBVdDEC?ifNes#
zTSIokeW4^_<X+iydJO$)tceGY3Og4yR^cQn-u$*`_q=t<!%!*PE<5@`b8>&)Yq~KW
z+avVs(K7Yo@t+Ho?miwDW;5r&ytXcAyzhhC+hy3kmo*r@otGHB`l>H4@tjS`vd@|%
z+#Lcu1Pj*YVxcCH{6f8f+jskg6aNshr5>4oD3tz9G>MD5L{Fd*?dp92^`PSPU#AuR
z@!kSgZ5<gPD=uQU9JK}O5{^!_KSe}d@BGJ_)^W!%KIX`%yaVNIXYiL@SU5mvQ(}ih
z2$h~qO8gyRv+cerT!J#`L;WmGtxpJ^xeq(gW#Lq?zJ#_1I?&4*ufBd-GRn$Pe&<^j
zRDuJpTAS0&cX1yaJq)h;^j4;XI8p>$>03LXTYm|*M*P>F5jUwUDYf?f?CxH6gGf$<
z5L+QVYi=FqM?T1WPa}^hOEWkyZ_^ek>^o0Zf3W9RmwQ_0XD20o04RQpLgMW@m#Rno
z_`k?_x`WptigX0+`=KkO>cNkg#p)kD@{VnDK67y~N83Gq&(eDQJ-jMD<E9dwIF~J{
zlGT}gqKM%{*_~ysH%s>g0IqbuNNE?#>58`9@e3LH>@!!}GfWg^bnDA&tzhp1@Lk>l
z*OE03h$erT|0y*OJiafGLD8NAGp^Y>iXt-p(zTV6tf`WYetL}{uPnO@p_=7m;vm7h
zmG9|5mG{58g<M|m{L4x0Z8p*uMsCDYX3mQB?pVnBV*5Ls(zOr~XGXs$s+r?Y@bbZ&
zB`=&shh@gPJ>yv$y#f`rOv1ZjKY%qJujV*;Ep-~U?{v1~?5{!D0|B@RWogea@m;*l
z9uu~JzDl41HjZ8$gz8|$|C}5!Zv<C{p8on|&RWaWf9$*%IB1;;B$>}yYM}M7=l+fF
ze?~bVeWVx5B#a4wf|aO$b8q>5OHqGv&XWkaJO~$?p%;YIBE$~q-7}rcp9kqTu0au3
ziDzzT!`k>v>S*wkvh;^Eagq6tDrQfDuB_^1ZK;=B^fwRKpkHLNjqdl+rJBMs+%G2N
z*Ni-L^7*Ck0nz)-5StPK{A24+VlS<7SQTU&di>F)`%wS=-$rw>(*2U-v$sOUgw_Pw
zcxK(bW9fIkmn@+Kuk?)pQd^0C*s%XCAkt3H>EQGn%bdmb^U7u4Wq+z<**Fqu%76!d
zh$Zj#>ztjVm$gxlg>sYyyQpcdAIEAL#XEvkIL0oNv9yr*#0ms?0;$!G{zYOL2=WSj
zzQ<XG0FGo1DeOLma-5#eFGX437+_bBl_H9_j2@p40qOAn33?gf!ny^Ds6|;bR!A7P
z|7n8!A{b*u)!uW(*mkoHuqmEXZn_IRGs#WZe?Rsl_i^Ugm^nOY%k}E97M>kg`Y-Vb
zD+PG`n>twgj_IG3-@+vdG!?3ufewoxNBr8Q{t>uGl;!rE^+zq&)oK|+HEvMp-Etvh
zy=5|XQ?2ssxGyx&f4DYb<D+dx;&AJq!oQnBM{sm>_i7X{j*K5}ZM_f~I=-P-dDeEU
zgG=84UrsP}IMYmBy~<J(ZC*ov4Ep@N%e+dxcfG6FDE<Ab(AgWQ0mDH-$Mv3y@!m+V
zu!|1mSeJs}J4v-oB<vAb(+!IP+^lHFM_Plr)6?r+kqsh==V}T~%zbWMjQTac=2&?)
zcVBc~hf*<lDu4VdCt#b2;tHWJ{}CrGPw)q^D;4g&?L?jgD?REA8W!2vbE}sY-fUgr
zq@Jx8`p}0p$aIUin+~MXDYCA1Aa$v=H-EWs{=<5ggN?p&;Ahxeec<ro&TD};f9854
zrS<44Ig|>AGE;&+`@fioLS;qxQVLJ5Ox62o+|{S}`42z%w&%vFa!I~h{vvI(TX%Y1
z_n>TIzb>FIZz4)*+<))UaBBTVPTkkd;nsf&12)OX@anW1u{VcPwZFdk+a0PCrbj7$
zq!zU@$VOSP<cj2U){k8K{#bq0kg{MxSx93!y!~FRimj$l!aVLxS9Eb&ZK3Pd0X_3#
z9&Sx83fPohK4JehGp8He9I&lPS$M)4$q`$jN3qgBn)L`19lM0oynia!%;Jkl_TK|I
z0DpsUj0IEJy89#r(gVguM6g*i<L^4-HV`$MOls>tlj3k53y>q8&yQZnIMq{a{k!{o
zZSyN>h5@1`=%P!_6bcLnpfXZ<U8cp36g(r?Bk+nS0|qF>0MfBue*+_bKz+BQ=FxwC
h*!V0$h5E->EhyxZ>7VIK^jBVhjirM{of-Pc{{ZL_d2j##

literal 0
HcmV?d00001


From c7291811162fba5270ee20b3836f191ef63bfaaa Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Sun, 8 Dec 2024 18:07:32 -0500
Subject: [PATCH 15/54] chore: add Bluesky badge to README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fb99b446f..7a39e829d 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ An all-in-one desktop bot for Twitch featuring support for Chat Commands, Events
 [![Total Downloads](https://img.shields.io/github/downloads/crowbartools/firebot/total.svg)](https://firebot.app)
 [![Version](https://img.shields.io/github/release/crowbartools/firebot.svg)](https://github.com/crowbartools/Firebot/releases)
 [![Discord](https://img.shields.io/discord/372817064034959370.svg?label=Discord+(chat))](https://discord.gg/crowbartools-372817064034959370)
+[![Bluesky](https://img.shields.io/badge/Bluesky-@firebot.app-0285FF.svg?logo=bluesky&logoColor=fff)](https://bsky.app/profile/firebot.app)
 
 ![Firebot Screenshot](https://i.imgur.com/Iu9BIix.png)
 

From 2a27b74f8c99c1debf738aaca253cddadaff39e2 Mon Sep 17 00:00:00 2001
From: Oceanity <github@oceanity.net>
Date: Sun, 8 Dec 2024 18:10:16 -0600
Subject: [PATCH 16/54] fix: renamed `sceneItem.id` prop to avoid Duplicate
 Preset Effect List issues (#2920)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixed the issue with the `id` prop

* Added nullish check so legacy ids will still function, but will prefer itemId

* FINE I'll change the variable name 😜

* Simplified error to not save on effect

* Forgot to update one instance

* Updated copy to match

---------

Co-authored-by: Erik Bigler <erikbigler@gmail.com>
---
 .../obs/effects/transform-obs-source.ts       | 28 +++++++++++++++++--
 .../integrations/builtin/obs/obs-remote.ts    |  7 +++--
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/backend/integrations/builtin/obs/effects/transform-obs-source.ts b/src/backend/integrations/builtin/obs/effects/transform-obs-source.ts
index dc74ec7c2..873437604 100644
--- a/src/backend/integrations/builtin/obs/effects/transform-obs-source.ts
+++ b/src/backend/integrations/builtin/obs/effects/transform-obs-source.ts
@@ -22,6 +22,13 @@ export const TransformSourceEffectType: EffectType<{
         categories: ["common"]
     },
     optionsTemplate: `
+        <eos-container ng-if="isUsingInvalidItemId" pad-top="true">
+            <div class="alert alert-danger">
+                <p style="margin: 0">
+                    <b>Error:</b> Due to a previous bug with duplicating Preset Effect Lists, you will need to set the Scene Item again, this shouldn't be necessary again in the future.
+                </p>
+            </div>
+        </eos-container>
         <eos-container header="OBS Scene" pad-top="true">
             <div>
                 <button class="btn btn-link" ng-click="getScenes()">Refresh Scene Data</button>
@@ -101,10 +108,12 @@ export const TransformSourceEffectType: EffectType<{
                     <div style="display: flex; gap: 20px; margin-bottom: 20px">
                         <firebot-input
                             input-title="End X"
+                            placeholder-text="Position in pixels"
                             model="effect.endTransform.positionX"
                             style="flex-basis: 50%" />
                         <firebot-input
                             input-title="End Y"
+                            placeholder-text="Position in pixels"
                             model="effect.endTransform.positionY"
                             style="flex-basis: 50%" />
                     </div>
@@ -129,12 +138,12 @@ export const TransformSourceEffectType: EffectType<{
                     <div style="display: flex; gap: 20px; margin-bottom: 20px;">
                         <firebot-input
                             input-title="End X Scale"
-                            placeholder-text="0.0 - 1.0"
+                            placeholder-text="eg. 0.5 = 50% scale"
                             model="effect.endTransform.scaleX"
                             style="flex-basis: 50%" />
                         <firebot-input
                             input-title="End Y Scale"
-                            placeholder-text="0.0 - 1.0"
+                            placeholder-text="eg. 0.5 = 50% scale"
                             model="effect.endTransform.scaleY"
                             style="flex-basis: 50%" />
                     </div>
@@ -162,6 +171,7 @@ export const TransformSourceEffectType: EffectType<{
     `,
     optionsController: ($scope: any, backendCommunicator: any) => {
         $scope.isObsConfigured = false;
+        $scope.isUsingInvalidItemId = false;
 
         $scope.scenes = [];
         $scope.sceneItems = [];
@@ -177,6 +187,17 @@ export const TransformSourceEffectType: EffectType<{
             [10]: "Bottom Right"
         });
 
+        // If legacy property sceneItem.id exists, we need to fix it
+        if (!!$scope.effect.sceneItem?.id) {
+            if (typeof ($scope.effect.sceneItem.id) !== "number") {
+                $scope.isUsingInvalidItemId = true;
+                delete $scope.effect.sceneItem;
+            } else {
+                $scope.effect.sceneItem.itemId = $scope.effect.sceneItem.id;
+                delete $scope.effect.sceneItem.id;
+            }
+        }
+
         $scope.selectScene = (sceneName: string) => {
             $scope.effect.sceneItem = undefined;
             $scope.getSources(sceneName);
@@ -184,6 +205,7 @@ export const TransformSourceEffectType: EffectType<{
 
         $scope.selectSceneItem = (sceneItem: OBSSceneItem) => {
             $scope.effect.sceneItem = sceneItem;
+            $scope.isUsingInvalidItemId = false;
         };
 
         $scope.getScenes = () => {
@@ -259,7 +281,7 @@ export const TransformSourceEffectType: EffectType<{
 
         await transformSceneItem(
             effect.sceneItem.groupName ?? effect.sceneName,
-            effect.sceneItem.id,
+            effect.sceneItem.id ?? effect.sceneItem.itemId,
             Number(effect.duration) * 1000,
             parsedStart,
             parsedEnd,
diff --git a/src/backend/integrations/builtin/obs/obs-remote.ts b/src/backend/integrations/builtin/obs/obs-remote.ts
index 187a1549f..85b33e762 100644
--- a/src/backend/integrations/builtin/obs/obs-remote.ts
+++ b/src/backend/integrations/builtin/obs/obs-remote.ts
@@ -798,7 +798,8 @@ export type OBSSource = {
 };
 
 export type OBSSceneItem = {
-    id: number;
+    id?: number; // this is for legacy support, swapped to itemId to avoid breaking on duplicating Preset Effect Lists
+    itemId: number;
     name: string;
     groupName?: string;
 };
@@ -890,7 +891,7 @@ export async function getAllSceneItemsInGroup(groupName: string): Promise<Array<
     try {
         const response = await obs.call("GetGroupSceneItemList", { sceneName: groupName });
         return response.sceneItems.map(item => ({
-            id: item.sceneItemId as number,
+            itemId: item.sceneItemId as number,
             name: item.sourceName as string,
             groupName
         }));
@@ -907,7 +908,7 @@ export async function getAllSceneItemsInScene(sceneName: string): Promise<Array<
 
         for (const item of response.sceneItems) {
             sceneItems.push({
-                id: item.sceneItemId as number,
+                itemId: item.sceneItemId as number,
                 name: item.sourceName as string
             });
 

From 0741031b6a81289f262902ad3d586d00ab37dfde Mon Sep 17 00:00:00 2001
From: Dennis Rijsdijk <70665154+dennisrijsdijk@users.noreply.github.com>
Date: Mon, 9 Dec 2024 01:14:27 +0100
Subject: [PATCH 17/54] refactor: filters and filter factory (#2914)

* feat: allow passing predicate for eventMetaKey

* feat: expand selection of comparison types

* refactor: event filters

* refactor: OBS filters

* refactor: streamloots filters

---------

Co-authored-by: Erik Bigler <erikbigler@gmail.com>
---
 .../events/filters/builtin-filter-loader.js   |  45 ------
 .../events/filters/builtin-filter-loader.ts   |   8 +
 .../events/filters/builtin/bits-badge-tier.js |  51 ------
 .../filters/builtin/chat-mode-duration.js     |  55 -------
 .../filters/builtin/chat-mode-setting.js      |  54 -------
 .../filters/builtin/cheer-bits-amount.js      |  51 ------
 .../events/filters/builtin/currency.js        |  43 ------
 .../filters/builtin/custom-variable-name.ts   |  72 ---------
 .../events/filters/builtin/donation-amount.js |  55 -------
 .../events/filters/builtin/donation-from.js   |  47 ------
 .../events/filters/builtin/effect-queue.js    |  46 ------
 .../filters/builtin/firebot/currency.ts       |  20 +++
 .../builtin/firebot/custom-variable-name.ts   |  19 +++
 .../filters/builtin/firebot/effect-queue.ts   |  22 +++
 .../events/filters/builtin/firebot/index.ts   |  33 ++++
 .../builtin/{ => firebot}/metadata-key.ts     |   6 +-
 .../builtin/{ => firebot}/metadata-value.ts   |   6 +-
 .../new-currency-amount.ts}                   |  14 +-
 .../filters/builtin/firebot/new-rank.ts       |  32 ++++
 .../filters/builtin/firebot/new-view-time.ts  |  13 ++
 .../previous-currency-amount.ts}              |  10 +-
 .../filters/builtin/firebot/previous-rank.ts  |  32 ++++
 .../builtin/firebot/previous-view-time.ts     |  13 ++
 .../filters/builtin/firebot/rank-ladder.ts    |  18 +++
 .../builtin/firebot/rank-transition-type.ts   |  25 +++
 .../viewer-ranks.ts}                          |  25 +--
 .../viewer-roles.ts}                          |  38 +++--
 .../events/filters/builtin/gift-count.js      |  51 ------
 .../events/filters/builtin/gift-duration.js   |  51 ------
 src/backend/events/filters/builtin/index.ts   |   9 ++
 .../events/filters/builtin/is-anonymous.js    |  45 ------
 src/backend/events/filters/builtin/message.js |  75 ---------
 .../events/filters/builtin/new-rank.js        |  54 -------
 .../events/filters/builtin/new-view-time.js   |  51 ------
 .../events/filters/builtin/previous-rank.js   |  54 -------
 .../filters/builtin/previous-view-time.js     |  51 ------
 .../filters/builtin/raid-viewer-count.js      |  51 ------
 .../events/filters/builtin/rank-ladder.js     |  43 ------
 .../filters/builtin/rank-transition-type.js   |  37 -----
 .../events/filters/builtin/reward-name.js     |  38 -----
 src/backend/events/filters/builtin/reward.js  |  53 -------
 .../events/filters/builtin/shared-chat.ts     |  44 ------
 .../events/filters/builtin/stream-category.js |  37 -----
 .../events/filters/builtin/sub-kind.js        |  50 ------
 .../events/filters/builtin/sub-type.js        |  71 ---------
 .../builtin/third-party/donation-amount.ts    |  17 ++
 .../builtin/third-party/donation-from.ts      |  18 +++
 .../filters/builtin/third-party/index.ts      |   7 +
 .../filters/builtin/twitch/bits-badge-tier.ts |  13 ++
 .../builtin/twitch/chat-mode-duration.ts      |  13 ++
 .../builtin/twitch/chat-mode-setting.ts       |  23 +++
 .../{chat-mode.js => twitch/chat-mode.ts}     |  41 ++---
 .../builtin/twitch/cheer-bits-amount.ts       |  13 ++
 .../filters/builtin/twitch/gift-count.ts      |  13 ++
 .../filters/builtin/twitch/gift-duration.ts   |  13 ++
 .../events/filters/builtin/twitch/index.ts    |  37 +++++
 .../filters/builtin/twitch/is-anonymous.ts    |  25 +++
 .../events/filters/builtin/twitch/message.ts  |  14 ++
 .../builtin/twitch/raid-viewer-count.ts       |  14 ++
 .../filters/builtin/twitch/reward-name.ts     |  14 ++
 .../events/filters/builtin/twitch/reward.ts   |  22 +++
 .../filters/builtin/twitch/shared-chat.ts     |  26 ++++
 .../filters/builtin/twitch/stream-category.ts |  15 ++
 .../events/filters/builtin/twitch/sub-kind.ts |  23 +++
 .../events/filters/builtin/twitch/sub-type.ts |  35 +++++
 .../{username.js => twitch/username.ts}       |  38 +----
 src/backend/events/filters/filter-factory.ts  | 145 +++++++++++++++---
 .../builtin/obs/filters/group-name-filter.ts  |  45 ++----
 .../builtin/obs/filters/scene-name-filter.ts  |  45 ++----
 .../builtin/obs/obs-integration.ts            |   4 +-
 .../builtin/streamloots/filters/card-name.js  |  44 ------
 .../builtin/streamloots/filters/card-name.ts  |  14 ++
 .../streamloots/filters/card-rarity.js        |  58 -------
 .../streamloots/filters/card-rarity.ts        |  34 ++++
 .../filters/{chest-gift.js => chest-gift.ts}  |   8 +-
 .../streamloots/filters/chest-quantity.js     |  40 -----
 .../streamloots/filters/chest-quantity.ts     |  13 ++
 src/backend/utility.js                        |  36 ++++-
 src/types/events.d.ts                         |  22 ++-
 79 files changed, 942 insertions(+), 1718 deletions(-)
 delete mode 100644 src/backend/events/filters/builtin-filter-loader.js
 create mode 100644 src/backend/events/filters/builtin-filter-loader.ts
 delete mode 100644 src/backend/events/filters/builtin/bits-badge-tier.js
 delete mode 100644 src/backend/events/filters/builtin/chat-mode-duration.js
 delete mode 100644 src/backend/events/filters/builtin/chat-mode-setting.js
 delete mode 100644 src/backend/events/filters/builtin/cheer-bits-amount.js
 delete mode 100644 src/backend/events/filters/builtin/currency.js
 delete mode 100644 src/backend/events/filters/builtin/custom-variable-name.ts
 delete mode 100644 src/backend/events/filters/builtin/donation-amount.js
 delete mode 100644 src/backend/events/filters/builtin/donation-from.js
 delete mode 100644 src/backend/events/filters/builtin/effect-queue.js
 create mode 100644 src/backend/events/filters/builtin/firebot/currency.ts
 create mode 100644 src/backend/events/filters/builtin/firebot/custom-variable-name.ts
 create mode 100644 src/backend/events/filters/builtin/firebot/effect-queue.ts
 create mode 100644 src/backend/events/filters/builtin/firebot/index.ts
 rename src/backend/events/filters/builtin/{ => firebot}/metadata-key.ts (65%)
 rename src/backend/events/filters/builtin/{ => firebot}/metadata-value.ts (66%)
 rename src/backend/events/filters/builtin/{new-currency-amount.js => firebot/new-currency-amount.ts} (56%)
 create mode 100644 src/backend/events/filters/builtin/firebot/new-rank.ts
 create mode 100644 src/backend/events/filters/builtin/firebot/new-view-time.ts
 rename src/backend/events/filters/builtin/{previous-currency-amount.js => firebot/previous-currency-amount.ts} (69%)
 create mode 100644 src/backend/events/filters/builtin/firebot/previous-rank.ts
 create mode 100644 src/backend/events/filters/builtin/firebot/previous-view-time.ts
 create mode 100644 src/backend/events/filters/builtin/firebot/rank-ladder.ts
 create mode 100644 src/backend/events/filters/builtin/firebot/rank-transition-type.ts
 rename src/backend/events/filters/builtin/{viewer-ranks.js => firebot/viewer-ranks.ts} (82%)
 rename src/backend/events/filters/builtin/{viewer-roles.js => firebot/viewer-roles.ts} (82%)
 delete mode 100644 src/backend/events/filters/builtin/gift-count.js
 delete mode 100644 src/backend/events/filters/builtin/gift-duration.js
 create mode 100644 src/backend/events/filters/builtin/index.ts
 delete mode 100644 src/backend/events/filters/builtin/is-anonymous.js
 delete mode 100644 src/backend/events/filters/builtin/message.js
 delete mode 100644 src/backend/events/filters/builtin/new-rank.js
 delete mode 100644 src/backend/events/filters/builtin/new-view-time.js
 delete mode 100644 src/backend/events/filters/builtin/previous-rank.js
 delete mode 100644 src/backend/events/filters/builtin/previous-view-time.js
 delete mode 100644 src/backend/events/filters/builtin/raid-viewer-count.js
 delete mode 100644 src/backend/events/filters/builtin/rank-ladder.js
 delete mode 100644 src/backend/events/filters/builtin/rank-transition-type.js
 delete mode 100644 src/backend/events/filters/builtin/reward-name.js
 delete mode 100644 src/backend/events/filters/builtin/reward.js
 delete mode 100644 src/backend/events/filters/builtin/shared-chat.ts
 delete mode 100644 src/backend/events/filters/builtin/stream-category.js
 delete mode 100644 src/backend/events/filters/builtin/sub-kind.js
 delete mode 100644 src/backend/events/filters/builtin/sub-type.js
 create mode 100644 src/backend/events/filters/builtin/third-party/donation-amount.ts
 create mode 100644 src/backend/events/filters/builtin/third-party/donation-from.ts
 create mode 100644 src/backend/events/filters/builtin/third-party/index.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/bits-badge-tier.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/chat-mode-duration.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/chat-mode-setting.ts
 rename src/backend/events/filters/builtin/{chat-mode.js => twitch/chat-mode.ts} (57%)
 create mode 100644 src/backend/events/filters/builtin/twitch/cheer-bits-amount.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/gift-count.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/gift-duration.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/index.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/is-anonymous.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/message.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/raid-viewer-count.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/reward-name.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/reward.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/shared-chat.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/stream-category.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/sub-kind.ts
 create mode 100644 src/backend/events/filters/builtin/twitch/sub-type.ts
 rename src/backend/events/filters/builtin/{username.js => twitch/username.ts} (56%)
 delete mode 100644 src/backend/integrations/builtin/streamloots/filters/card-name.js
 create mode 100644 src/backend/integrations/builtin/streamloots/filters/card-name.ts
 delete mode 100644 src/backend/integrations/builtin/streamloots/filters/card-rarity.js
 create mode 100644 src/backend/integrations/builtin/streamloots/filters/card-rarity.ts
 rename src/backend/integrations/builtin/streamloots/filters/{chest-gift.js => chest-gift.ts} (90%)
 delete mode 100644 src/backend/integrations/builtin/streamloots/filters/chest-quantity.js
 create mode 100644 src/backend/integrations/builtin/streamloots/filters/chest-quantity.ts

diff --git a/src/backend/events/filters/builtin-filter-loader.js b/src/backend/events/filters/builtin-filter-loader.js
deleted file mode 100644
index 7dab5b353..000000000
--- a/src/backend/events/filters/builtin-filter-loader.js
+++ /dev/null
@@ -1,45 +0,0 @@
-"use strict";
-
-const filterManager = require("./filter-manager");
-
-exports.loadFilters = () => {
-    [
-        'bits-badge-tier',
-        'chat-mode-duration',
-        'chat-mode-setting',
-        'chat-mode',
-        'cheer-bits-amount',
-        'currency',
-        'custom-variable-name',
-        'donation-amount',
-        'donation-from',
-        'effect-queue',
-        'gift-count',
-        'gift-duration',
-        'is-anonymous',
-        'message',
-        'metadata-key',
-        'metadata-value',
-        'new-currency-amount',
-        'new-rank',
-        'new-view-time',
-        'previous-currency-amount',
-        'previous-rank',
-        'previous-view-time',
-        'raid-viewer-count',
-        'rank-ladder',
-        'rank-transition-type',
-        'reward-name',
-        'reward',
-        'shared-chat',
-        'stream-category',
-        'sub-kind',
-        'sub-type',
-        'username',
-        'viewer-ranks',
-        'viewer-roles'
-    ].forEach((filename) => {
-        const definition = require(`./builtin/${filename}`);
-        filterManager.registerFilter(definition);
-    });
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin-filter-loader.ts b/src/backend/events/filters/builtin-filter-loader.ts
new file mode 100644
index 000000000..57ed1fde7
--- /dev/null
+++ b/src/backend/events/filters/builtin-filter-loader.ts
@@ -0,0 +1,8 @@
+import filterManager from "./filter-manager";
+import filters from "./builtin";
+
+export function loadFilters() {
+    for (const definition of filters) {
+        filterManager.registerFilter(definition);
+    }
+}
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/bits-badge-tier.js b/src/backend/events/filters/builtin/bits-badge-tier.js
deleted file mode 100644
index 1adc248ed..000000000
--- a/src/backend/events/filters/builtin/bits-badge-tier.js
+++ /dev/null
@@ -1,51 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:bits-badge-tier",
-    name: "Bits Badge Tier",
-    description: "Filter by the tier of the bits badge that was unlocked (100, 1000, 5000, etc.).",
-    events: [
-        { eventSourceId: "twitch", eventId: "bits-badge-unlocked" }
-    ],
-    comparisonTypes: [
-        ComparisonType.IS,
-        ComparisonType.IS_NOT,
-        ComparisonType.LESS_THAN,
-        ComparisonType.LESS_THAN_OR_EQUAL_TO,
-        ComparisonType.GREATER_THAN,
-        ComparisonType.GREATER_THAN_OR_EQUAL_TO
-    ],
-    valueType: "number",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const badgeTier = eventMeta.badgeTier || 0;
-
-        switch (comparisonType) {
-            case ComparisonType.IS: {
-                return badgeTier === value;
-            }
-            case ComparisonType.IS_NOT: {
-                return badgeTier !== value;
-            }
-            case ComparisonType.LESS_THAN: {
-                return badgeTier < value;
-            }
-            case ComparisonType.LESS_THAN_OR_EQUAL_TO: {
-                return badgeTier <= value;
-            }
-            case ComparisonType.GREATER_THAN: {
-                return badgeTier > value;
-            }
-            case ComparisonType.GREATER_THAN_OR_EQUAL_TO: {
-                return badgeTier >= value;
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/chat-mode-duration.js b/src/backend/events/filters/builtin/chat-mode-duration.js
deleted file mode 100644
index 628fe4329..000000000
--- a/src/backend/events/filters/builtin/chat-mode-duration.js
+++ /dev/null
@@ -1,55 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:chatmodeduration",
-    name: "Duration",
-    description: "Filter by a chat mode's duration (only for Slow (seconds) and Follower (minutes))",
-    events: [
-        { eventSourceId: "twitch", eventId: "chat-mode-changed" }
-    ],
-    comparisonTypes: [
-        ComparisonType.IS,
-        ComparisonType.IS_NOT,
-        ComparisonType.LESS_THAN,
-        ComparisonType.LESS_THAN_OR_EQUAL_TO,
-        ComparisonType.GREATER_THAN,
-        ComparisonType.GREATER_THAN_OR_EQUAL_TO
-    ],
-    valueType: "number",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const duration = eventMeta.duration;
-
-        if (duration == null) {
-            return true;
-        }
-
-        switch (comparisonType) {
-            case ComparisonType.IS: {
-                return duration === value;
-            }
-            case ComparisonType.IS_NOT: {
-                return duration !== value;
-            }
-            case ComparisonType.LESS_THAN: {
-                return duration < value;
-            }
-            case ComparisonType.LESS_THAN_OR_EQUAL_TO: {
-                return duration <= value;
-            }
-            case ComparisonType.GREATER_THAN: {
-                return duration > value;
-            }
-            case ComparisonType.GREATER_THAN_OR_EQUAL_TO: {
-                return duration >= value;
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/chat-mode-setting.js b/src/backend/events/filters/builtin/chat-mode-setting.js
deleted file mode 100644
index fd7839bd3..000000000
--- a/src/backend/events/filters/builtin/chat-mode-setting.js
+++ /dev/null
@@ -1,54 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:chatmodesetting",
-    name: "Setting",
-    description: "Filter by a chat mode's setting",
-    events: [
-        { eventSourceId: "twitch", eventId: "chat-mode-changed" }
-    ],
-    comparisonTypes: [ComparisonType.IS],
-    valueType: "preset",
-    presetValues: () => {
-        return [
-            {
-                value: "enabled",
-                display: "Enabled"
-            },
-            {
-                value: "disabled",
-                display: "Disabled"
-            }
-        ];
-    },
-    getSelectedValueDisplay: (filterSettings) => {
-        switch (filterSettings.value) {
-            case "enabled":
-                return "Enabled";
-            case "disabled":
-                return "Disabled";
-            default:
-                return "[Not set]";
-        }
-    },
-    predicate: async (filterSettings, eventData) => {
-
-        const { value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const chatModeStateEnabled = eventMeta.chatModeState === "enabled";
-
-        switch (value) {
-            case "enabled": {
-                return chatModeStateEnabled;
-            }
-            case "disabled": {
-                return !chatModeStateEnabled;
-            }
-            default:
-                return !chatModeStateEnabled;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/cheer-bits-amount.js b/src/backend/events/filters/builtin/cheer-bits-amount.js
deleted file mode 100644
index 8e34a68fd..000000000
--- a/src/backend/events/filters/builtin/cheer-bits-amount.js
+++ /dev/null
@@ -1,51 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:cheerbitsamount",
-    name: "Cheer Bits Amount",
-    description: "Filter by the amount of bits in a Cheer",
-    events: [
-        { eventSourceId: "twitch", eventId: "cheer" }
-    ],
-    comparisonTypes: [
-        ComparisonType.IS,
-        ComparisonType.IS_NOT,
-        ComparisonType.LESS_THAN,
-        ComparisonType.LESS_THAN_OR_EQUAL_TO,
-        ComparisonType.GREATER_THAN,
-        ComparisonType.GREATER_THAN_OR_EQUAL_TO
-    ],
-    valueType: "number",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const bitsAmount = eventMeta.bits || 0;
-
-        switch (comparisonType) {
-            case ComparisonType.IS: {
-                return bitsAmount === value;
-            }
-            case ComparisonType.IS_NOT: {
-                return bitsAmount !== value;
-            }
-            case ComparisonType.LESS_THAN: {
-                return bitsAmount < value;
-            }
-            case ComparisonType.LESS_THAN_OR_EQUAL_TO: {
-                return bitsAmount <= value;
-            }
-            case ComparisonType.GREATER_THAN: {
-                return bitsAmount > value;
-            }
-            case ComparisonType.GREATER_THAN_OR_EQUAL_TO: {
-                return bitsAmount >= value;
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/currency.js b/src/backend/events/filters/builtin/currency.js
deleted file mode 100644
index 2594cf857..000000000
--- a/src/backend/events/filters/builtin/currency.js
+++ /dev/null
@@ -1,43 +0,0 @@
-"use strict";
-
-module.exports = {
-    id: "firebot:currency",
-    name: "Currency",
-    description: "Filter to a Currency",
-    events: [
-        { eventSourceId: "firebot", eventId: "currency-update" }
-    ],
-    comparisonTypes: ["is", "is not"],
-    valueType: "preset",
-    presetValues: currencyService => {
-        return currencyService
-            .getCurrencies().map(c => ({value: c.id, display: c.name}));
-    },
-    valueIsStillValid: (filterSettings, currencyService) => {
-        return new Promise(resolve => {
-            resolve(currencyService.getCurrencies().some(c => c.id === filterSettings.value));
-        });
-    },
-    getSelectedValueDisplay: (filterSettings, currencyService) => {
-        return new Promise(resolve => {
-            resolve(currencyService.getCurrencies().find(c => c.id === filterSettings.value)?.name ?? "Unknown Currency");
-        });
-    },
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const actual = eventMeta.currencyId;
-        const expected = value;
-
-        switch (comparisonType) {
-            case "is":
-                return actual === expected;
-            case "is not":
-                return actual !== expected;
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/custom-variable-name.ts b/src/backend/events/filters/builtin/custom-variable-name.ts
deleted file mode 100644
index 3d372cacc..000000000
--- a/src/backend/events/filters/builtin/custom-variable-name.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { ComparisonType } from "../../../../shared/filter-constants";
-
-module.exports = {
-    id: "firebot:custom-variable-name",
-    name: "Custom Variable Name",
-    description: "Filter to a Custom Variable by Name",
-    events: [
-        { eventSourceId: "firebot", eventId: "custom-variable-set" },
-        { eventSourceId: "firebot", eventId: "custom-variable-expired" }
-    ],
-    comparisonTypes: [
-        ComparisonType.IS,
-        ComparisonType.IS_NOT,
-        ComparisonType.CONTAINS,
-        ComparisonType.DOESNT_CONTAIN,
-        ComparisonType.STARTS_WITH,
-        ComparisonType.DOESNT_STARTS_WITH,
-        ComparisonType.ENDS_WITH,
-        ComparisonType.DOESNT_END_WITH,
-        ComparisonType.MATCHES_REGEX_CS,
-        ComparisonType.DOESNT_MATCH_REGEX_CS,
-        ComparisonType.MATCHES_REGEX,
-        ComparisonType.DOESNT_MATCH_REGEX
-    ],
-    valueType: "text",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        // normalize
-        const actual = eventMeta.createdCustomVariableName ?? eventMeta.expiredCustomVariableName ?? "";
-        const expected = value ?? "";
-
-        switch (comparisonType) {
-            case ComparisonType.IS:
-                return actual === expected;
-            case ComparisonType.IS_NOT:
-                return actual !== expected;
-            case ComparisonType.CONTAINS:
-                return actual.includes(expected);
-            case ComparisonType.DOESNT_CONTAIN:
-                return !actual.includes(expected);
-            case ComparisonType.STARTS_WITH:
-                return actual.startsWith(expected);
-            case ComparisonType.DOESNT_STARTS_WITH:
-                return !actual.startsWith(expected);
-            case ComparisonType.ENDS_WITH:
-                return actual.endsWith(expected);
-            case ComparisonType.DOESNT_END_WITH:
-                return !actual.endsWith(expected);
-            case ComparisonType.MATCHES_REGEX: {
-                const regex = new RegExp(expected, "gi");
-                return regex.test(actual);
-            }
-            case ComparisonType.DOESNT_MATCH_REGEX: {
-                const regex = new RegExp(expected, "gi");
-                return !regex.test(actual);
-            }
-            case ComparisonType.MATCHES_REGEX_CS: {
-                const regex = new RegExp(expected, "g");
-                return regex.test(actual);
-            }
-            case ComparisonType.DOESNT_MATCH_REGEX_CS: {
-                const regex = new RegExp(expected, "g");
-                return !regex.test(actual);
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/donation-amount.js b/src/backend/events/filters/builtin/donation-amount.js
deleted file mode 100644
index 06c69223b..000000000
--- a/src/backend/events/filters/builtin/donation-amount.js
+++ /dev/null
@@ -1,55 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:donation-amount",
-    name: "Donation Amount",
-    description: "Filter by the amount of donation from StreamLabs/Tipeee/ExtraLife",
-    events: [
-        { eventSourceId: "streamlabs", eventId: "donation" },
-        { eventSourceId: "streamlabs", eventId: "eldonation" },
-        { eventSourceId: "extralife", eventId: "donation" },
-        { eventSourceId: "tipeeestream", eventId: "donation" },
-        { eventSourceId: "streamelements", eventId: "donation" }
-    ],
-    comparisonTypes: [
-        ComparisonType.IS,
-        ComparisonType.IS_NOT,
-        ComparisonType.LESS_THAN,
-        ComparisonType.LESS_THAN_OR_EQUAL_TO,
-        ComparisonType.GREATER_THAN,
-        ComparisonType.GREATER_THAN_OR_EQUAL_TO
-    ],
-    valueType: "number",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const donationAmount = eventMeta.donationAmount || 0;
-
-        switch (comparisonType) {
-            case ComparisonType.IS: {
-                return donationAmount === value;
-            }
-            case ComparisonType.IS_NOT: {
-                return donationAmount !== value;
-            }
-            case ComparisonType.LESS_THAN: {
-                return donationAmount < value;
-            }
-            case ComparisonType.LESS_THAN_OR_EQUAL_TO: {
-                return donationAmount <= value;
-            }
-            case ComparisonType.GREATER_THAN: {
-                return donationAmount > value;
-            }
-            case ComparisonType.GREATER_THAN_OR_EQUAL_TO: {
-                return donationAmount >= value;
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/donation-from.js b/src/backend/events/filters/builtin/donation-from.js
deleted file mode 100644
index 7fb5a9607..000000000
--- a/src/backend/events/filters/builtin/donation-from.js
+++ /dev/null
@@ -1,47 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:donationfrom",
-    name: "Donation From",
-    description: "Filter to a specific donation sender",
-    events: [
-        { eventSourceId: "streamlabs", eventId: "donation" },
-        { eventSourceId: "streamlabs", eventId: "eldonation" },
-        { eventSourceId: "extralife", eventId: "donation" },
-        { eventSourceId: "tipeeestream", eventId: "donation" },
-        { eventSourceId: "streamelements", eventId: "donation" }
-    ],
-    comparisonTypes: [ComparisonType.IS, ComparisonType.IS_NOT, ComparisonType.CONTAINS, ComparisonType.MATCHES_REGEX],
-    valueType: "text",
-    /*presetValues: () => {
-        return new Promise(resolve => {
-            return [{value: 1, display: "one"}];
-        });
-    },*/
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        // normalize usernames
-        const eventUsername = eventMeta.from ? eventMeta.from.toLowerCase() : "";
-        const filterUsername = value ? value.toLowerCase() : "";
-
-        switch (comparisonType) {
-            case ComparisonType.IS:
-                return eventUsername === filterUsername;
-            case ComparisonType.IS_NOT:
-                return eventUsername !== filterUsername;
-            case ComparisonType.CONTAINS:
-                return eventUsername.includes(filterUsername);
-            case ComparisonType.MATCHES_REGEX: {
-                const regex = new RegExp(filterUsername, "gi");
-                return regex.test(eventUsername);
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/effect-queue.js b/src/backend/events/filters/builtin/effect-queue.js
deleted file mode 100644
index b17d9c77a..000000000
--- a/src/backend/events/filters/builtin/effect-queue.js
+++ /dev/null
@@ -1,46 +0,0 @@
-"use strict";
-
-module.exports = {
-    id: "firebot:effect-queue",
-    name: "Effect Queue",
-    description: "Filter to a Effect Queue",
-    events: [
-        { eventSourceId: "firebot", eventId: "effect-queue-added" },
-        { eventSourceId: "firebot", eventId: "effect-queue-cleared" },
-        { eventSourceId: "firebot", eventId: "effect-queue-status" }
-    ],
-    comparisonTypes: ["is", "is not"],
-    valueType: "preset",
-    presetValues: (effectQueuesService) => {
-        return effectQueuesService.getEffectQueues().map((c) => ({ value: c.id, display: c.name }));
-    },
-    valueIsStillValid: (filterSettings, effectQueuesService) => {
-        return new Promise((resolve) => {
-            resolve(effectQueuesService.getEffectQueues().some((c) => c.id === filterSettings.value));
-        });
-    },
-    getSelectedValueDisplay: (filterSettings, effectQueuesService) => {
-        return new Promise((resolve) => {
-            resolve(
-                effectQueuesService.getEffectQueues().find((c) => c.id === filterSettings.value)?.name ??
-                    "Unknown Effect Queue"
-            );
-        });
-    },
-    predicate: (filterSettings, eventData) => {
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const actual = eventMeta.effectQueueId;
-        const expected = value;
-
-        switch (comparisonType) {
-            case "is":
-                return actual === expected;
-            case "is not":
-                return actual !== expected;
-            default:
-                return false;
-        }
-    }
-};
diff --git a/src/backend/events/filters/builtin/firebot/currency.ts b/src/backend/events/filters/builtin/firebot/currency.ts
new file mode 100644
index 000000000..5fe172827
--- /dev/null
+++ b/src/backend/events/filters/builtin/firebot/currency.ts
@@ -0,0 +1,20 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:currency",
+    name: "Currency",
+    description: "Filter to a Currency",
+    events: [
+        { eventSourceId: "firebot", eventId: "currency-update" }
+    ],
+    eventMetaKey: "currencyId",
+    allowIsNot: true,
+    presetValues: async (currencyService: any) => {
+        return currencyService.getCurrencies().map(c => ({value: c.id, display: c.name}));
+    },
+    valueIsStillValid: async (filterSettings, currencyService: any) => {
+        return currencyService.getCurrencies().some(c => c.id === filterSettings.value);
+    }
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/firebot/custom-variable-name.ts b/src/backend/events/filters/builtin/firebot/custom-variable-name.ts
new file mode 100644
index 000000000..709d97280
--- /dev/null
+++ b/src/backend/events/filters/builtin/firebot/custom-variable-name.ts
@@ -0,0 +1,19 @@
+import { createTextFilter } from "../../filter-factory";
+
+const filter = createTextFilter({
+    id: "firebot:custom-variable-name",
+    name: "Custom Variable Name",
+    description: "Filter to a Custom Variable by Name",
+    eventMetaKey: ({eventId}) => {
+        if (eventId === "custom-variable-set") {
+            return "createdCustomVariableName";
+        }
+        return "expiredCustomVariableName";
+    },
+    events: [
+        { eventSourceId: "firebot", eventId: "custom-variable-set" },
+        { eventSourceId: "firebot", eventId: "custom-variable-expired" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/firebot/effect-queue.ts b/src/backend/events/filters/builtin/firebot/effect-queue.ts
new file mode 100644
index 000000000..88046ef97
--- /dev/null
+++ b/src/backend/events/filters/builtin/firebot/effect-queue.ts
@@ -0,0 +1,22 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:effect-queue",
+    name: "Effect Queue",
+    description: "Filter to a Effect Queue",
+    events: [
+        { eventSourceId: "firebot", eventId: "effect-queue-added" },
+        { eventSourceId: "firebot", eventId: "effect-queue-cleared" },
+        { eventSourceId: "firebot", eventId: "effect-queue-status" }
+    ],
+    eventMetaKey: "effectQueueId",
+    allowIsNot: true,
+    presetValues: async (effectQueuesService: any) => {
+        return effectQueuesService.getEffectQueues().map(c => ({ value: c.id, display: c.name }));
+    },
+    valueIsStillValid: async (filterSettings, effectQueuesService: any) => {
+        return effectQueuesService.getEffectQueues().some(c => c.id === filterSettings.value);
+    }
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/firebot/index.ts b/src/backend/events/filters/builtin/firebot/index.ts
new file mode 100644
index 000000000..78cf83899
--- /dev/null
+++ b/src/backend/events/filters/builtin/firebot/index.ts
@@ -0,0 +1,33 @@
+import currency from "./currency";
+import customVariableName from "./custom-variable-name";
+import effectQueue from "./effect-queue";
+import metadataKey from "./metadata-key";
+import metadataValue from "./metadata-value";
+import newCurrencyAmount from "./new-currency-amount";
+import newRank from "./new-rank";
+import newViewTime from "./new-view-time";
+import previousCurrencyAmount from "./previous-currency-amount";
+import previousRank from "./previous-rank";
+import previousViewTime from "./previous-view-time";
+import rankLadder from "./rank-ladder";
+import rankTransitionType from "./rank-transition-type";
+import viewerRanks from "./viewer-ranks";
+import viewerRoles from "./viewer-roles";
+
+export default [
+    currency,
+    customVariableName,
+    effectQueue,
+    metadataKey,
+    metadataValue,
+    newCurrencyAmount,
+    newRank,
+    newViewTime,
+    previousCurrencyAmount,
+    previousRank,
+    previousViewTime,
+    rankLadder,
+    rankTransitionType,
+    viewerRanks,
+    viewerRoles
+];
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/metadata-key.ts b/src/backend/events/filters/builtin/firebot/metadata-key.ts
similarity index 65%
rename from src/backend/events/filters/builtin/metadata-key.ts
rename to src/backend/events/filters/builtin/firebot/metadata-key.ts
index 604ff3815..e1d4d5e83 100644
--- a/src/backend/events/filters/builtin/metadata-key.ts
+++ b/src/backend/events/filters/builtin/firebot/metadata-key.ts
@@ -1,6 +1,6 @@
-import { createTextFilter } from "../filter-factory";
+import { createTextFilter } from "../../filter-factory";
 
-const metadataKeyFilter = createTextFilter({
+const filter = createTextFilter({
     id: "firebot:metadata-key",
     name: "Metadata Key",
     description: "Filters events based on the metadata key.",
@@ -10,4 +10,4 @@ const metadataKeyFilter = createTextFilter({
     ]
 });
 
-module.exports = metadataKeyFilter;
+export default filter;
diff --git a/src/backend/events/filters/builtin/metadata-value.ts b/src/backend/events/filters/builtin/firebot/metadata-value.ts
similarity index 66%
rename from src/backend/events/filters/builtin/metadata-value.ts
rename to src/backend/events/filters/builtin/firebot/metadata-value.ts
index f06682ed0..87c3c08bc 100644
--- a/src/backend/events/filters/builtin/metadata-value.ts
+++ b/src/backend/events/filters/builtin/firebot/metadata-value.ts
@@ -1,6 +1,6 @@
-import { createTextOrNumberFilter } from "../filter-factory";
+import { createTextOrNumberFilter } from "../../filter-factory";
 
-const metadataValueFilter = createTextOrNumberFilter({
+const filter = createTextOrNumberFilter({
     id: "firebot:metadata-value",
     name: "Metadata Value",
     description: "Filters events based on the metadata value. Only works with text or number value types.",
@@ -10,4 +10,4 @@ const metadataValueFilter = createTextOrNumberFilter({
     ]
 });
 
-module.exports = metadataValueFilter;
+export default filter;
diff --git a/src/backend/events/filters/builtin/new-currency-amount.js b/src/backend/events/filters/builtin/firebot/new-currency-amount.ts
similarity index 56%
rename from src/backend/events/filters/builtin/new-currency-amount.js
rename to src/backend/events/filters/builtin/firebot/new-currency-amount.ts
index 71da991c4..67a463dc0 100644
--- a/src/backend/events/filters/builtin/new-currency-amount.js
+++ b/src/backend/events/filters/builtin/firebot/new-currency-amount.ts
@@ -1,13 +1,13 @@
-"use strict";
+import { createNumberFilter } from "../../filter-factory";
 
-const { createNumberFilter } = require("../filter-factory");
-
-module.exports = createNumberFilter({
+const filter = createNumberFilter({
     id: "firebot:new-currency-amount",
     name: "New Currency Amount",
     description: "Filter by the viewers new currency amount",
+    eventMetaKey: "newCurrencyAmount",
     events: [
         { eventSourceId: "firebot", eventId: "currency-update" }
-    ],
-    eventMetaKey: "newCurrencyAmount"
-});
\ No newline at end of file
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/firebot/new-rank.ts b/src/backend/events/filters/builtin/firebot/new-rank.ts
new file mode 100644
index 000000000..e5029b482
--- /dev/null
+++ b/src/backend/events/filters/builtin/firebot/new-rank.ts
@@ -0,0 +1,32 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:new-rank",
+    name: "New Rank",
+    description: "Filter to a given new rank",
+    events: [
+        { eventSourceId: "firebot", eventId: "viewer-rank-updated" }
+    ],
+    eventMetaKey: "newRankId",
+    allowIsNot: true,
+    presetValues: async (viewerRanksService: any) => viewerRanksService
+        .rankLadders
+        .flatMap(l => l
+            .ranks
+            .map(r => ({ value: r.id, display: `${r.name} (${l.name})`}))
+        ),
+    valueIsStillValid: async (filterSettings, viewerRanksService: any) => viewerRanksService
+        .rankLadders
+        .find(l => l.ranks?.some(r => r.id === filterSettings.value)) != null,
+    getSelectedValueDisplay: (filterSettings, viewerRanksService: any) => {
+        const ladderWithRank = viewerRanksService
+            .rankLadders
+            .find(l => l.ranks?.some(r => r.id === filterSettings.value));
+
+        const rank = ladderWithRank?.ranks?.find(r => r.id === filterSettings.value);
+
+        return rank ? `${rank?.name} (${ladderWithRank?.name})` : "Not set";
+    }
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/firebot/new-view-time.ts b/src/backend/events/filters/builtin/firebot/new-view-time.ts
new file mode 100644
index 000000000..907ef3180
--- /dev/null
+++ b/src/backend/events/filters/builtin/firebot/new-view-time.ts
@@ -0,0 +1,13 @@
+import { createNumberFilter } from "../../filter-factory";
+
+const filter = createNumberFilter({
+    id: "firebot:new-view-time",
+    name: "New View Time",
+    description: "Filter a viewers new view time (hours)",
+    eventMetaKey: "newViewTime",
+    events: [
+        { eventSourceId: "firebot", eventId: "view-time-update" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/previous-currency-amount.js b/src/backend/events/filters/builtin/firebot/previous-currency-amount.ts
similarity index 69%
rename from src/backend/events/filters/builtin/previous-currency-amount.js
rename to src/backend/events/filters/builtin/firebot/previous-currency-amount.ts
index 32e73961b..565f8237e 100644
--- a/src/backend/events/filters/builtin/previous-currency-amount.js
+++ b/src/backend/events/filters/builtin/firebot/previous-currency-amount.ts
@@ -1,8 +1,6 @@
-"use strict";
+import { createNumberFilter } from "../../filter-factory";
 
-const { createNumberFilter } = require("../filter-factory");
-
-module.exports = createNumberFilter({
+const filter = createNumberFilter({
     id: "firebot:previous-currency-amount",
     name: "Previous Currency Amount",
     description: "Filter by the viewers previous currency amount",
@@ -10,4 +8,6 @@ module.exports = createNumberFilter({
     events: [
         { eventSourceId: "firebot", eventId: "currency-update" }
     ]
-});
\ No newline at end of file
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/firebot/previous-rank.ts b/src/backend/events/filters/builtin/firebot/previous-rank.ts
new file mode 100644
index 000000000..18c26ec1c
--- /dev/null
+++ b/src/backend/events/filters/builtin/firebot/previous-rank.ts
@@ -0,0 +1,32 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:previous-rank",
+    name: "Previous Rank",
+    description: "Filter to a given previous rank",
+    events: [
+        { eventSourceId: "firebot", eventId: "viewer-rank-updated" }
+    ],
+    eventMetaKey: "previousRankId",
+    allowIsNot: true,
+    presetValues: async (viewerRanksService: any) => viewerRanksService
+        .rankLadders
+        .flatMap(l => l
+            .ranks
+            .map(r => ({ value: r.id, display: `${r.name} (${l.name})`}))
+        ),
+    valueIsStillValid: async (filterSettings, viewerRanksService: any) => viewerRanksService
+        .rankLadders
+        .find(l => l.ranks?.some(r => r.id === filterSettings.value)) != null,
+    getSelectedValueDisplay: (filterSettings, viewerRanksService: any) => {
+        const ladderWithRank = viewerRanksService
+            .rankLadders
+            .find(l => l.ranks?.some(r => r.id === filterSettings.value));
+
+        const rank = ladderWithRank?.ranks?.find(r => r.id === filterSettings.value);
+
+        return rank ? `${rank?.name} (${ladderWithRank?.name})` : "Not set";
+    }
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/firebot/previous-view-time.ts b/src/backend/events/filters/builtin/firebot/previous-view-time.ts
new file mode 100644
index 000000000..7043ea7b3
--- /dev/null
+++ b/src/backend/events/filters/builtin/firebot/previous-view-time.ts
@@ -0,0 +1,13 @@
+import { createNumberFilter } from "../../filter-factory";
+
+const filter = createNumberFilter({
+    id: "firebot:previous-view-time",
+    name: "Previous View Time",
+    description: "Filter a viewers previous view time (hours)",
+    eventMetaKey: "previousViewTime",
+    events: [
+        { eventSourceId: "firebot", eventId: "view-time-update" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/firebot/rank-ladder.ts b/src/backend/events/filters/builtin/firebot/rank-ladder.ts
new file mode 100644
index 000000000..0a11e3ccc
--- /dev/null
+++ b/src/backend/events/filters/builtin/firebot/rank-ladder.ts
@@ -0,0 +1,18 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:rank-ladder",
+    name: "Rank Ladder",
+    description: "Filter to a given rank ladder",
+    events: [
+        { eventSourceId: "firebot", eventId: "viewer-rank-updated" }
+    ],
+    eventMetaKey: "rankLadderId",
+    allowIsNot: true,
+    presetValues: async (viewerRanksService: any) => viewerRanksService
+        .rankLadders.map(l => ({value: l.id, display: l.name})),
+    valueIsStillValid: async (filterSettings, viewerRanksService: any) => viewerRanksService
+        .getRankLadder(filterSettings.value) != null
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/firebot/rank-transition-type.ts b/src/backend/events/filters/builtin/firebot/rank-transition-type.ts
new file mode 100644
index 000000000..9b220c9f8
--- /dev/null
+++ b/src/backend/events/filters/builtin/firebot/rank-transition-type.ts
@@ -0,0 +1,25 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:rank-transition-type",
+    name: "Rank Transition Type",
+    description: "Filter to a given rank transition type (promotion or demotion)",
+    events: [
+        { eventSourceId: "firebot", eventId: "viewer-rank-updated" }
+    ],
+    eventMetaKey: (eventData, filterSettings) => {
+        if (filterSettings.value === "Promotion") {
+            return "isPromotion";
+        }
+        if (filterSettings.value === "Demotion") {
+            return "isDemotion";
+        }
+        return "";
+    },
+    presetValues: () => [
+        { value: "Promotion", display: "Promotion" },
+        { value: "Demotion", display: "Demotion" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/viewer-ranks.js b/src/backend/events/filters/builtin/firebot/viewer-ranks.ts
similarity index 82%
rename from src/backend/events/filters/builtin/viewer-ranks.js
rename to src/backend/events/filters/builtin/firebot/viewer-ranks.ts
index 45ede6aa1..8da5b20fd 100644
--- a/src/backend/events/filters/builtin/viewer-ranks.js
+++ b/src/backend/events/filters/builtin/firebot/viewer-ranks.ts
@@ -1,9 +1,8 @@
-"use strict";
+import twitchApi from "../../../../twitch-api/api";
+import viewerDatabase from "../../../../viewers/viewer-database";
+import { EventFilter } from "../../../../../types/events";
 
-const twitchApi = require("../../../twitch-api/api");
-const viewerDatabase = require("../../../viewers/viewer-database");
-
-module.exports = {
+const filter: EventFilter = {
     id: "firebot:viewerranks",
     name: "Viewer's Ranks",
     description: "Filter to a given viewer rank",
@@ -25,12 +24,12 @@ module.exports = {
     ],
     comparisonTypes: ["include", "doesn't include"],
     valueType: "preset",
-    presetValues: (viewerRanksService) => {
+    presetValues: (viewerRanksService: any) => {
         return viewerRanksService
             .rankLadders
-            .flatMap(l => l.ranks.map(r => ({value: `${l.id}:${r.id}`, display: `${r.name} (${l.name})`})));
+            .flatMap(l => l.ranks.map(r => ({ value: `${l.id}:${r.id}`, display: `${r.name} (${l.name})` })));
     },
-    valueIsStillValid: (filterSettings, viewerRanksService) => {
+    valueIsStillValid: (filterSettings, viewerRanksService: any) => {
         const [ladderId, rankId] = filterSettings.value?.split(":") ?? [];
 
         const ladder = viewerRanksService.getRankLadder(ladderId);
@@ -39,7 +38,7 @@ module.exports = {
 
         return hasRank;
     },
-    getSelectedValueDisplay: (filterSettings, viewerRanksService) => {
+    getSelectedValueDisplay: (filterSettings, viewerRanksService: any) => {
         const [ladderId, rankId] = filterSettings.value?.split(":") ?? [];
 
         const ladder = viewerRanksService.getRankLadder(ladderId);
@@ -57,8 +56,8 @@ module.exports = {
         const { comparisonType, value } = filterSettings;
         const { eventMeta } = eventData;
 
-        const { username } = eventMeta;
-        let { userId } = eventMeta;
+        const username = eventMeta.username as string;
+        let userId = eventMeta.userId as string;
 
         if (!username && !userId) {
             return false;
@@ -93,4 +92,6 @@ module.exports = {
 
         return false;
     }
-};
\ No newline at end of file
+};
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/viewer-roles.js b/src/backend/events/filters/builtin/firebot/viewer-roles.ts
similarity index 82%
rename from src/backend/events/filters/builtin/viewer-roles.js
rename to src/backend/events/filters/builtin/firebot/viewer-roles.ts
index 1cd668a79..3b84caecd 100644
--- a/src/backend/events/filters/builtin/viewer-roles.js
+++ b/src/backend/events/filters/builtin/firebot/viewer-roles.ts
@@ -1,12 +1,11 @@
-"use strict";
-
-const customRolesManager = require("../../../roles/custom-roles-manager");
-const teamRolesManager = require("../../../roles/team-roles-manager");
-const twitchRolesManager = require("../../../../shared/twitch-roles");
-const chatRolesManager = require("../../../roles/chat-roles-manager");
-const twitchApi = require("../../../twitch-api/api");
-
-module.exports = {
+import customRolesManager from "../../../../roles/custom-roles-manager";
+import teamRolesManager from "../../../../roles/team-roles-manager";
+import twitchRolesManager from "../../../../../shared/twitch-roles";
+import chatRolesManager from "../../../../roles/chat-roles-manager";
+import twitchApi from "../../../../twitch-api/api";
+import { EventFilter } from "../../../../../types/events";
+
+const filter: EventFilter = {
     id: "firebot:viewerroles",
     name: "Viewer's Roles",
     description: "Filter to a given viewer role",
@@ -29,15 +28,14 @@ module.exports = {
     ],
     comparisonTypes: ["include", "doesn't include"],
     valueType: "preset",
-    presetValues: (viewerRolesService) => {
+    presetValues: (viewerRolesService: any) => {
         return viewerRolesService
             .getCustomRoles()
             .concat(viewerRolesService.getTwitchRoles())
             .concat(viewerRolesService.getTeamRoles())
-            .map(r => ({value: r.id, display: r.name}));
-
+            .map(r => ({ value: r.id, display: r.name }));
     },
-    valueIsStillValid: (filterSettings, viewerRolesService) => {
+    valueIsStillValid: (filterSettings, viewerRolesService: any) => {
         const allRoles = viewerRolesService
             .getCustomRoles()
             .concat(viewerRolesService.getTeamRoles())
@@ -47,7 +45,7 @@ module.exports = {
 
         return role != null && role.name != null;
     },
-    getSelectedValueDisplay: (filterSettings, viewerRolesService) => {
+    getSelectedValueDisplay: (filterSettings, viewerRolesService: any) => {
         const allRoles = viewerRolesService.getCustomRoles()
             .concat(viewerRolesService.getTeamRoles())
             .concat(viewerRolesService.getTwitchRoles());
@@ -60,13 +58,12 @@ module.exports = {
 
         return filterSettings.value;
     },
-
     predicate: async (filterSettings, eventData) => {
         const { comparisonType, value } = filterSettings;
         const { eventMeta } = eventData;
 
-        const { username } = eventMeta;
-        let { userId } = eventMeta;
+        const username = eventMeta.username as string;
+        let userId = eventMeta.userId as string;
 
         if (!username && !userId) {
             return false;
@@ -83,8 +80,7 @@ module.exports = {
                 userId = user.id;
             }
 
-            /** @type {string[]} */
-            let twitchUserRoles = eventMeta.twitchUserRoles;
+            let twitchUserRoles = eventMeta.twitchUserRoles as string[];
 
             // For sub tier-specific/known bot permission checking, we have to get live data
             if (twitchUserRoles == null
@@ -123,4 +119,6 @@ module.exports = {
 
         return false;
     }
-};
\ No newline at end of file
+};
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/gift-count.js b/src/backend/events/filters/builtin/gift-count.js
deleted file mode 100644
index aaef3abb6..000000000
--- a/src/backend/events/filters/builtin/gift-count.js
+++ /dev/null
@@ -1,51 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:gift-count",
-    name: "Gift Count",
-    description: "Filter by the number of subs gifted",
-    events: [
-        { eventSourceId: "twitch", eventId: "community-subs-gifted" }
-    ],
-    comparisonTypes: [
-        ComparisonType.IS,
-        ComparisonType.IS_NOT,
-        ComparisonType.LESS_THAN,
-        ComparisonType.LESS_THAN_OR_EQUAL_TO,
-        ComparisonType.GREATER_THAN,
-        ComparisonType.GREATER_THAN_OR_EQUAL_TO
-    ],
-    valueType: "number",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const giftCountCount = eventMeta.subCount || 0;
-
-        switch (comparisonType) {
-            case ComparisonType.IS: {
-                return giftCountCount === value;
-            }
-            case ComparisonType.IS_NOT: {
-                return giftCountCount !== value;
-            }
-            case ComparisonType.LESS_THAN: {
-                return giftCountCount < value;
-            }
-            case ComparisonType.LESS_THAN_OR_EQUAL_TO: {
-                return giftCountCount <= value;
-            }
-            case ComparisonType.GREATER_THAN: {
-                return giftCountCount > value;
-            }
-            case ComparisonType.GREATER_THAN_OR_EQUAL_TO: {
-                return giftCountCount >= value;
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/gift-duration.js b/src/backend/events/filters/builtin/gift-duration.js
deleted file mode 100644
index 7408181a3..000000000
--- a/src/backend/events/filters/builtin/gift-duration.js
+++ /dev/null
@@ -1,51 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:gift-duration",
-    name: "Gift Duration",
-    description: "Filter by the duration of the gift sub (in months)",
-    events: [
-        { eventSourceId: "twitch", eventId: "subs-gifted" }
-    ],
-    comparisonTypes: [
-        ComparisonType.IS,
-        ComparisonType.IS_NOT,
-        ComparisonType.LESS_THAN,
-        ComparisonType.LESS_THAN_OR_EQUAL_TO,
-        ComparisonType.GREATER_THAN,
-        ComparisonType.GREATER_THAN_OR_EQUAL_TO
-    ],
-    valueType: "number",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const giftDuration = eventMeta.giftDuration || 1;
-
-        switch (comparisonType) {
-            case ComparisonType.IS: {
-                return giftDuration === value;
-            }
-            case ComparisonType.IS_NOT: {
-                return giftDuration !== value;
-            }
-            case ComparisonType.LESS_THAN: {
-                return giftDuration < value;
-            }
-            case ComparisonType.LESS_THAN_OR_EQUAL_TO: {
-                return giftDuration <= value;
-            }
-            case ComparisonType.GREATER_THAN: {
-                return giftDuration > value;
-            }
-            case ComparisonType.GREATER_THAN_OR_EQUAL_TO: {
-                return giftDuration >= value;
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/index.ts b/src/backend/events/filters/builtin/index.ts
new file mode 100644
index 000000000..f84b2a658
--- /dev/null
+++ b/src/backend/events/filters/builtin/index.ts
@@ -0,0 +1,9 @@
+import firebotFilters from "./firebot";
+import thirdPartyFilters from "./third-party";
+import twitchFilters from "./twitch";
+
+export default [
+    ...firebotFilters,
+    ...thirdPartyFilters,
+    ...twitchFilters
+];
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/is-anonymous.js b/src/backend/events/filters/builtin/is-anonymous.js
deleted file mode 100644
index d2069852c..000000000
--- a/src/backend/events/filters/builtin/is-anonymous.js
+++ /dev/null
@@ -1,45 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:is-anonymous",
-    name: "Anonymous",
-    description: "Filter by whether the event was triggered by an anonymous user",
-    events: [
-        { eventSourceId: "twitch", eventId: "cheer" },
-        { eventSourceId: "twitch", eventId: "subs-gifted" },
-        { eventSourceId: "twitch", eventId: "community-subs-gifted" }
-    ],
-    comparisonTypes: [ComparisonType.IS],
-    valueType: "preset",
-    presetValues: () => {
-        return [
-            {
-                value: "true",
-                display: "True"
-            },
-            {
-                value: "false",
-                display: "False"
-            }
-        ];
-    },
-    getSelectedValueDisplay: (filterSettings) => {
-
-        if (filterSettings.value == null) {
-            return "False";
-        }
-
-        return filterSettings.value === "true" ? "True" : "False";
-    },
-    predicate: (filterSettings, eventData) => {
-
-        const { value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const isAnonymous = eventMeta.isAnonymous === true;
-
-        return value === "true" ? isAnonymous : !isAnonymous;
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/message.js b/src/backend/events/filters/builtin/message.js
deleted file mode 100644
index 14d320707..000000000
--- a/src/backend/events/filters/builtin/message.js
+++ /dev/null
@@ -1,75 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:message-text",
-    name: "Message Text",
-    description: "Filter based on chat message text",
-    events: [
-        { eventSourceId: "twitch", eventId: "chat-message" },
-        { eventSourceId: "twitch", eventId: "announcement" }
-    ],
-    comparisonTypes: [
-        ComparisonType.IS,
-        ComparisonType.IS_NOT,
-        ComparisonType.CONTAINS,
-        ComparisonType.DOESNT_CONTAIN,
-        ComparisonType.STARTS_WITH,
-        ComparisonType.DOESNT_STARTS_WITH,
-        ComparisonType.ENDS_WITH,
-        ComparisonType.DOESNT_END_WITH,
-        ComparisonType.MATCHES_REGEX_CS,
-        ComparisonType.DOESNT_MATCH_REGEX_CS,
-        ComparisonType.MATCHES_REGEX,
-        ComparisonType.DOESNT_MATCH_REGEX
-    ],
-    valueType: "text",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        /**
-         * @type {string}
-         */
-        const chatMessage = eventMeta.messageText || "";
-
-        switch (comparisonType) {
-            case ComparisonType.IS:
-                return chatMessage === value;
-            case ComparisonType.IS_NOT:
-                return chatMessage !== value;
-            case ComparisonType.CONTAINS:
-                return chatMessage.includes(value);
-            case ComparisonType.DOESNT_CONTAIN:
-                return !chatMessage.includes(value);
-            case ComparisonType.STARTS_WITH:
-                return chatMessage.startsWith(value);
-            case ComparisonType.DOESNT_STARTS_WITH:
-                return !chatMessage.startsWith(value);
-            case ComparisonType.ENDS_WITH:
-                return chatMessage.endsWith(value);
-            case ComparisonType.DOESNT_END_WITH:
-                return !chatMessage.endsWith(value);
-            case ComparisonType.MATCHES_REGEX: {
-                const regex = new RegExp(value, "gi");
-                return regex.test(chatMessage);
-            }
-            case ComparisonType.DOESNT_MATCH_REGEX: {
-                const regex = new RegExp(value, "gi");
-                return !regex.test(chatMessage);
-            }
-            case ComparisonType.MATCHES_REGEX_CS: {
-                const regex = new RegExp(value, "g");
-                return regex.test(chatMessage);
-            }
-            case ComparisonType.DOESNT_MATCH_REGEX_CS: {
-                const regex = new RegExp(value, "g");
-                return !regex.test(chatMessage);
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/new-rank.js b/src/backend/events/filters/builtin/new-rank.js
deleted file mode 100644
index 70eb8aed7..000000000
--- a/src/backend/events/filters/builtin/new-rank.js
+++ /dev/null
@@ -1,54 +0,0 @@
-"use strict";
-
-module.exports = {
-    id: "firebot:new-rank",
-    name: "New Rank",
-    description: "Filter to a given new rank",
-    events: [
-        { eventSourceId: "firebot", eventId: "viewer-rank-updated" }
-    ],
-    comparisonTypes: ["is", "is not"],
-    valueType: "preset",
-    presetValues: (viewerRanksService) => {
-        return viewerRanksService
-            .rankLadders
-            .flatMap(l => l
-                .ranks
-                .map(r => ({ value: r.id, display: `${r.name} (${l.name})`}))
-            );
-    },
-    valueIsStillValid: (filterSettings, viewerRanksService) => {
-        const ladderWithRank = viewerRanksService
-            .rankLadders
-            .find(l => l.ranks?.some(r => r.id === filterSettings.value));
-
-        return ladderWithRank != null;
-    },
-    getSelectedValueDisplay: (filterSettings, viewerRanksService) => {
-        const ladderWithRank = viewerRanksService
-            .rankLadders
-            .find(l => l.ranks?.some(r => r.id === filterSettings.value));
-
-        const rank = ladderWithRank?.ranks?.find(r => r.id === filterSettings.value);
-
-        return rank ? `${rank?.name} (${ladderWithRank?.name})` : "Not set";
-    },
-
-    predicate: async (filterSettings, eventData) => {
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const { newRankId } = eventMeta;
-
-        const isRank = newRankId === value;
-
-        switch (comparisonType) {
-            case "is":
-                return isRank;
-            case "is not":
-                return !isRank;
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/new-view-time.js b/src/backend/events/filters/builtin/new-view-time.js
deleted file mode 100644
index 9d6e70ab4..000000000
--- a/src/backend/events/filters/builtin/new-view-time.js
+++ /dev/null
@@ -1,51 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:new-view-time",
-    name: "New View Time",
-    description: "Filter a viewers new view time (hours)",
-    events: [
-        { eventSourceId: "firebot", eventId: "view-time-update" }
-    ],
-    comparisonTypes: [
-        ComparisonType.IS,
-        ComparisonType.IS_NOT,
-        ComparisonType.LESS_THAN,
-        ComparisonType.LESS_THAN_OR_EQUAL_TO,
-        ComparisonType.GREATER_THAN,
-        ComparisonType.GREATER_THAN_OR_EQUAL_TO
-    ],
-    valueType: "number",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const newViewTime = eventMeta.newViewTime || 0;
-
-        switch (comparisonType) {
-            case ComparisonType.IS: {
-                return newViewTime === value;
-            }
-            case ComparisonType.IS_NOT: {
-                return newViewTime !== value;
-            }
-            case ComparisonType.LESS_THAN: {
-                return newViewTime < value;
-            }
-            case ComparisonType.LESS_THAN_OR_EQUAL_TO: {
-                return newViewTime <= value;
-            }
-            case ComparisonType.GREATER_THAN: {
-                return newViewTime > value;
-            }
-            case ComparisonType.GREATER_THAN_OR_EQUAL_TO: {
-                return newViewTime >= value;
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/previous-rank.js b/src/backend/events/filters/builtin/previous-rank.js
deleted file mode 100644
index 6318d32c0..000000000
--- a/src/backend/events/filters/builtin/previous-rank.js
+++ /dev/null
@@ -1,54 +0,0 @@
-"use strict";
-
-module.exports = {
-    id: "firebot:previous-rank",
-    name: "Previous Rank",
-    description: "Filter to a given previous rank",
-    events: [
-        { eventSourceId: "firebot", eventId: "viewer-rank-updated" }
-    ],
-    comparisonTypes: ["is", "is not"],
-    valueType: "preset",
-    presetValues: (viewerRanksService) => {
-        return viewerRanksService
-            .rankLadders
-            .flatMap(l => l
-                .ranks
-                .map(r => ({ value: r.id, display: `${r.name} (${l.name})`}))
-            );
-    },
-    valueIsStillValid: (filterSettings, viewerRanksService) => {
-        const ladderWithRank = viewerRanksService
-            .rankLadders
-            .find(l => l.ranks?.some(r => r.id === filterSettings.value));
-
-        return ladderWithRank != null;
-    },
-    getSelectedValueDisplay: (filterSettings, viewerRanksService) => {
-        const ladderWithRank = viewerRanksService
-            .rankLadders
-            .find(l => l.ranks?.some(r => r.id === filterSettings.value));
-
-        const rank = ladderWithRank?.ranks?.find(r => r.id === filterSettings.value);
-
-        return rank ? `${rank?.name} (${ladderWithRank?.name})` : "Not set";
-    },
-
-    predicate: async (filterSettings, eventData) => {
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const { newRankId } = eventMeta;
-
-        const isRank = newRankId === value;
-
-        switch (comparisonType) {
-            case "is":
-                return isRank;
-            case "is not":
-                return !isRank;
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/previous-view-time.js b/src/backend/events/filters/builtin/previous-view-time.js
deleted file mode 100644
index 085dd5bf5..000000000
--- a/src/backend/events/filters/builtin/previous-view-time.js
+++ /dev/null
@@ -1,51 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:previous-view-time",
-    name: "Previous View Time",
-    description: "Filter a viewers previous view time (hours)",
-    events: [
-        { eventSourceId: "firebot", eventId: "view-time-update" }
-    ],
-    comparisonTypes: [
-        ComparisonType.IS,
-        ComparisonType.IS_NOT,
-        ComparisonType.LESS_THAN,
-        ComparisonType.LESS_THAN_OR_EQUAL_TO,
-        ComparisonType.GREATER_THAN,
-        ComparisonType.GREATER_THAN_OR_EQUAL_TO
-    ],
-    valueType: "number",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const previousViewTime = eventMeta.previousViewTime || 0;
-
-        switch (comparisonType) {
-            case ComparisonType.IS: {
-                return previousViewTime === value;
-            }
-            case ComparisonType.IS_NOT: {
-                return previousViewTime !== value;
-            }
-            case ComparisonType.LESS_THAN: {
-                return previousViewTime < value;
-            }
-            case ComparisonType.LESS_THAN_OR_EQUAL_TO: {
-                return previousViewTime <= value;
-            }
-            case ComparisonType.GREATER_THAN: {
-                return previousViewTime > value;
-            }
-            case ComparisonType.GREATER_THAN_OR_EQUAL_TO: {
-                return previousViewTime >= value;
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/raid-viewer-count.js b/src/backend/events/filters/builtin/raid-viewer-count.js
deleted file mode 100644
index 54f76457f..000000000
--- a/src/backend/events/filters/builtin/raid-viewer-count.js
+++ /dev/null
@@ -1,51 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:raid-viewer-count",
-    name: "Raid Viewer Count",
-    description: "Filter by how many viewers have been brought or are being sent over by the raid.",
-    events: [
-        { eventSourceId: "twitch", eventId: "raid" },
-        { eventSourceId: "twitch", eventId: "raid-sent-off" }
-    ],
-    comparisonTypes: [
-        ComparisonType.IS,
-        ComparisonType.IS_NOT,
-        ComparisonType.LESS_THAN,
-        ComparisonType.LESS_THAN_OR_EQUAL_TO,
-        ComparisonType.GREATER_THAN,
-        ComparisonType.GREATER_THAN_OR_EQUAL_TO
-    ],
-    valueType: "number",
-    predicate: (filterSettings, eventData) => {
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const raidViewerCount = eventMeta.viewerCount || 0;
-
-        switch (comparisonType) {
-            case ComparisonType.IS: {
-                return raidViewerCount === value;
-            }
-            case ComparisonType.IS_NOT: {
-                return raidViewerCount !== value;
-            }
-            case ComparisonType.LESS_THAN: {
-                return raidViewerCount < value;
-            }
-            case ComparisonType.LESS_THAN_OR_EQUAL_TO: {
-                return raidViewerCount <= value;
-            }
-            case ComparisonType.GREATER_THAN: {
-                return raidViewerCount > value;
-            }
-            case ComparisonType.GREATER_THAN_OR_EQUAL_TO: {
-                return raidViewerCount >= value;
-            }
-            default:
-                return false;
-        }
-    }
-};
diff --git a/src/backend/events/filters/builtin/rank-ladder.js b/src/backend/events/filters/builtin/rank-ladder.js
deleted file mode 100644
index 46d49ae44..000000000
--- a/src/backend/events/filters/builtin/rank-ladder.js
+++ /dev/null
@@ -1,43 +0,0 @@
-"use strict";
-
-module.exports = {
-    id: "firebot:rank-ladder",
-    name: "Rank Ladder",
-    description: "Filter to a given rank ladder",
-    events: [
-        { eventSourceId: "firebot", eventId: "viewer-rank-updated" }
-    ],
-    comparisonTypes: ["is", "is not"],
-    valueType: "preset",
-    presetValues: (viewerRanksService) => {
-        return viewerRanksService
-            .rankLadders
-            .map(l => ({value: l.id, display: l.name}));
-    },
-    valueIsStillValid: (filterSettings, viewerRanksService) => {
-        const ladder = viewerRanksService.getRankLadder(filterSettings.value);
-        return ladder != null;
-    },
-    getSelectedValueDisplay: (filterSettings, viewerRanksService) => {
-        const ladder = viewerRanksService.getRankLadder(filterSettings.value);
-        return ladder?.name ?? "Not set";
-    },
-
-    predicate: async (filterSettings, eventData) => {
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const {rankLadderId } = eventMeta;
-
-        const isLadder = rankLadderId === value;
-
-        switch (comparisonType) {
-            case "is":
-                return isLadder;
-            case "is not":
-                return !isLadder;
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/rank-transition-type.js b/src/backend/events/filters/builtin/rank-transition-type.js
deleted file mode 100644
index d34597253..000000000
--- a/src/backend/events/filters/builtin/rank-transition-type.js
+++ /dev/null
@@ -1,37 +0,0 @@
-"use strict";
-
-module.exports = {
-    id: "firebot:rank-transition-type",
-    name: "Rank Transition Type",
-    description: "Filter to a given rank transition type (promotion or demotion)",
-    events: [
-        { eventSourceId: "firebot", eventId: "viewer-rank-updated" }
-    ],
-    comparisonTypes: ["is"],
-    valueType: "preset",
-    presetValues: () => {
-        return [
-            { value: "Promotion", display: "Promotion" },
-            { value: "Demotion", display: "Demotion" }
-        ];
-    },
-    valueIsStillValid: () => {
-        return true;
-    },
-    getSelectedValueDisplay: (filterSettings) => {
-        return filterSettings.value;
-    },
-
-    predicate: async (filterSettings, eventData) => {
-        const { value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const { isPromotion, isDemotion } = eventMeta;
-
-        return value === "Promotion" ?
-            isPromotion :
-            value === "Demotion" ?
-                isDemotion :
-                false;
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/reward-name.js b/src/backend/events/filters/builtin/reward-name.js
deleted file mode 100644
index d5ab99891..000000000
--- a/src/backend/events/filters/builtin/reward-name.js
+++ /dev/null
@@ -1,38 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:reward-name",
-    name: "Reward Name",
-    description: "Filter to a Custom Channel Reward by Name",
-    events: [
-        { eventSourceId: "twitch", eventId: "channel-reward-redemption" }
-    ],
-    comparisonTypes: [ComparisonType.IS, ComparisonType.IS_NOT, ComparisonType.CONTAINS, ComparisonType.MATCHES_REGEX],
-    valueType: "text",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        // normalize
-        const actual = eventMeta.rewardName ? eventMeta.rewardName.toLowerCase() : "";
-        const expected = value ? value.toLowerCase() : "";
-
-        switch (comparisonType) {
-            case ComparisonType.IS:
-                return actual === expected;
-            case ComparisonType.IS_NOT:
-                return actual !== expected;
-            case ComparisonType.CONTAINS:
-                return actual.includes(expected);
-            case ComparisonType.MATCHES_REGEX: {
-                const regex = new RegExp(expected, "gi");
-                return regex.test(actual);
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/reward.js b/src/backend/events/filters/builtin/reward.js
deleted file mode 100644
index d268058c3..000000000
--- a/src/backend/events/filters/builtin/reward.js
+++ /dev/null
@@ -1,53 +0,0 @@
-"use strict";
-
-module.exports = {
-    id: "firebot:reward",
-    name: "Reward",
-    description: "Filter to a Custom Channel Reward",
-    events: [
-        { eventSourceId: "twitch", eventId: "channel-reward-redemption" }
-    ],
-    comparisonTypes: ["is", "is not"],
-    valueType: "preset",
-    presetValues: (backendCommunicator) => {
-        return backendCommunicator
-            .fireEventAsync("get-channel-rewards").then(rewards =>
-                rewards.map(r => ({value: r.id, display: r.twitchData.title})));
-    },
-    valueIsStillValid: (filterSettings, backendCommunicator) => {
-        return new Promise((resolve) => {
-            backendCommunicator
-                .fireEventAsync("get-channel-rewards").then((rewards) => {
-                    resolve(rewards.some(r => r.id === filterSettings.value));
-                });
-        });
-    },
-    getSelectedValueDisplay: (filterSettings, backendCommunicator) => {
-        return new Promise((resolve) => {
-            backendCommunicator
-                .fireEventAsync("get-channel-rewards").then((rewards) => {
-                    const reward = rewards.find(r => r.id === filterSettings.value);
-
-                    resolve(reward ? reward.twitchData.title : "Unknown Reward");
-                });
-        });
-    },
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        // normalize
-        const actual = eventMeta.rewardId;
-        const expected = value;
-
-        switch (comparisonType) {
-            case "is":
-                return actual === expected;
-            case "is not":
-                return actual !== expected;
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/shared-chat.ts b/src/backend/events/filters/builtin/shared-chat.ts
deleted file mode 100644
index 1c024746e..000000000
--- a/src/backend/events/filters/builtin/shared-chat.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { ComparisonType } from "../../../../shared/filter-constants";
-
-module.exports = {
-    id: "firebot:is-shared-chat-message",
-    name: "Shared Chat",
-    description: "Filter by whether the event was triggered by a shared chat message",
-    events: [
-        { eventSourceId: "twitch", eventId: "chat-message" },
-        { eventSourceId: "twitch", eventId: "announcement" },
-        { eventSourceId: "twitch", eventId: "first-time-chat" },
-        { eventSourceId: "twitch", eventId: "viewer-arrived" }
-    ],
-    comparisonTypes: [ComparisonType.IS],
-    valueType: "preset",
-    presetValues: () => {
-        return [
-            {
-                value: "true",
-                display: "True"
-            },
-            {
-                value: "false",
-                display: "False"
-            }
-        ];
-    },
-    getSelectedValueDisplay: (filterSettings) => {
-
-        if (filterSettings.value == null) {
-            return "False";
-        }
-
-        return filterSettings.value === "true" ? "True" : "False";
-    },
-    predicate: (filterSettings, eventData) => {
-
-        const { value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const isShared = eventMeta.chatMessage.isSharedChatMessage;
-
-        return value === "true" ? isShared : !isShared;
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/stream-category.js b/src/backend/events/filters/builtin/stream-category.js
deleted file mode 100644
index 39e893e40..000000000
--- a/src/backend/events/filters/builtin/stream-category.js
+++ /dev/null
@@ -1,37 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:category-changed",
-    name: "Category",
-    description: "The category that is currently selected to stream to.",
-    events: [
-        { eventSourceId: "firebot", eventId: "category-changed" },
-        { eventSourceId: "twitch", eventId: "category-changed" }
-    ],
-    comparisonTypes: [ComparisonType.IS, ComparisonType.IS_NOT, ComparisonType.CONTAINS, ComparisonType.MATCHES_REGEX],
-    valueType: "text",
-    predicate: (filterSettings, eventData) => {
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const eventCategory = eventMeta.category ? eventMeta.category.toLowerCase() : "";
-        const filterCategory = value ? value.toLowerCase() : "";
-
-        switch (comparisonType) {
-            case ComparisonType.IS:
-                return eventCategory === filterCategory;
-            case ComparisonType.IS_NOT:
-                return eventCategory !== filterCategory;
-            case ComparisonType.CONTAINS:
-                return eventCategory.includes(filterCategory);
-            case ComparisonType.MATCHES_REGEX: {
-                const regex = new RegExp(filterCategory, "gi");
-                return regex.test(eventCategory);
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/sub-kind.js b/src/backend/events/filters/builtin/sub-kind.js
deleted file mode 100644
index 41830b105..000000000
--- a/src/backend/events/filters/builtin/sub-kind.js
+++ /dev/null
@@ -1,50 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:sub-kind",
-    name: "Kind of Sub",
-    description: "Filter by the kind of sub (resub vs first sub)",
-    events: [
-        { eventSourceId: "twitch", eventId: "sub" }
-    ],
-    comparisonTypes: [ComparisonType.IS],
-    valueType: "preset",
-    presetValues: () => {
-        return [
-            {
-                value: "first",
-                display: "First Sub"
-            },
-            {
-                value: "resub",
-                display: "Resub"
-            }
-        ];
-    },
-    getSelectedValueDisplay: (filterSettings) => {
-        switch (filterSettings.value) {
-            case "first":
-                return "First Sub";
-            case "resub":
-                return "Resub";
-            default:
-                return "[Not set]";
-        }
-    },
-    predicate: (filterSettings, eventData) => {
-
-        const { value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        if (value == null) {
-            return true;
-        }
-
-        const isResub = eventMeta.isResub;
-        const expectingResub = value === 'resub';
-
-        return isResub === expectingResub;
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/sub-type.js b/src/backend/events/filters/builtin/sub-type.js
deleted file mode 100644
index 41e166fcb..000000000
--- a/src/backend/events/filters/builtin/sub-type.js
+++ /dev/null
@@ -1,71 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
-    id: "firebot:sub-type",
-    name: "Sub Tier",
-    description: "Filter by the tier of sub (Prime, Tier 1, 2, 3, etc)",
-    events: [
-        { eventSourceId: "twitch", eventId: "sub" },
-        { eventSourceId: "twitch", eventId: "subs-gifted" },
-        { eventSourceId: "twitch", eventId: "community-subs-gifted" },
-        { eventSourceId: "twitch", eventId: "prime-sub-upgraded" },
-        { eventSourceId: "twitch", eventId: "gift-sub-upgraded" }
-    ],
-    comparisonTypes: [ComparisonType.IS, ComparisonType.IS_NOT],
-    valueType: "preset",
-    presetValues: () => {
-        return [
-            {
-                value: "Prime",
-                display: "Prime"
-            },
-            {
-                value: "1000",
-                display: "Tier 1"
-            },
-            {
-                value: "2000",
-                display: "Tier 2"
-            },
-            {
-                value: "3000",
-                display: "Tier 3"
-            }
-        ];
-    },
-    getSelectedValueDisplay: (filterSettings) => {
-        switch (filterSettings.value) {
-            case "Prime":
-                return "Prime";
-            case "1000":
-                return "Tier 1";
-            case "2000":
-                return "Tier 2";
-            case "3000":
-                return "Tier 3";
-            default:
-                return "[Not set]";
-        }
-    },
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        if (value == null) {
-            return true;
-        }
-
-        const subPlan = eventMeta.subPlan;
-
-        if (comparisonType === ComparisonType.IS) {
-            return subPlan === value;
-        } else if (comparisonType === ComparisonType.IS_NOT) {
-            return subPlan !== value;
-        }
-
-        return true;
-    }
-};
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/third-party/donation-amount.ts b/src/backend/events/filters/builtin/third-party/donation-amount.ts
new file mode 100644
index 000000000..7b75224e6
--- /dev/null
+++ b/src/backend/events/filters/builtin/third-party/donation-amount.ts
@@ -0,0 +1,17 @@
+import { createNumberFilter } from "../../filter-factory";
+
+const filter = createNumberFilter({
+    id: "firebot:donation-amount",
+    name: "Donation Amount",
+    description: "Filter by the amount of donation from StreamLabs/Tipeee/ExtraLife",
+    eventMetaKey: "donationAmount",
+    events: [
+        { eventSourceId: "streamlabs", eventId: "donation" },
+        { eventSourceId: "streamlabs", eventId: "eldonation" },
+        { eventSourceId: "extralife", eventId: "donation" },
+        { eventSourceId: "tipeeestream", eventId: "donation" },
+        { eventSourceId: "streamelements", eventId: "donation" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/third-party/donation-from.ts b/src/backend/events/filters/builtin/third-party/donation-from.ts
new file mode 100644
index 000000000..48afb391a
--- /dev/null
+++ b/src/backend/events/filters/builtin/third-party/donation-from.ts
@@ -0,0 +1,18 @@
+import { createTextFilter } from "../../filter-factory";
+
+const filter = createTextFilter({
+    id: "firebot:donationfrom",
+    name: "Donation From",
+    caseInsensitive: true,
+    description: "Filter to a specific donation sender",
+    eventMetaKey: "from",
+    events: [
+        { eventSourceId: "streamlabs", eventId: "donation" },
+        { eventSourceId: "streamlabs", eventId: "eldonation" },
+        { eventSourceId: "extralife", eventId: "donation" },
+        { eventSourceId: "tipeeestream", eventId: "donation" },
+        { eventSourceId: "streamelements", eventId: "donation" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/third-party/index.ts b/src/backend/events/filters/builtin/third-party/index.ts
new file mode 100644
index 000000000..dc3adca25
--- /dev/null
+++ b/src/backend/events/filters/builtin/third-party/index.ts
@@ -0,0 +1,7 @@
+import donationAmount from "./donation-amount";
+import donationFrom from "./donation-from";
+
+export default [
+    donationAmount,
+    donationFrom
+];
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/bits-badge-tier.ts b/src/backend/events/filters/builtin/twitch/bits-badge-tier.ts
new file mode 100644
index 000000000..043daef5b
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/bits-badge-tier.ts
@@ -0,0 +1,13 @@
+import { createNumberFilter } from "../../filter-factory";
+
+const filter = createNumberFilter({
+    id: "firebot:bits-badge-tier",
+    name: "Bits Badge Tier",
+    description: "Filter by the tier of the bits badge that was unlocked (100, 1000, 5000, etc.)",
+    events: [
+        { eventSourceId: "twitch", eventId: "bits-badge-unlocked" }
+    ],
+    eventMetaKey: "badgeTier"
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/chat-mode-duration.ts b/src/backend/events/filters/builtin/twitch/chat-mode-duration.ts
new file mode 100644
index 000000000..f0b035453
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/chat-mode-duration.ts
@@ -0,0 +1,13 @@
+import { createNumberFilter } from "../../filter-factory";
+
+const filter = createNumberFilter({
+    id: "firebot:chatmodeduration",
+    name: "Duration",
+    description: "Filter by a chat mode's duration (only for Slow (seconds) and Follower (minutes))",
+    eventMetaKey: "duration",
+    events: [
+        { eventSourceId: "twitch", eventId: "chat-mode-changed" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/chat-mode-setting.ts b/src/backend/events/filters/builtin/twitch/chat-mode-setting.ts
new file mode 100644
index 000000000..bf4fb4e06
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/chat-mode-setting.ts
@@ -0,0 +1,23 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:chatmodesetting",
+    name: "Setting",
+    description: "Filter by a chat mode's setting",
+    events: [
+        { eventSourceId: "twitch", eventId: "chat-mode-changed" }
+    ],
+    eventMetaKey: "chatModeState",
+    presetValues: async () => [
+        {
+            value: "enabled",
+            display: "Enabled"
+        },
+        {
+            value: "disabled",
+            display: "Disabled"
+        }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/chat-mode.js b/src/backend/events/filters/builtin/twitch/chat-mode.ts
similarity index 57%
rename from src/backend/events/filters/builtin/chat-mode.js
rename to src/backend/events/filters/builtin/twitch/chat-mode.ts
index 2d1fef8d8..b68235302 100644
--- a/src/backend/events/filters/builtin/chat-mode.js
+++ b/src/backend/events/filters/builtin/twitch/chat-mode.ts
@@ -1,8 +1,7 @@
-"use strict";
+import { EventFilter } from "../../../../../types/events";
+import { ComparisonType } from "../../../../../shared/filter-constants";
 
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
+const filter: EventFilter = {
     id: "firebot:chatmode",
     name: "Chat Mode",
     description: "Filter by a chat mode",
@@ -11,7 +10,7 @@ module.exports = {
     ],
     comparisonTypes: [ComparisonType.IS, ComparisonType.IS_NOT],
     valueType: "preset",
-    presetValues: () => {
+    presetValues: async () => {
         return [
             {
                 value: "emoteonly",
@@ -35,34 +34,26 @@ module.exports = {
             }
         ];
     },
-    getSelectedValueDisplay: (filterSettings) => {
-        switch (filterSettings.value) {
-            case "emoteonly":
-                return "Emote Only";
-            case "followers":
-                return "Followers";
-            case "subscribers":
-                return "Subscribers Only";
-            case "slow":
-                return "Slow";
-            case "r9kbeta":
-                return "Unique Chat";
-            default:
-                return "[Not set]";
-        }
+    getSelectedValueDisplay: async (filterSettings) => {
+        return (await filter.presetValues())
+            .find(pv => pv.value === filterSettings.value)?.display ?? "[Not Set]";
     },
     predicate: async (filterSettings, eventData) => {
 
         const { comparisonType, value } = filterSettings;
         const { eventMeta } = eventData;
 
+        const chatModes = eventMeta.chatMode as string;
+
         switch (comparisonType) {
-            case "is":
-                return eventMeta.chatMode.includes(value);
-            case "is not":
-                return !eventMeta.chatMode.includes(value);
+            case ComparisonType.IS:
+                return chatModes.includes(value);
+            case ComparisonType.IS_NOT:
+                return !chatModes.includes(value);
             default:
                 return false;
         }
     }
-};
\ No newline at end of file
+};
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/cheer-bits-amount.ts b/src/backend/events/filters/builtin/twitch/cheer-bits-amount.ts
new file mode 100644
index 000000000..561aa92f0
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/cheer-bits-amount.ts
@@ -0,0 +1,13 @@
+import { createNumberFilter } from "../../filter-factory";
+
+const filter = createNumberFilter({
+    id: "firebot:cheerbitsamount",
+    name: "Cheer Bits Amount",
+    description: "Filter by the amount of bits in a Cheer",
+    eventMetaKey: "bits",
+    events: [
+        { eventSourceId: "twitch", eventId: "cheer" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/gift-count.ts b/src/backend/events/filters/builtin/twitch/gift-count.ts
new file mode 100644
index 000000000..991777a85
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/gift-count.ts
@@ -0,0 +1,13 @@
+import { createNumberFilter } from "../../filter-factory";
+
+const filter = createNumberFilter({
+    id: "firebot:gift-count",
+    name: "Gift Count",
+    description: "Filter by the number of subs gifted",
+    eventMetaKey: "subCount",
+    events: [
+        { eventSourceId: "twitch", eventId: "subs-gifted" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/gift-duration.ts b/src/backend/events/filters/builtin/twitch/gift-duration.ts
new file mode 100644
index 000000000..3f6f35928
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/gift-duration.ts
@@ -0,0 +1,13 @@
+import { createNumberFilter } from "../../filter-factory";
+
+const filter = createNumberFilter({
+    id: "firebot:gift-duration",
+    name: "Gift Duration",
+    description: "Filter by the duration of the gift sub (in months)",
+    eventMetaKey: "giftDuration",
+    events: [
+        { eventSourceId: "twitch", eventId: "subs-gifted" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/index.ts b/src/backend/events/filters/builtin/twitch/index.ts
new file mode 100644
index 000000000..543a436ba
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/index.ts
@@ -0,0 +1,37 @@
+import bitsBadgeTier from "./bits-badge-tier";
+import chatModeDuration from "./chat-mode-duration";
+import chatModeSetting from "./chat-mode-setting";
+import chatMode from "./chat-mode";
+import cheerBitsAmount from "./cheer-bits-amount";
+import giftCount from "./gift-count";
+import giftDuration from "./gift-duration";
+import isAnonymous from "./is-anonymous";
+import message from "./message";
+import raidViewerCount from "./raid-viewer-count";
+import rewardName from "./reward-name";
+import reward from "./reward";
+import sharedChat from "./shared-chat";
+import streamCategory from "./stream-category";
+import subKind from "./sub-kind";
+import subType from "./sub-type";
+import username from "./username";
+
+export default [
+    bitsBadgeTier,
+    chatModeDuration,
+    chatModeSetting,
+    chatMode,
+    cheerBitsAmount,
+    giftCount,
+    giftDuration,
+    isAnonymous,
+    message,
+    raidViewerCount,
+    rewardName,
+    reward,
+    sharedChat,
+    streamCategory,
+    subKind,
+    subType,
+    username
+];
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/is-anonymous.ts b/src/backend/events/filters/builtin/twitch/is-anonymous.ts
new file mode 100644
index 000000000..0f18ce4a4
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/is-anonymous.ts
@@ -0,0 +1,25 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:is-anonymous",
+    name: "Anonymous",
+    description: "Filter by whether the event was triggered by an anonymous user",
+    events: [
+        { eventSourceId: "twitch", eventId: "cheer" },
+        { eventSourceId: "twitch", eventId: "subs-gifted" },
+        { eventSourceId: "twitch", eventId: "community-subs-gifted" }
+    ],
+    eventMetaKey: "isAnonymous",
+    presetValues: async () => [
+        {
+            value: "true",
+            display: "True"
+        },
+        {
+            value: "false",
+            display: "False"
+        }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/message.ts b/src/backend/events/filters/builtin/twitch/message.ts
new file mode 100644
index 000000000..a28860932
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/message.ts
@@ -0,0 +1,14 @@
+import { createTextFilter } from "../../filter-factory";
+
+const filter = createTextFilter({
+    id: "firebot:message-text",
+    name: "Message Text",
+    description: "Filter based on chat message text",
+    eventMetaKey: "messageText",
+    events: [
+        { eventSourceId: "twitch", eventId: "chat-message" },
+        { eventSourceId: "twitch", eventId: "announcement" }
+    ]
+});
+
+export default filter;
diff --git a/src/backend/events/filters/builtin/twitch/raid-viewer-count.ts b/src/backend/events/filters/builtin/twitch/raid-viewer-count.ts
new file mode 100644
index 000000000..1131b4afb
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/raid-viewer-count.ts
@@ -0,0 +1,14 @@
+import { createNumberFilter } from "../../filter-factory";
+
+const filter = createNumberFilter({
+    id: "firebot:raid-viewer-count",
+    name: "Raid Viewer Count",
+    description: "Filter by how many viewers have been brought or are being sent over by the raid",
+    eventMetaKey: "viewerCount",
+    events: [
+        { eventSourceId: "twitch", eventId: "raid" },
+        { eventSourceId: "twitch", eventId: "raid-sent-off" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/reward-name.ts b/src/backend/events/filters/builtin/twitch/reward-name.ts
new file mode 100644
index 000000000..8b72a4b93
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/reward-name.ts
@@ -0,0 +1,14 @@
+import { createTextFilter } from "../../filter-factory";
+
+const filter = createTextFilter({
+    id: "firebot:reward-name",
+    name: "Reward Name",
+    caseInsensitive: true,
+    description: "Filter to a Custom Channel Reward by Name",
+    eventMetaKey: "rewardName",
+    events: [
+        { eventSourceId: "twitch", eventId: "channel-reward-redemption" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/reward.ts b/src/backend/events/filters/builtin/twitch/reward.ts
new file mode 100644
index 000000000..f34ebff6e
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/reward.ts
@@ -0,0 +1,22 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:reward",
+    name: "Reward",
+    description: "Filter to a Custom Channel Reward",
+    events: [
+        { eventSourceId: "twitch", eventId: "channel-reward-redemption" }
+    ],
+    eventMetaKey: "rewardId",
+    allowIsNot: true,
+    presetValues: async (backendCommunicator: any) => {
+        const rewards = await backendCommunicator.fireEventAsync("get-channel-rewards");
+        return rewards.map(r => ({value: r.id, display: r.twitchData.title}));
+    },
+    valueIsStillValid: async (filterSettings, backendCommunicator: any) => {
+        const rewards = await backendCommunicator.fireEventAsync("get-channel-rewards");
+        return rewards.some(r => r.id === filterSettings.value);
+    }
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/shared-chat.ts b/src/backend/events/filters/builtin/twitch/shared-chat.ts
new file mode 100644
index 000000000..a96c4b6a7
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/shared-chat.ts
@@ -0,0 +1,26 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:is-shared-chat-message",
+    name: "Shared Chat",
+    description: "Filter by whether the event was triggered by a shared chat message",
+    events: [
+        { eventSourceId: "twitch", eventId: "chat-message" },
+        { eventSourceId: "twitch", eventId: "announcement" },
+        { eventSourceId: "twitch", eventId: "first-time-chat" },
+        { eventSourceId: "twitch", eventId: "viewer-arrived" }
+    ],
+    eventMetaKey: "chatMessage.isSharedChatMessage",
+    presetValues: async () => [
+        {
+            value: "true",
+            display: "True"
+        },
+        {
+            value: "false",
+            display: "False"
+        }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/stream-category.ts b/src/backend/events/filters/builtin/twitch/stream-category.ts
new file mode 100644
index 000000000..fe420565b
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/stream-category.ts
@@ -0,0 +1,15 @@
+import { createTextFilter } from "../../filter-factory";
+
+const filter = createTextFilter({
+    id: "firebot:category-changed",
+    name: "Category",
+    caseInsensitive: true,
+    description: "The category that is currently selected to stream to.",
+    eventMetaKey: "category",
+    events: [
+        { eventSourceId: "firebot", eventId: "category-changed" },
+        { eventSourceId: "twitch", eventId: "category-changed" }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/sub-kind.ts b/src/backend/events/filters/builtin/twitch/sub-kind.ts
new file mode 100644
index 000000000..265750193
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/sub-kind.ts
@@ -0,0 +1,23 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:sub-kind",
+    name: "Kind of Sub",
+    description: "Filter by the kind of sub (resub vs first sub)",
+    events: [
+        { eventSourceId: "twitch", eventId: "sub" }
+    ],
+    eventMetaKey: "isResub",
+    presetValues: () => [
+        {
+            value: "first",
+            display: "First Sub"
+        },
+        {
+            value: "resub",
+            display: "Resub"
+        }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/twitch/sub-type.ts b/src/backend/events/filters/builtin/twitch/sub-type.ts
new file mode 100644
index 000000000..8985a1642
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/sub-type.ts
@@ -0,0 +1,35 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:sub-type",
+    name: "Sub Tier",
+    description: "Filter by the tier of sub (Prime, Tier 1, 2, 3, etc)",
+    events: [
+        { eventSourceId: "twitch", eventId: "sub" },
+        { eventSourceId: "twitch", eventId: "subs-gifted" },
+        { eventSourceId: "twitch", eventId: "community-subs-gifted" },
+        { eventSourceId: "twitch", eventId: "prime-sub-upgraded" },
+        { eventSourceId: "twitch", eventId: "gift-sub-upgraded" }
+    ],
+    eventMetaKey: "subPlan",
+    presetValues: () => [
+        {
+            value: "Prime",
+            display: "Prime"
+        },
+        {
+            value: "1000",
+            display: "Tier 1"
+        },
+        {
+            value: "2000",
+            display: "Tier 2"
+        },
+        {
+            value: "3000",
+            display: "Tier 3"
+        }
+    ]
+});
+
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/builtin/username.js b/src/backend/events/filters/builtin/twitch/username.ts
similarity index 56%
rename from src/backend/events/filters/builtin/username.js
rename to src/backend/events/filters/builtin/twitch/username.ts
index e1792582b..2019d2a8f 100644
--- a/src/backend/events/filters/builtin/username.js
+++ b/src/backend/events/filters/builtin/twitch/username.ts
@@ -1,11 +1,11 @@
-"use strict";
+import { createTextFilter } from "../../filter-factory";
 
-const { ComparisonType } = require("../../../../shared/filter-constants");
-
-module.exports = {
+const filter = createTextFilter({
     id: "firebot:username",
     name: "Username",
+    caseInsensitive: true,
     description: "Filter to a specific username",
+    eventMetaKey: "username",
     events: [
         { eventSourceId: "twitch", eventId: "cheer" },
         { eventSourceId: "twitch", eventId: "bits-badge-unlocked" },
@@ -29,31 +29,7 @@ module.exports = {
         { eventSourceId: "streamloots", eventId: "purchase" },
         { eventSourceId: "streamloots", eventId: "redemption" },
         { eventSourceId: "streamlabs", eventId: "follow" }
-    ],
-    comparisonTypes: [ComparisonType.IS, ComparisonType.IS_NOT, ComparisonType.CONTAINS, ComparisonType.MATCHES_REGEX],
-    valueType: "text",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        // normalize usernames
-        const eventUsername = eventMeta.username ? eventMeta.username.toLowerCase() : "";
-        const filterUsername = value ? value.toLowerCase() : "";
+    ]
+});
 
-        switch (comparisonType) {
-            case ComparisonType.IS:
-                return eventUsername === filterUsername;
-            case ComparisonType.IS_NOT:
-                return eventUsername !== filterUsername;
-            case ComparisonType.CONTAINS:
-                return eventUsername.includes(filterUsername);
-            case ComparisonType.MATCHES_REGEX: {
-                const regex = new RegExp(filterUsername, "gi");
-                return regex.test(eventUsername);
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
+export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/filter-factory.ts b/src/backend/events/filters/filter-factory.ts
index 7242a8b77..25143e4d1 100644
--- a/src/backend/events/filters/filter-factory.ts
+++ b/src/backend/events/filters/filter-factory.ts
@@ -1,34 +1,65 @@
-import { EventFilter } from "../../../types/events";
+import { EventFilter, FilterSettings, PresetValue } from "../../../types/events";
 import { ComparisonType } from "../../../shared/filter-constants";
+import { extractPropertyWithPath } from "../../utility";
+import { auto } from "angular";
+
+type EventData = {
+    eventSourceId: string;
+    eventId: string;
+    eventMeta: Record<string, unknown>;
+}
+
+type FilterEvent = Omit<EventData, "eventMeta">;
 
 type FilterConfig = {
     id: string;
     name: string;
     description: string;
-    events: Array<{
-        eventSourceId: string;
-        eventId: string;
-    }>;
-    eventMetaKey: string;
+    events: Array<FilterEvent>;
+    eventMetaKey: string | ((eventData: EventData, filterSettings: FilterSettings) => string);
     caseInsensitive?: boolean;
 };
 
+type PresetFilterConfig = FilterConfig & {
+    presetValues: (...args: unknown[]) => Promise<PresetValue[]> | PresetValue[];
+    valueIsStillValid?(filterSettings: FilterSettings, ...args: unknown[]): Promise<boolean> | boolean;
+    getSelectedValueDisplay?(filterSettings: FilterSettings, ...args: unknown[]): Promise<string> | string;
+    allowIsNot?: boolean;
+}
+
 const TEXT_COMPARISON_TYPES = [
     ComparisonType.IS,
     ComparisonType.IS_NOT,
     ComparisonType.CONTAINS,
-    ComparisonType.MATCHES_REGEX
+    ComparisonType.DOESNT_CONTAIN,
+    ComparisonType.STARTS_WITH,
+    ComparisonType.DOESNT_STARTS_WITH,
+    ComparisonType.ENDS_WITH,
+    ComparisonType.DOESNT_END_WITH,
+    ComparisonType.MATCHES_REGEX_CS,
+    ComparisonType.DOESNT_MATCH_REGEX_CS,
+    ComparisonType.MATCHES_REGEX,
+    ComparisonType.DOESNT_MATCH_REGEX
 ];
 
-const NUMBER_COMPARISON_TYPES = [
-    ComparisonType.IS,
-    ComparisonType.IS_NOT,
+const NUMBER_UNIQUE_COMPARISON_TYPES = [
     ComparisonType.LESS_THAN,
     ComparisonType.LESS_THAN_OR_EQUAL_TO,
     ComparisonType.GREATER_THAN,
     ComparisonType.GREATER_THAN_OR_EQUAL_TO
 ];
 
+const NUMBER_COMPARISON_TYPES = [
+    ComparisonType.IS,
+    ComparisonType.IS_NOT,
+    ...NUMBER_UNIQUE_COMPARISON_TYPES
+];
+
+const NUMBER_TEXT_COMPARISON_TYPES = [
+    ...TEXT_COMPARISON_TYPES,
+    ...NUMBER_UNIQUE_COMPARISON_TYPES
+];
+
 
 function compareValue(
     comparisonType: ComparisonType,
@@ -40,6 +71,18 @@ function compareValue(
             return actualValue === expectedValue;
         case ComparisonType.IS_NOT:
             return actualValue !== expectedValue;
+        case ComparisonType.CONTAINS:
+            return actualValue?.toString().includes(expectedValue?.toString() ?? "");
+        case ComparisonType.DOESNT_CONTAIN:
+            return !actualValue?.toString().includes(expectedValue?.toString() ?? "");
+        case ComparisonType.STARTS_WITH:
+            return actualValue?.toString().startsWith(expectedValue?.toString() ?? "");
+        case ComparisonType.DOESNT_STARTS_WITH:
+            return !actualValue?.toString().startsWith(expectedValue?.toString() ?? "");
+        case ComparisonType.ENDS_WITH:
+            return actualValue?.toString().endsWith(expectedValue?.toString() ?? "");
+        case ComparisonType.DOESNT_END_WITH:
+            return !actualValue?.toString().endsWith(expectedValue?.toString() ?? "");
         case ComparisonType.LESS_THAN:
             return actualValue < expectedValue;
         case ComparisonType.LESS_THAN_OR_EQUAL_TO:
@@ -48,23 +91,39 @@ function compareValue(
             return actualValue > expectedValue;
         case ComparisonType.GREATER_THAN_OR_EQUAL_TO:
             return actualValue >= expectedValue;
-        case ComparisonType.CONTAINS:
-            return actualValue?.toString().includes(expectedValue?.toString() ?? "");
         case ComparisonType.MATCHES_REGEX: {
             const regex = new RegExp(expectedValue?.toString() ?? "", "gi");
             return regex.test(actualValue?.toString() ?? "");
         }
+        case ComparisonType.DOESNT_MATCH_REGEX: {
+            const regex = new RegExp(expectedValue?.toString() ?? "", "gi");
+            return !regex.test(actualValue?.toString() ?? "");
+        }
+        case ComparisonType.MATCHES_REGEX_CS: {
+            const regex = new RegExp(expectedValue?.toString() ?? "", "g");
+            return regex.test(actualValue?.toString() ?? "");
+        }
+        case ComparisonType.DOESNT_MATCH_REGEX_CS: {
+            const regex = new RegExp(expectedValue?.toString() ?? "", "g");
+            return !regex.test(actualValue?.toString() ?? "");
+        }
         default:
             return false;
     }
 }
 
+function getMetaKey(eventMetaKey: FilterConfig["eventMetaKey"], event: EventData, filter: FilterSettings): string {
+    if (typeof eventMetaKey === "function") {
+        return eventMetaKey(event, filter);
+    }
+    return eventMetaKey;
+}
 
 export function createTextFilter({
     eventMetaKey,
     caseInsensitive,
     ...config
-}: FilterConfig): Omit<EventFilter, "presetValues"> {
+}: Omit<FilterConfig, "presetValues" | "allowIsNot">): Omit<EventFilter, "presetValues"> {
     return {
         ...config,
         comparisonTypes: TEXT_COMPARISON_TYPES,
@@ -73,7 +132,7 @@ export function createTextFilter({
             const { comparisonType, value } = filterSettings;
             const { eventMeta } = eventData;
 
-            let eventValue = eventMeta[eventMetaKey] ?? "";
+            let eventValue = extractPropertyWithPath(eventMeta, getMetaKey(eventMetaKey, eventData, filterSettings)) ?? "";
             if (caseInsensitive) {
                 eventValue = eventValue.toString().toLowerCase();
             }
@@ -88,7 +147,7 @@ export function createTextFilter({
 export function createNumberFilter({
     eventMetaKey,
     ...config
-}: Omit<FilterConfig, "caseInsensitive">): Omit<EventFilter, "presetValues" | "valueType"> & {
+}: Omit<FilterConfig, "caseInsensitive" | "presetValues" | "allowIsNot">): Omit<EventFilter, "presetValues" | "valueType"> & {
         valueType: "number";
     } {
     return {
@@ -99,7 +158,7 @@ export function createNumberFilter({
             const { comparisonType, value } = filterSettings;
             const { eventMeta } = eventData;
 
-            const eventValue = eventMeta[eventMetaKey] ?? 0;
+            const eventValue = extractPropertyWithPath(eventMeta, getMetaKey(eventMetaKey, eventData, filterSettings)) ?? 0;
 
             return compareValue(comparisonType, value, eventValue);
         }
@@ -108,20 +167,64 @@ export function createNumberFilter({
 
 export function createTextOrNumberFilter({
     eventMetaKey,
+    caseInsensitive,
     ...config
-}: Omit<FilterConfig, "caseInsensitive">): Omit<EventFilter, "presetValues"> {
+}: Omit<FilterConfig, "presetValues" | "allowIsNot">): Omit<EventFilter, "presetValues"> {
     return {
         ...config,
-        comparisonTypes: [...TEXT_COMPARISON_TYPES, ...NUMBER_COMPARISON_TYPES],
+        comparisonTypes: NUMBER_TEXT_COMPARISON_TYPES,
         valueType: "text",
         async predicate(filterSettings, eventData) {
-            const { comparisonType, value: filterValue } = filterSettings;
+            const { comparisonType, value } = filterSettings;
             const { eventMeta } = eventData;
 
-            const eventValue = eventMeta[eventMetaKey] ?? "";
-
+            let eventValue = extractPropertyWithPath(eventMeta, getMetaKey(eventMetaKey, eventData, filterSettings)) ?? "";
+            if (caseInsensitive) {
+                eventValue = eventValue.toString().toLowerCase();
+            }
+            const filterValue =
+        (caseInsensitive ? value?.toString()?.toLowerCase() : value) ?? "";
             return compareValue(comparisonType, filterValue, eventValue);
         }
     };
 }
 
+export function createPresetFilter({
+    eventMetaKey,
+    presetValues,
+    getSelectedValueDisplay,
+    valueIsStillValid,
+    allowIsNot = false,
+    ...config
+}: Omit<PresetFilterConfig, "caseInsensitive">): EventFilter {
+    const comparisonTypes: ComparisonType[] = [ComparisonType.IS];
+    if (allowIsNot) {
+        comparisonTypes.push(ComparisonType.IS_NOT);
+    }
+
+    const valueDisplay = getSelectedValueDisplay ?? (async (filterSettings, $injector: auto.IInjectorService) => {
+        return (await $injector.invoke(presetValues, {}, {}))
+            .find(pv => pv.value === filterSettings.value)?.display ?? "[Not Set]";
+    });
+
+    return {
+        ...config,
+        comparisonTypes,
+        valueType: "preset",
+        presetValues,
+        getSelectedValueDisplay: valueDisplay,
+        valueIsStillValid,
+        async predicate(filterSettings, eventData) {
+            const { value, comparisonType } = filterSettings;
+            const { eventMeta } = eventData;
+
+            const data = extractPropertyWithPath(eventMeta, getMetaKey(eventMetaKey, eventData, filterSettings));
+
+            const output = data === value ||
+                (data === true && value === "true") ||
+                (data === false && value === "false");
+
+            return comparisonType === ComparisonType.IS ? output : !output;
+        }
+    };
+}
diff --git a/src/backend/integrations/builtin/obs/filters/group-name-filter.ts b/src/backend/integrations/builtin/obs/filters/group-name-filter.ts
index 4d080111a..ffde89d81 100644
--- a/src/backend/integrations/builtin/obs/filters/group-name-filter.ts
+++ b/src/backend/integrations/builtin/obs/filters/group-name-filter.ts
@@ -1,41 +1,28 @@
+import { createPresetFilter } from "../../../../events/filters/filter-factory";
 import { EventFilter } from "../../../../../types/events";
 import {
     OBS_EVENT_SOURCE_ID,
     OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID
 } from "../constants";
 
-export const GroupNameEventFilter: EventFilter = {
+const filter: EventFilter = createPresetFilter({
     id: "ebiggz:obs-group-name",
     name: "Group Name",
+    description: "Filter on the name of the group owning the item that triggered the event",
     events: [
         { eventSourceId: OBS_EVENT_SOURCE_ID, eventId: OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID }
     ],
-    description: "Filter on the name of the group owning the item that triggered the event",
-    valueType: "preset",
-    comparisonTypes: ["is", "is not"],
-    presetValues: (backendCommunicator, $q) => {
-        return $q
-            .when(backendCommunicator.fireEvents("obs-get-group-list"))
-            .then((groups: string[]) =>
-                groups.map((g) => {
-                    return {
-                        value: g,
-                        display: g
-                    };
-                })
-            );
-    },
-    predicate: async ({ comparisonType, value }, { eventMeta }) => {
-        const expected = value;
-        const actual = eventMeta.groupName;
-
-        switch (comparisonType) {
-            case "is":
-                return actual === expected;
-            case "is not":
-                return actual !== expected;
-            default:
-                return false;
-        }
+    eventMetaKey: "groupName",
+    allowIsNot: true,
+    presetValues: async (backendCommunicator: any) => {
+        const groups: string[] = backendCommunicator.fireEventSync("obs-get-group-list");
+        return groups.map((g) => {
+            return {
+                value: g,
+                display: g
+            };
+        });
     }
-};
+});
+
+export default filter;
diff --git a/src/backend/integrations/builtin/obs/filters/scene-name-filter.ts b/src/backend/integrations/builtin/obs/filters/scene-name-filter.ts
index aff418905..7a8ab41ca 100644
--- a/src/backend/integrations/builtin/obs/filters/scene-name-filter.ts
+++ b/src/backend/integrations/builtin/obs/filters/scene-name-filter.ts
@@ -1,3 +1,4 @@
+import { createPresetFilter } from "../../../../events/filters/filter-factory";
 import { EventFilter } from "../../../../../types/events";
 import {
     OBS_EVENT_SOURCE_ID,
@@ -5,39 +6,25 @@ import {
     OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID
 } from "../constants";
 
-export const SceneNameEventFilter: EventFilter = {
+const filter: EventFilter = createPresetFilter({
     id: "ebiggz:obs-scene-name",
     name: "Scene Name",
+    description: "Filter on the name of the now active OBS scene",
     events: [
         { eventSourceId: OBS_EVENT_SOURCE_ID, eventId: OBS_SCENE_CHANGED_EVENT_ID },
         { eventSourceId: OBS_EVENT_SOURCE_ID, eventId: OBS_SCENE_ITEM_ENABLE_STATE_CHANGED_EVENT_ID }
     ],
-    description: "Filter on the name of the now active OBS scene",
-    valueType: "preset",
-    comparisonTypes: ["is", "is not"],
-    presetValues: (backendCommunicator: any, $q) => {
-        return $q
-            .when(backendCommunicator.fireEventAsync("obs-get-scene-list"))
-            .then((scenes: string[]) =>
-                scenes.map((s) => {
-                    return {
-                        value: s,
-                        display: s
-                    };
-                })
-            );
-    },
-    predicate: async ({ comparisonType, value }, { eventMeta }) => {
-        const expected = value;
-        const actual = eventMeta.sceneName;
-
-        switch (comparisonType) {
-            case "is":
-                return actual === expected;
-            case "is not":
-                return actual !== expected;
-            default:
-                return false;
-        }
+    eventMetaKey: "sceneName",
+    allowIsNot: true,
+    presetValues: async (backendCommunicator: any) => {
+        const scenes: string[] = await backendCommunicator.fireEventAsync("obs-get-scene-list");
+        return scenes.map((s) => {
+            return {
+                value: s,
+                display: s
+            };
+        });
     }
-};
+});
+
+export default filter;
diff --git a/src/backend/integrations/builtin/obs/obs-integration.ts b/src/backend/integrations/builtin/obs/obs-integration.ts
index 671c43834..ffe8bc14e 100644
--- a/src/backend/integrations/builtin/obs/obs-integration.ts
+++ b/src/backend/integrations/builtin/obs/obs-integration.ts
@@ -39,8 +39,8 @@ import { TakeOBSSourceScreenshotEffectType } from "./effects/take-obs-source-scr
 
 import { OBSEventSource } from "./events/obs-event-source";
 
-import { GroupNameEventFilter } from "./filters/group-name-filter";
-import { SceneNameEventFilter } from "./filters/scene-name-filter";
+import GroupNameEventFilter from "./filters/group-name-filter";
+import SceneNameEventFilter from "./filters/scene-name-filter";
 
 import { SceneNameVariable } from "./variables/scene-name-variable";
 import { SceneCollectionNameVariable } from "./variables/scene-collection-name";
diff --git a/src/backend/integrations/builtin/streamloots/filters/card-name.js b/src/backend/integrations/builtin/streamloots/filters/card-name.js
deleted file mode 100644
index 95dfba2ec..000000000
--- a/src/backend/integrations/builtin/streamloots/filters/card-name.js
+++ /dev/null
@@ -1,44 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../../shared/filter-constants");
-
-module.exports = {
-    id: "streamloots:card-name",
-    name: "Card Name",
-    description: "Filter by StreamLoots Card name",
-    events: [
-        { eventSourceId: "streamloots", eventId: "redemption" }
-    ],
-    comparisonTypes: [ComparisonType.IS, ComparisonType.IS_NOT, ComparisonType.CONTAINS, ComparisonType.MATCHES_REGEX],
-    valueType: "text",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        let cardName = eventMeta.cardName;
-
-        if (!cardName) {
-            return false;
-        }
-
-        cardName = cardName.toLowerCase();
-
-        const filterCardName = value && value.toLowerCase();
-
-        switch (comparisonType) {
-            case ComparisonType.IS:
-                return cardName === filterCardName;
-            case ComparisonType.IS_NOT:
-                return cardName !== filterCardName;
-            case ComparisonType.CONTAINS:
-                return cardName.includes(filterCardName);
-            case ComparisonType.MATCHES_REGEX: {
-                const regex = new RegExp(filterCardName, "gi");
-                return regex.test(cardName);
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/integrations/builtin/streamloots/filters/card-name.ts b/src/backend/integrations/builtin/streamloots/filters/card-name.ts
new file mode 100644
index 000000000..8e072b3f1
--- /dev/null
+++ b/src/backend/integrations/builtin/streamloots/filters/card-name.ts
@@ -0,0 +1,14 @@
+import { createTextFilter } from "../../../../events/filters/filter-factory";
+
+const filter = createTextFilter({
+    id: "streamloots:card-name",
+    name: "Card Name",
+    description: "Filter by StreamLoots Card name",
+    events: [
+        { eventSourceId: "streamloots", eventId: "redemption" }
+    ],
+    eventMetaKey: "cardName",
+    caseInsensitive: true
+});
+
+module.exports = filter;
\ No newline at end of file
diff --git a/src/backend/integrations/builtin/streamloots/filters/card-rarity.js b/src/backend/integrations/builtin/streamloots/filters/card-rarity.js
deleted file mode 100644
index de2c69d74..000000000
--- a/src/backend/integrations/builtin/streamloots/filters/card-rarity.js
+++ /dev/null
@@ -1,58 +0,0 @@
-"use strict";
-
-const { ComparisonType } = require("../../../../../shared/filter-constants");
-
-module.exports = {
-    id: "streamloots:card-rarity",
-    name: "Card Rarity",
-    description: "Filter by the rarity of redeemed Streamloots Cards",
-    events: [
-        { eventSourceId: "streamloots", eventId: "redemption" }
-    ],
-    comparisonTypes: [ComparisonType.IS, ComparisonType.IS_NOT],
-    valueType: "preset",
-    presetValues: async () => {
-        return [
-            {
-                value: "common",
-                display: "Common"
-            },
-            {
-                value: "rare",
-                display: "Rare"
-            },
-            {
-                value: "epic",
-                display: "Epic"
-            },
-            {
-                value: "legendary",
-                display: "Legendary"
-            }
-        ];
-    },
-    getSelectedValueDisplay: (filterSettings) => {
-
-        const capitalize = ([first, ...rest]) =>
-            first.toUpperCase() + rest.join("").toLowerCase();
-
-        if (filterSettings.value == null) {
-            return "[Not set]";
-        }
-
-        return capitalize(filterSettings.value);
-    },
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const cardRarity = eventMeta.cardRarity;
-
-        if (!cardRarity) {
-            return false;
-        }
-
-        return comparisonType === ComparisonType.IS ? value === cardRarity : value !== cardRarity;
-    }
-};
\ No newline at end of file
diff --git a/src/backend/integrations/builtin/streamloots/filters/card-rarity.ts b/src/backend/integrations/builtin/streamloots/filters/card-rarity.ts
new file mode 100644
index 000000000..1ecba36c0
--- /dev/null
+++ b/src/backend/integrations/builtin/streamloots/filters/card-rarity.ts
@@ -0,0 +1,34 @@
+import { createPresetFilter } from "../../../../events/filters/filter-factory";
+
+const filter = createPresetFilter({
+    id: "streamloots:card-rarity",
+    name: "Card Rarity",
+    description: "Filter by the rarity of redeemed Streamloots Cards",
+    events: [
+        { eventSourceId: "streamloots", eventId: "redemption" }
+    ],
+    eventMetaKey: "cardRarity",
+    allowIsNot: true,
+    presetValues: async () => {
+        return [
+            {
+                value: "common",
+                display: "Common"
+            },
+            {
+                value: "rare",
+                display: "Rare"
+            },
+            {
+                value: "epic",
+                display: "Epic"
+            },
+            {
+                value: "legendary",
+                display: "Legendary"
+            }
+        ];
+    }
+});
+
+module.exports = filter;
\ No newline at end of file
diff --git a/src/backend/integrations/builtin/streamloots/filters/chest-gift.js b/src/backend/integrations/builtin/streamloots/filters/chest-gift.ts
similarity index 90%
rename from src/backend/integrations/builtin/streamloots/filters/chest-gift.js
rename to src/backend/integrations/builtin/streamloots/filters/chest-gift.ts
index f0f47bb7a..1657b9f71 100644
--- a/src/backend/integrations/builtin/streamloots/filters/chest-gift.js
+++ b/src/backend/integrations/builtin/streamloots/filters/chest-gift.ts
@@ -1,8 +1,8 @@
-"use strict";
+import { EventFilter } from "../../../../../types/events";
 
 const { ComparisonType } = require("../../../../../shared/filter-constants");
 
-module.exports = {
+const filter: EventFilter = {
     id: "streamloots:gift-purchase",
     name: "Chest Purchase",
     description: "Filter by whether or not the StreamLoots chest purchase was a gift.",
@@ -42,4 +42,6 @@ module.exports = {
 
         return filterGiftValue === isGift;
     }
-};
\ No newline at end of file
+};
+
+module.exports = filter;
\ No newline at end of file
diff --git a/src/backend/integrations/builtin/streamloots/filters/chest-quantity.js b/src/backend/integrations/builtin/streamloots/filters/chest-quantity.js
deleted file mode 100644
index ffffb518e..000000000
--- a/src/backend/integrations/builtin/streamloots/filters/chest-quantity.js
+++ /dev/null
@@ -1,40 +0,0 @@
-"use strict";
-
-module.exports = {
-    id: "streamloots:chest-quantity",
-    name: "Chest Quantity",
-    description: "Filter by the number of StreamLoots chests purchased/gifted.",
-    events: [
-        { eventSourceId: "streamloots", eventId: "purchase" }
-    ],
-    comparisonTypes: ["is", "is not", "less than", "greater than"],
-    valueType: "number",
-    predicate: (filterSettings, eventData) => {
-
-        const { comparisonType, value } = filterSettings;
-        const { eventMeta } = eventData;
-
-        const quantity = eventMeta.quantity;
-
-        if (quantity === undefined || quantity === null) {
-            return false;
-        }
-
-        switch (comparisonType) {
-            case "is": {
-                return quantity === value;
-            }
-            case "is not": {
-                return quantity !== value;
-            }
-            case "less than": {
-                return quantity < value;
-            }
-            case "greater than": {
-                return quantity > value;
-            }
-            default:
-                return false;
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/backend/integrations/builtin/streamloots/filters/chest-quantity.ts b/src/backend/integrations/builtin/streamloots/filters/chest-quantity.ts
new file mode 100644
index 000000000..72769eb27
--- /dev/null
+++ b/src/backend/integrations/builtin/streamloots/filters/chest-quantity.ts
@@ -0,0 +1,13 @@
+import { createNumberFilter } from "../../../../events/filters/filter-factory";
+
+const filter = createNumberFilter({
+    id: "streamloots:chest-quantity",
+    name: "Chest Quantity",
+    description: "Filter by the number of StreamLoots chests purchased/gifted.",
+    events: [
+        { eventSourceId: "streamloots", eventId: "purchase" }
+    ],
+    eventMetaKey: "quantity"
+});
+
+module.exports = filter;
\ No newline at end of file
diff --git a/src/backend/utility.js b/src/backend/utility.js
index fb4879286..ebc72b54d 100644
--- a/src/backend/utility.js
+++ b/src/backend/utility.js
@@ -63,18 +63,16 @@ const secondsForHumans = (seconds) => {
             continue;
         }
         returntext +=
-      ` ${
-          levels[i][0]
-      } ${
-          levels[i][0] === 1
-              ? levels[i][1].substr(0, levels[i][1].length - 1)
-              : levels[i][1]}`;
+            ` ${levels[i][0]
+            } ${levels[i][0] === 1
+                ? levels[i][1].substr(0, levels[i][1].length - 1)
+                : levels[i][1]}`;
     }
     return returntext.trim();
 };
 
 const formattedSeconds = (secs, simpleOutput = false) => {
-    const duration = Duration.fromDurationLike({ seconds: Math.round(secs)}).rescale();
+    const duration = Duration.fromDurationLike({ seconds: Math.round(secs) }).rescale();
 
     if (simpleOutput === true) {
         if (simpleOutput) {
@@ -295,6 +293,29 @@ const findIndexIgnoreCase = (array, element) => {
     return -1;
 };
 
+/**
+ * extract a property from an object using a dot-notation property path
+ * @param {Object} obj input object
+ * @param {string} path dot-notation based property path
+ * @param {*} defaultValue default value if no value exists at the specified path
+ * @returns {*|undefined} value at path, defaultValue or undefined
+ */
+const extractPropertyWithPath = (obj, path, defaultValue = undefined) => {
+    const propertyPath = path.split("");
+    let data = structuredClone(obj);
+    try {
+        for (const item of propertyPath) {
+            if (data === undefined) {
+                return defaultValue;
+            }
+            data = data[item];
+        }
+        return data ?? defaultValue;
+    } catch (_) {
+        return defaultValue;
+    }
+};
+
 exports.getRandomInt = getRandomInt;
 exports.escapeRegExp = escapeRegExp;
 exports.getUrlRegex = getUrlRegex;
@@ -316,3 +337,4 @@ exports.deepClone = deepClone;
 exports.deepFreeze = deepFreeze;
 exports.emptyFolder = emptyFolder;
 exports.findIndexIgnoreCase = findIndexIgnoreCase;
+exports.extractPropertyWithPath = extractPropertyWithPath;
diff --git a/src/types/events.d.ts b/src/types/events.d.ts
index 37fe5c417..42e147877 100644
--- a/src/types/events.d.ts
+++ b/src/types/events.d.ts
@@ -1,3 +1,5 @@
+import { ComparisonType } from "src/shared/filter-constants";
+
 export type EventSource = {
     id: string;
     name: string;
@@ -10,6 +12,16 @@ export type EventSource = {
     }>;
 };
 
+export type PresetValue = {
+    value: any;
+    display: string;
+}
+
+export type FilterSettings = {
+    comparisonType: ComparisonType;
+    value: any;
+};
+
 export type EventFilter = {
     id: string;
     name: string;
@@ -20,13 +32,15 @@ export type EventFilter = {
     }>;
     comparisonTypes: string[];
     valueType: "text" | "preset";
-    presetValues(...args: any[]): Promise<unknown[]>;
+    presetValues?(...args: unknown[]): Promise<PresetValue[]> | PresetValue[];
+    valueIsStillValid?(filterSettings: FilterSettings, ...args: unknown[]): Promise<boolean> | boolean;
+    getSelectedValueDisplay?(filterSettings: FilterSettings, ...args: unknown[]): Promise<string> | string;
     predicate(
-        filterSettings: { comparisonType: string; value: any },
+        filterSettings: FilterSettings,
         eventData: {
             eventSourceId: string;
             eventId: string;
-            eventMeta: Record<string, any>;
+            eventMeta: Record<string, unknown>;
         }
-    ): Promise<boolean>;
+    ): Promise<boolean> | boolean;
 };
\ No newline at end of file

From deebcd46125efca6340499b33edf83209df1cdac Mon Sep 17 00:00:00 2001
From: CKY <xx_cky_xx@hotmail.com>
Date: Sun, 8 Dec 2024 17:36:43 -0700
Subject: [PATCH 18/54] fix: added donationAmount to donation services  (#2917)

* fix: command cooldown

* fix: added missing donationAmount to donation services

---------

Co-authored-by: Erik Bigler <erikbigler@gmail.com>
---
 src/backend/integrations/builtin/extralife/extralife.js         | 1 +
 .../builtin/streamelements/streamelements-event-handler.js      | 1 +
 .../integrations/builtin/streamelements/streamelements.js       | 2 +-
 .../builtin/streamlabs/events/streamlabs-event-handler.js       | 2 ++
 src/backend/integrations/builtin/streamlabs/streamlabs.js       | 2 +-
 .../builtin/tipeeestream/events/tipeeestream-event-handler.js   | 1 +
 src/backend/integrations/builtin/tipeeestream/tipeeestream.js   | 2 +-
 7 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/backend/integrations/builtin/extralife/extralife.js b/src/backend/integrations/builtin/extralife/extralife.js
index 17d9b0d31..aa83c36fa 100644
--- a/src/backend/integrations/builtin/extralife/extralife.js
+++ b/src/backend/integrations/builtin/extralife/extralife.js
@@ -39,6 +39,7 @@ class ExtraLifeIntegration extends EventEmitter {
                     manualMetadata: {
                         from: "ExtraLife",
                         formattedDonationAmount: 5,
+                        donationAmount: 5,
                         donationMessage: "Test message"
                     },
                     isIntegration: true,
diff --git a/src/backend/integrations/builtin/streamelements/streamelements-event-handler.js b/src/backend/integrations/builtin/streamelements/streamelements-event-handler.js
index 0528b1ffc..2474187fe 100644
--- a/src/backend/integrations/builtin/streamelements/streamelements-event-handler.js
+++ b/src/backend/integrations/builtin/streamelements/streamelements-event-handler.js
@@ -21,6 +21,7 @@ const eventSourceDefinition = {
             manualMetadata: {
                 from: "StreamElements",
                 donationAmount: 5,
+                formattedDonationAmount: 5,
                 donationMessage: "Test message"
             },
             isIntegration: true,
diff --git a/src/backend/integrations/builtin/streamelements/streamelements.js b/src/backend/integrations/builtin/streamelements/streamelements.js
index e516a96ec..9b47bfa8a 100644
--- a/src/backend/integrations/builtin/streamelements/streamelements.js
+++ b/src/backend/integrations/builtin/streamelements/streamelements.js
@@ -65,7 +65,7 @@ class StreamElementsIntegration extends EventEmitter {
             this.reconnect();
         });
 
-        this._socket.on('disconnect', reason => {
+        this._socket.on('disconnect', (reason) => {
             this.disconnect();
 
             if (reason !== "io client disconnect") {
diff --git a/src/backend/integrations/builtin/streamlabs/events/streamlabs-event-handler.js b/src/backend/integrations/builtin/streamlabs/events/streamlabs-event-handler.js
index 2164a0021..be9f09ec6 100644
--- a/src/backend/integrations/builtin/streamlabs/events/streamlabs-event-handler.js
+++ b/src/backend/integrations/builtin/streamlabs/events/streamlabs-event-handler.js
@@ -22,6 +22,7 @@ const eventSourceDefinition = {
             manualMetadata: {
                 from: "StreamLabs",
                 formattedDonationAmount: 5,
+                donationAmount: 5,
                 donationMessage: "Test message"
             },
             isIntegration: true,
@@ -41,6 +42,7 @@ const eventSourceDefinition = {
             manualMetadata: {
                 from: "Extra Life",
                 formattedDonationAmount: 5,
+                donationAmount: 5,
                 donationMessage: "Test message"
             },
             isIntegration: true,
diff --git a/src/backend/integrations/builtin/streamlabs/streamlabs.js b/src/backend/integrations/builtin/streamlabs/streamlabs.js
index 04d6b2ce5..8a70792c8 100644
--- a/src/backend/integrations/builtin/streamlabs/streamlabs.js
+++ b/src/backend/integrations/builtin/streamlabs/streamlabs.js
@@ -77,7 +77,7 @@ class StreamlabsIntegration extends EventEmitter {
             }
         );
 
-        this._socket.on("event", eventData => {
+        this._socket.on("event", (eventData) => {
             slEventHandler.processStreamLabsEvent(eventData);
         });
 
diff --git a/src/backend/integrations/builtin/tipeeestream/events/tipeeestream-event-handler.js b/src/backend/integrations/builtin/tipeeestream/events/tipeeestream-event-handler.js
index 53cc322c5..f6061b2d3 100644
--- a/src/backend/integrations/builtin/tipeeestream/events/tipeeestream-event-handler.js
+++ b/src/backend/integrations/builtin/tipeeestream/events/tipeeestream-event-handler.js
@@ -21,6 +21,7 @@ const eventSourceDefinition = {
             manualMetadata: {
                 from: "TipeeeStream",
                 formattedDonationAmount: 5,
+                donationAmount: 5,
                 donationMessage: "Test message"
             },
             isIntegration: true,
diff --git a/src/backend/integrations/builtin/tipeeestream/tipeeestream.js b/src/backend/integrations/builtin/tipeeestream/tipeeestream.js
index 5fe641966..21fe06266 100644
--- a/src/backend/integrations/builtin/tipeeestream/tipeeestream.js
+++ b/src/backend/integrations/builtin/tipeeestream/tipeeestream.js
@@ -112,7 +112,7 @@ class TipeeeStreamIntegration extends EventEmitter {
             this.emit("disconnected", integrationDefinition.id);
         });
 
-        this._socket.on("new-event", data => {
+        this._socket.on("new-event", (data) => {
             const eventData = data.event;
             tsEventHandler.processTipeeeStreamEvent(eventData);
         });

From 0be074a1afcae761ea65b767c7e3e17ef6e4ebb3 Mon Sep 17 00:00:00 2001
From: CKY <xx_cky_xx@hotmail.com>
Date: Sun, 8 Dec 2024 17:40:04 -0700
Subject: [PATCH 19/54] fix: obs change scene var menu and rotation var menu
 (#2918)

* fix: command cooldown

* fix:vars menu in obs-change-scene effect

* fix:rotation variable menu

---------

Co-authored-by: Erik Bigler <erikbigler@gmail.com>
---
 .../builtin/obs/effects/change-scene-effect-type.ts           | 4 ++--
 .../directives/effect-option-settings/eosOverlayRotation.js   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/backend/integrations/builtin/obs/effects/change-scene-effect-type.ts b/src/backend/integrations/builtin/obs/effects/change-scene-effect-type.ts
index 61a030f72..39a4f1e41 100644
--- a/src/backend/integrations/builtin/obs/effects/change-scene-effect-type.ts
+++ b/src/backend/integrations/builtin/obs/effects/change-scene-effect-type.ts
@@ -27,7 +27,7 @@ export const ChangeSceneEffectType: EffectType<{
         </ui-select>
 
         <div ng-show="effect.custom === true" style="margin-top:10px;">
-            <firebot-input input-title="Custom Scene" model="effect.sceneName"></firebot-input>
+            <firebot-input input-title="Custom Scene" model="effect.sceneName" menu-position="under"></firebot-input>
         </div>
     </eos-container>
   `,
@@ -52,7 +52,7 @@ export const ChangeSceneEffectType: EffectType<{
                 (scenes: string[]) => {
                     $scope.scenes = [];
                     if (scenes != null) {
-                        scenes.forEach(scene => {
+                        scenes.forEach((scene) => {
                             $scope.scenes.push({name: scene, custom: false});
                         });
                     }
diff --git a/src/gui/app/directives/effect-option-settings/eosOverlayRotation.js b/src/gui/app/directives/effect-option-settings/eosOverlayRotation.js
index 5cdcce7f3..e1b0a2f31 100644
--- a/src/gui/app/directives/effect-option-settings/eosOverlayRotation.js
+++ b/src/gui/app/directives/effect-option-settings/eosOverlayRotation.js
@@ -17,6 +17,7 @@
                         model="$ctrl.effect.rotation"
                         placeholder-text="Enter rotation"
                         data-type="number"
+                        menu-position="under"
                     />
                     <dropdown-select 
                         style="margin: 0 0 0 10px;"

From e331f4227fc326c07892b80f6359e3a5046eb016 Mon Sep 17 00:00:00 2001
From: CKY <xx_cky_xx@hotmail.com>
Date: Sun, 8 Dec 2024 17:40:41 -0700
Subject: [PATCH 20/54] fix: channelGoalCurrentAmount follower (#2919)

Co-authored-by: Erik Bigler <erikbigler@gmail.com>
---
 src/types/goals.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/goals.ts b/src/types/goals.ts
index 4622b2714..a2ace6b20 100644
--- a/src/types/goals.ts
+++ b/src/types/goals.ts
@@ -1,5 +1,5 @@
 export enum TwitchGoalTypes {
-    follow = "follow",
+    follow = "follower",
     sub = "subscription_count",
     subpoint = "subscription",
     newsub = "new_subscription_count",

From b7ad251fa6ef71fba568745f19e3d302143b21f4 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Sun, 8 Dec 2024 22:09:39 -0500
Subject: [PATCH 21/54] feat: add protocol deep links for trigger pages

---
 .../electron/events/open-url.js               | 11 ++++
 src/gui/app/directives/sidebar/sidebar.js     |  4 +-
 src/gui/app/lang/locale-en.json               |  3 +-
 .../app/services/sidebar-manager.service.js   | 65 ++++++++++++++++++-
 4 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/src/backend/app-management/electron/events/open-url.js b/src/backend/app-management/electron/events/open-url.js
index 4968c880e..097214f2c 100644
--- a/src/backend/app-management/electron/events/open-url.js
+++ b/src/backend/app-management/electron/events/open-url.js
@@ -34,6 +34,17 @@ exports.openUrl = async (event, url) => {
             }
             break;
 
+        case "dashboard":
+        case "commands":
+        case "events":
+        case "time-based":
+        case "channel-rewards":
+        case "preset-effect-lists":
+        case "hotkeys":
+        case "counters":
+            frontendCommunicator.send("navigate", urlParams[0]);
+            break;
+
         default:
             logger.debug("No matching URL commands found");
             break;
diff --git a/src/gui/app/directives/sidebar/sidebar.js b/src/gui/app/directives/sidebar/sidebar.js
index 7b11e9c39..48477f0ec 100644
--- a/src/gui/app/directives/sidebar/sidebar.js
+++ b/src/gui/app/directives/sidebar/sidebar.js
@@ -24,7 +24,7 @@
                             <nav-link page="Channel Rewards" name="{{'SIDEBAR.OTHER.CHANNELREWARDS' | translate }}" icon="fa-gifts"></nav-link>
                             <nav-link page="Preset Effect Lists" name="{{ 'SIDEBAR.OTHER.PRESET_EFFECT_LISTS' | translate }}" icon="fa-magic"></nav-link>
                             <nav-link page="Hotkeys" name="{{'SIDEBAR.OTHER.HOTKEYS' | translate }}" icon="fa-keyboard"></nav-link>
-                            <nav-link page="Counters" name="Counters" icon="fa-tally"></nav-link>
+                            <nav-link page="Counters" name="{{'SIDEBAR.OTHER.COUNTERS' | translate }}" icon="fa-tally"></nav-link>
 
                             <div ng-if="$ctrl.extensionPages().length">
                                 <nav-category name="Custom" pad-top="true"></nav-category>
@@ -127,7 +127,7 @@
 
             ctrl.isViewerDBOn = settingsService.getViewerDB;
 
-            ctrl.extensionPages = () => uiExtensionsService.extensions.map(e => e.pages.map(p => {
+            ctrl.extensionPages = () => uiExtensionsService.extensions.map(e => e.pages.map((p) => {
                 p.extensionId = e.id;
                 return p;
             })).flat();
diff --git a/src/gui/app/lang/locale-en.json b/src/gui/app/lang/locale-en.json
index 8e8bf6dea..8829b12a9 100644
--- a/src/gui/app/lang/locale-en.json
+++ b/src/gui/app/lang/locale-en.json
@@ -16,7 +16,8 @@
       "EFFECT_QUEUES": "Effect Queues",
       "TIME_BASED": "Time-Based",
       "HOTKEYS": "Hotkeys",
-      "CHANNELREWARDS": "Channel Rewards"
+      "CHANNELREWARDS": "Channel Rewards",
+      "COUNTERS": "Counters"
     },
     "MANAGEMENT": {
       "MANAGEMENT": "Management",
diff --git a/src/gui/app/services/sidebar-manager.service.js b/src/gui/app/services/sidebar-manager.service.js
index fbcef239e..a62fa358c 100644
--- a/src/gui/app/services/sidebar-manager.service.js
+++ b/src/gui/app/services/sidebar-manager.service.js
@@ -3,7 +3,7 @@
 (function() {
     angular
         .module("firebotApp")
-        .factory("sidebarManager", function($timeout, $rootScope, settingsService, uiExtensionsService) {
+        .factory("sidebarManager", function($timeout, $rootScope, $location, $translate, settingsService, uiExtensionsService, backendCommunicator) {
             const service = {};
 
             service.navExpanded = settingsService.getSidebarExpanded();
@@ -87,6 +87,69 @@
                 ].includes(service.currentTab.toLowerCase());
             };
 
+            backendCommunicator.on("navigate", (tabId) => {
+                switch (tabId) {
+                    case "dashboard":
+                        $translate("SIDEBAR.CHAT.CHAT_FEED").then((tabName) => {
+                            service.setTab("chat feed", tabName);
+                            $location.path("/chat-feed");
+                        });
+                        break;
+
+                    case "commands":
+                        $translate("SIDEBAR.CHAT.COMMANDS").then((tabName) => {
+                            service.setTab("commands", tabName);
+                            $location.path("/commands");
+                        });
+                        break;
+
+                    case "events":
+                        $translate("SIDEBAR.OTHER.EVENTS").then((tabName) => {
+                            service.setTab("events", tabName);
+                            $location.path("/events");
+                        });
+                        break;
+
+                    case "time-based":
+                        $translate("SIDEBAR.OTHER.TIME_BASED").then((tabName) => {
+                            service.setTab("timers", tabName);
+                            $location.path("/timers");
+                        });
+                        break;
+
+                    case "channel-rewards":
+                        $translate("SIDEBAR.OTHER.CHANNELREWARDS").then((tabName) => {
+                            service.setTab("channel rewards", tabName);
+                            $location.path("/channel-rewards");
+                        });
+                        break;
+
+                    case "preset-effect-lists":
+                        $translate("SIDEBAR.OTHER.PRESET_EFFECT_LISTS").then((tabName) => {
+                            service.setTab("preset effect lists", tabName);
+                            $location.path("/preset-effect-lists");
+                        });
+                        break;
+
+                    case "hotkeys":
+                        $translate("SIDEBAR.OTHER.HOTKEYS").then((tabName) => {
+                            service.setTab("hotkeys", tabName);
+                            $location.path("/hotkeys");
+                        });
+                        break;
+
+                    case "counters":
+                        $translate("SIDEBAR.OTHER.COUNTERS").then((tabName) => {
+                            service.setTab("counters", tabName);
+                            $location.path("/counters");
+                        });
+                        break;
+
+                    default:
+                        break;
+                }
+            });
+
             return service;
         });
 

From cb066d28fa38e8578b2bf9f4dd3cc16babe1a56e Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Mon, 9 Dec 2024 12:20:44 -0500
Subject: [PATCH 22/54] fix: uuid fixes

---
 src/backend/effects/builtin/play-video.js         | 2 +-
 src/gui/app/directives/controls/firebot-input.js  | 2 +-
 src/gui/app/directives/controls/firebot-select.js | 2 +-
 src/gui/app/services/video.service.js             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/effects/builtin/play-video.js b/src/backend/effects/builtin/play-video.js
index 8df8498ac..73cff0c06 100644
--- a/src/backend/effects/builtin/play-video.js
+++ b/src/backend/effects/builtin/play-video.js
@@ -13,7 +13,7 @@ const path = require("path");
 const frontendCommunicator = require('../../common/frontend-communicator');
 const { wait } = require("../../utility");
 const { parseYoutubeId } = require("../../../shared/youtube-url-parser");
-const uuid = require("uuid");
+const { v4: uuid } = require("uuid");
 
 /**
  * The Play Video effect
diff --git a/src/gui/app/directives/controls/firebot-input.js b/src/gui/app/directives/controls/firebot-input.js
index 5d4970c1c..9363496f7 100644
--- a/src/gui/app/directives/controls/firebot-input.js
+++ b/src/gui/app/directives/controls/firebot-input.js
@@ -1,7 +1,7 @@
 "use strict";
 
 (function () {
-    const uuid = require("uuid");
+    const { v4: uuid } = require("uuid");
 
     angular.module("firebotApp").component("firebotInput", {
         bindings: {
diff --git a/src/gui/app/directives/controls/firebot-select.js b/src/gui/app/directives/controls/firebot-select.js
index cf33d150e..521bfc734 100644
--- a/src/gui/app/directives/controls/firebot-select.js
+++ b/src/gui/app/directives/controls/firebot-select.js
@@ -2,7 +2,7 @@
 
 (function () {
 
-    const uuid = require("uuid");
+    const { v4: uuid } = require("uuid");
 
     const firebotSelectComponent = {
         bindings: {
diff --git a/src/gui/app/services/video.service.js b/src/gui/app/services/video.service.js
index 57d30802a..c000b9404 100644
--- a/src/gui/app/services/video.service.js
+++ b/src/gui/app/services/video.service.js
@@ -2,7 +2,7 @@
 
 (function() {
 
-    const uuid = require("uuid");
+    const { v4: uuid } = require("uuid");
 
     // This provides methods for playing sounds
 

From 814a203866252f51df84a399a955a935a3eaadca Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Mon, 9 Dec 2024 22:00:59 -0500
Subject: [PATCH 23/54] fix: couple more UUID fixes

---
 src/backend/effects/builtin/play-sound.js | 8 ++++----
 src/backend/effects/builtin/play-video.js | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/backend/effects/builtin/play-sound.js b/src/backend/effects/builtin/play-sound.js
index 29e894b68..d5fde51cd 100644
--- a/src/backend/effects/builtin/play-sound.js
+++ b/src/backend/effects/builtin/play-sound.js
@@ -211,7 +211,7 @@ const playSound = {
 
                 // Generate UUID to use as class name.
                 // eslint-disable-next-line no-undef
-                const uuid = uuid();
+                const elementId = uuid();
 
                 const filepath = data.isUrl ? data.url : data.filepath.toLowerCase();
                 let mediaType;
@@ -227,18 +227,18 @@ const playSound = {
                     mediaType = "audio/flac";
                 }
 
-                const audioElement = `<audio id="${uuid}" src="${data.isUrl ? data.url : resourcePath}" type="${mediaType}"></audio>`;
+                const audioElement = `<audio id="${elementId}" src="${data.isUrl ? data.url : resourcePath}" type="${mediaType}"></audio>`;
 
                 // Throw audio element on page.
                 $("#wrapper").append(audioElement);
 
-                const audio = document.getElementById(uuid);
+                const audio = document.getElementById(elementId);
                 audio.volume = parseFloat(data.volume) / 10;
 
                 audio.oncanplay = () => audio.play();
 
                 audio.onended = () => {
-                    $(`#${uuid}`).remove();
+                    $(`#${elementId}`).remove();
                 };
             }
         }
diff --git a/src/backend/effects/builtin/play-video.js b/src/backend/effects/builtin/play-video.js
index 73cff0c06..2e4bef5a1 100644
--- a/src/backend/effects/builtin/play-video.js
+++ b/src/backend/effects/builtin/play-video.js
@@ -672,8 +672,8 @@ const playVideo = {
 
                 // Generate UUID to use as id
                 // eslint-disable-next-line no-undef
-                const uuid = uuid();
-                const videoPlayerId = `${uuid}-video`;
+                const elementId = uuid();
+                const videoPlayerId = `${elementId}-video`;
 
                 const enterAnimation = data.enterAnimation ? data.enterAnimation : "fadeIn";
                 const exitAnimation = data.exitAnimation ? data.exitAnimation : "fadeIn";

From ada9abaca87435575dcec19e1f1247450f25c0f2 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Tue, 10 Dec 2024 14:28:30 -0500
Subject: [PATCH 24/54] chore: update GitHub artifat actions

---
 .github/workflows/compile-and-release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/compile-and-release.yml b/.github/workflows/compile-and-release.yml
index a351094a7..b2d8929a9 100644
--- a/.github/workflows/compile-and-release.yml
+++ b/.github/workflows/compile-and-release.yml
@@ -106,7 +106,7 @@ jobs:
         run: grunt build
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ runner.os }}
           path: ./dist/install/${{ runner.os == 'macOS' && 'darwin' || runner.os }}/
@@ -118,7 +118,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download Compilation Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ./bundles/
 

From ea51ce5ef9164267c4ce836c9e2b030df865b381 Mon Sep 17 00:00:00 2001
From: CKY- <xx_cky_xx@hotmail.com>
Date: Wed, 11 Dec 2024 19:30:08 -0700
Subject: [PATCH 25/54] fix:split typo in filters

---
 src/backend/utility.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/utility.js b/src/backend/utility.js
index ebc72b54d..f8741c916 100644
--- a/src/backend/utility.js
+++ b/src/backend/utility.js
@@ -301,7 +301,7 @@ const findIndexIgnoreCase = (array, element) => {
  * @returns {*|undefined} value at path, defaultValue or undefined
  */
 const extractPropertyWithPath = (obj, path, defaultValue = undefined) => {
-    const propertyPath = path.split("");
+    const propertyPath = path.split(".");
     let data = structuredClone(obj);
     try {
         for (const item of propertyPath) {

From d8f0979d5ac16ba69852a04d90505eb50ae09eba Mon Sep 17 00:00:00 2001
From: phroggster <phroggster@users.noreply.github.com>
Date: Sun, 15 Dec 2024 00:42:45 -0600
Subject: [PATCH 26/54] chore: Hide Deprecated Variables

- These were marked deprecated back in January, 2024.
- They still function like they had, they just won't show up in the
  variables list drop-down.
- Correct, or better specify, result data typings for deprecated vars:
  - `$rawBitsLeaderboard`
  - `$rawCustomRoleUsers`
  - `$rawTopBitsCheerers`
  - `$rawUsernameArray`
  - `$rawUserRoles`
- And fix two minor misspellings:
  - `$rawArrayFilter`: twitch -> which
  - `$rawBitsLeaderBoard`: $bitsLoaderboard -> $bitsLeaderboard
---
 src/backend/variables/builtin/array/raw-array-filter.ts      | 5 +++--
 src/backend/variables/builtin/metadata/arg-array-raw.ts      | 3 ++-
 src/backend/variables/builtin/misc/quote-as-raw-object.ts    | 3 ++-
 .../variables/builtin/twitch/cheer/bits-leaderboard-raw.ts   | 5 +++--
 .../variables/builtin/twitch/cheer/bits-top-cheerers-raw.ts  | 3 ++-
 .../variables/builtin/user/roles/custom-role-users-raw.ts    | 3 ++-
 src/backend/variables/builtin/user/roles/user-roles-raw.ts   | 3 ++-
 src/backend/variables/builtin/user/user-id-name.ts           | 3 ++-
 src/backend/variables/builtin/user/username-array-raw.ts     | 3 ++-
 9 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/backend/variables/builtin/array/raw-array-filter.ts b/src/backend/variables/builtin/array/raw-array-filter.ts
index 3057070fb..f95a60f61 100644
--- a/src/backend/variables/builtin/array/raw-array-filter.ts
+++ b/src/backend/variables/builtin/array/raw-array-filter.ts
@@ -19,12 +19,13 @@ const model : ReplaceVariable = {
             },
             {
                 usage: 'rawArrayFilter[rawArray, value, key, true]',
-                description: 'Filter out any item in the array that has a key property twitch equals "value"'
+                description: 'Filter out any item in the array that has a key property which equals "value"'
             }
         ],
 
         categories: [VariableCategory.ADVANCED],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.TEXT],
+        hidden: true
     },
     evaluator: arrayFilter.evaluator
 };
diff --git a/src/backend/variables/builtin/metadata/arg-array-raw.ts b/src/backend/variables/builtin/metadata/arg-array-raw.ts
index 404b9a3a3..3cb86c08e 100644
--- a/src/backend/variables/builtin/metadata/arg-array-raw.ts
+++ b/src/backend/variables/builtin/metadata/arg-array-raw.ts
@@ -13,7 +13,8 @@ const model : ReplaceVariable = {
         description: "(Deprecated: use $argArray) Returns the raw array of command arguments",
         triggers: triggers,
         categories: [VariableCategory.ADVANCED],
-        possibleDataOutput: [OutputDataType.ARRAY]
+        possibleDataOutput: [OutputDataType.ARRAY],
+        hidden: true
     },
     evaluator: (trigger: Trigger) : string[] => {
         return trigger.metadata.userCommand ? trigger.metadata.userCommand.args : [];
diff --git a/src/backend/variables/builtin/misc/quote-as-raw-object.ts b/src/backend/variables/builtin/misc/quote-as-raw-object.ts
index 90bd13186..35c42de8c 100644
--- a/src/backend/variables/builtin/misc/quote-as-raw-object.ts
+++ b/src/backend/variables/builtin/misc/quote-as-raw-object.ts
@@ -25,7 +25,8 @@ const model : ReplaceVariable = {
             }
         ],
         categories: [VariableCategory.TEXT],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.TEXT],
+        hidden: true
     },
     evaluator: async (_, quoteId: number, property) => {
         const quoteCommand = commandManager.getSystemCommandById("firebot:quotesmanagement");
diff --git a/src/backend/variables/builtin/twitch/cheer/bits-leaderboard-raw.ts b/src/backend/variables/builtin/twitch/cheer/bits-leaderboard-raw.ts
index f24505d26..63463f945 100644
--- a/src/backend/variables/builtin/twitch/cheer/bits-leaderboard-raw.ts
+++ b/src/backend/variables/builtin/twitch/cheer/bits-leaderboard-raw.ts
@@ -6,7 +6,7 @@ import bitsLeaderboard from './bits-leaderboard';
 const model : ReplaceVariable = {
     definition: {
         handle: "rawBitsLeaderboard",
-        description: "(Deprecated: use $bitsLoaderboard) Returns a raw array of the all-time bits leaderboard of the streamer's channel, up to the specified count. Each item in the array has a `username` and `amount` property",
+        description: "(Deprecated: use $bitsLeaderboard) Returns a raw array of the all-time bits leaderboard of the streamer's channel, up to the specified count. Each item in the array has a `username` and `amount` property",
         usage: "rawBitsLeaderboard[count]",
         examples: [
             {
@@ -19,7 +19,8 @@ const model : ReplaceVariable = {
             }
         ],
         categories: [VariableCategory.COMMON, VariableCategory.ADVANCED],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.ARRAY],
+        hidden: true
     },
     evaluator: bitsLeaderboard.evaluator,
     argsCheck: bitsLeaderboard.argsCheck
diff --git a/src/backend/variables/builtin/twitch/cheer/bits-top-cheerers-raw.ts b/src/backend/variables/builtin/twitch/cheer/bits-top-cheerers-raw.ts
index 84d2d64a6..99a42e7c6 100644
--- a/src/backend/variables/builtin/twitch/cheer/bits-top-cheerers-raw.ts
+++ b/src/backend/variables/builtin/twitch/cheer/bits-top-cheerers-raw.ts
@@ -22,7 +22,8 @@ const model : ReplaceVariable = {
             }
         ],
         categories: [VariableCategory.COMMON, VariableCategory.USER],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.ARRAY],
+        hidden: true
     },
     argsCheck: topBitsCheerers.argsCheck,
     evaluator: topBitsCheerers.evaluator
diff --git a/src/backend/variables/builtin/user/roles/custom-role-users-raw.ts b/src/backend/variables/builtin/user/roles/custom-role-users-raw.ts
index e391daf88..299705fef 100644
--- a/src/backend/variables/builtin/user/roles/custom-role-users-raw.ts
+++ b/src/backend/variables/builtin/user/roles/custom-role-users-raw.ts
@@ -9,7 +9,8 @@ const model : ReplaceVariable = {
         usage: "rawCustomRoleUsers[role]",
         description: "(Deprecated: use $customRoleUsers) Returns an array of all the users in the specified custom role.",
         categories: [VariableCategory.USER],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.ARRAY],
+        hidden: true
     },
     evaluator: customRoleUsers.evaluator
 };
diff --git a/src/backend/variables/builtin/user/roles/user-roles-raw.ts b/src/backend/variables/builtin/user/roles/user-roles-raw.ts
index 6efd7565d..8fca9465f 100644
--- a/src/backend/variables/builtin/user/roles/user-roles-raw.ts
+++ b/src/backend/variables/builtin/user/roles/user-roles-raw.ts
@@ -40,7 +40,8 @@ const model : ReplaceVariable = {
             }
         ],
         categories: [VariableCategory.COMMON, VariableCategory.USER],
-        possibleDataOutput: [OutputDataType.ALL]
+        possibleDataOutput: [OutputDataType.ARRAY],
+        hidden: true
     },
     evaluator: userRoles.evaluator
 };
diff --git a/src/backend/variables/builtin/user/user-id-name.ts b/src/backend/variables/builtin/user/user-id-name.ts
index bdbbdae31..1536d3eda 100644
--- a/src/backend/variables/builtin/user/user-id-name.ts
+++ b/src/backend/variables/builtin/user/user-id-name.ts
@@ -18,7 +18,8 @@ const model : ReplaceVariable = {
         handle: "useridname",
         description: "(Deprecated: Use $user or $username) The associated underlying user identifying name for the given trigger.",
         triggers: triggers,
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.TEXT],
+        hidden: true
     },
     evaluator: user.evaluator
 };
diff --git a/src/backend/variables/builtin/user/username-array-raw.ts b/src/backend/variables/builtin/user/username-array-raw.ts
index afc2f7961..168d01a88 100644
--- a/src/backend/variables/builtin/user/username-array-raw.ts
+++ b/src/backend/variables/builtin/user/username-array-raw.ts
@@ -8,7 +8,8 @@ const model : ReplaceVariable = {
         handle: "rawUsernameArray",
         description: "(Deprecated: use $usernameArray) Returns a raw array of all usernames saved in the user db",
         categories: [VariableCategory.ADVANCED],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.ARRAY],
+        hidden: true
     },
     evaluator: usernameArray.evaluator
 };

From d22cd47418d42a20199f7f1254af48662e11d5bf Mon Sep 17 00:00:00 2001
From: phroggster <phroggster@users.noreply.github.com>
Date: Sun, 15 Dec 2024 01:10:16 -0600
Subject: [PATCH 27/54] fix: Some More Vars Data Typings

- Update several variable descriptions to be more consistent, and
  address a couple of misspellings.
- Correct/better-specify result data typings for variables:
  - `$bitsLeaderboard`
  - `$rawGiftReceivers`
  - `$rawTopCurrency`
  - `$rawTopMetadata`
  - `$rawTopViewTime`
  - `$subNames`
  - `$topBitsCheerers`
  - `$usernameArray`
  - `$userRoles`
---
 src/backend/variables/builtin/array/array-filter.ts         | 2 +-
 src/backend/variables/builtin/currency/top-currency-raw.ts  | 4 ++--
 src/backend/variables/builtin/metadata/top-metadata-raw.ts  | 4 ++--
 src/backend/variables/builtin/misc/top-view-time-raw.ts     | 4 ++--
 .../variables/builtin/twitch/cheer/bits-leaderboard.ts      | 2 +-
 .../variables/builtin/twitch/cheer/bits-top-cheerers.ts     | 2 +-
 .../variables/builtin/twitch/subs/gift-receivers-raw.ts     | 2 +-
 src/backend/variables/builtin/twitch/subs/sub-users.ts      | 6 +++---
 .../builtin/user/roles/random-custom-role-user-raw.ts       | 2 +-
 src/backend/variables/builtin/user/roles/user-roles.ts      | 2 +-
 src/backend/variables/builtin/user/username-array.ts        | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/backend/variables/builtin/array/array-filter.ts b/src/backend/variables/builtin/array/array-filter.ts
index 7aaa90494..5e59f4adb 100644
--- a/src/backend/variables/builtin/array/array-filter.ts
+++ b/src/backend/variables/builtin/array/array-filter.ts
@@ -93,7 +93,7 @@ const model : ReplaceVariable = {
             },
             {
                 usage: 'arrayFilter[rawArray, value, key, true]',
-                description: 'Filter out any item in the array that has a key property twitch equals "value"'
+                description: 'Filter out any item in the array that has a key property which equals "value"'
             }
         ],
         categories: [VariableCategory.ADVANCED],
diff --git a/src/backend/variables/builtin/currency/top-currency-raw.ts b/src/backend/variables/builtin/currency/top-currency-raw.ts
index 4a2194d41..cb037f3e6 100644
--- a/src/backend/variables/builtin/currency/top-currency-raw.ts
+++ b/src/backend/variables/builtin/currency/top-currency-raw.ts
@@ -7,9 +7,9 @@ import currencyManager from "../../../currency/currency-manager";
 const model : ReplaceVariable = {
     definition: {
         handle: "rawTopCurrency",
-        description: "Returns a raw array containing those with the most of the specified currency. Items in the array contain 'place', 'username' and 'amount' properties",
+        description: "Returns a raw array containing those with the most of the specified currency. Items in the array contain `place`, `username` and `amount` properties.",
         usage: "rawTopCurrency[currencyName]",
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.ARRAY]
     },
 
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
diff --git a/src/backend/variables/builtin/metadata/top-metadata-raw.ts b/src/backend/variables/builtin/metadata/top-metadata-raw.ts
index c0db94041..abe4c8286 100644
--- a/src/backend/variables/builtin/metadata/top-metadata-raw.ts
+++ b/src/backend/variables/builtin/metadata/top-metadata-raw.ts
@@ -6,9 +6,9 @@ import viewerMetadataManager from "../../../viewers/viewer-metadata-manager";
 const model : ReplaceVariable = {
     definition: {
         handle: "rawTopMetadata",
-        description: "Returns a raw array of users with the most of a given metadata key. Items contain 'username', 'place' and 'amount' properties",
+        description: "Returns a raw array of users with the most of a given metadata key. Items contain `username`, `place` and `amount` properties.",
         usage: "rawTopMetadata[metadataKey]",
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.ARRAY, OutputDataType.TEXT]
     },
 
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
diff --git a/src/backend/variables/builtin/misc/top-view-time-raw.ts b/src/backend/variables/builtin/misc/top-view-time-raw.ts
index e119376c8..755eef43e 100644
--- a/src/backend/variables/builtin/misc/top-view-time-raw.ts
+++ b/src/backend/variables/builtin/misc/top-view-time-raw.ts
@@ -6,9 +6,9 @@ import viewerOnlineStatusManager from "../../../viewers/viewer-online-status-man
 const model : ReplaceVariable = {
     definition: {
         handle: "rawTopViewTime",
-        description: "Returns a raw array containing users with the most view time(in hours). Items contain 'username', 'place' and 'minutes' properties",
+        description: "Returns a raw array containing users with the most view time (in hours). Items contain `username`, 'place` and `minutes` properties.",
         usage: "rawTopViewTime[count]",
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.ARRAY]
     },
 
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
diff --git a/src/backend/variables/builtin/twitch/cheer/bits-leaderboard.ts b/src/backend/variables/builtin/twitch/cheer/bits-leaderboard.ts
index b6f5338fb..d7b8d8b59 100644
--- a/src/backend/variables/builtin/twitch/cheer/bits-leaderboard.ts
+++ b/src/backend/variables/builtin/twitch/cheer/bits-leaderboard.ts
@@ -23,7 +23,7 @@ const model : ReplaceVariable = {
             }
         ],
         categories: [VariableCategory.COMMON, VariableCategory.ADVANCED],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.ARRAY]
     },
     argsCheck: (
         count: null | number = 1,
diff --git a/src/backend/variables/builtin/twitch/cheer/bits-top-cheerers.ts b/src/backend/variables/builtin/twitch/cheer/bits-top-cheerers.ts
index 82b17ebb4..21e5649ae 100644
--- a/src/backend/variables/builtin/twitch/cheer/bits-top-cheerers.ts
+++ b/src/backend/variables/builtin/twitch/cheer/bits-top-cheerers.ts
@@ -24,7 +24,7 @@ const model : ReplaceVariable = {
             }
         ],
         categories: [VariableCategory.COMMON, VariableCategory.USER],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.ARRAY]
     },
     argsCheck: (count: null | number = 1, period: null | string = "all", startDate = null) => {
         if (count == null && period == null && startDate == null) {
diff --git a/src/backend/variables/builtin/twitch/subs/gift-receivers-raw.ts b/src/backend/variables/builtin/twitch/subs/gift-receivers-raw.ts
index 2ee0a95e9..f3397596b 100644
--- a/src/backend/variables/builtin/twitch/subs/gift-receivers-raw.ts
+++ b/src/backend/variables/builtin/twitch/subs/gift-receivers-raw.ts
@@ -12,7 +12,7 @@ const model : ReplaceVariable = {
         description: "Returns a raw array containing the recipients' usernames and months subbed",
         triggers: triggers,
         categories: [VariableCategory.COMMON, VariableCategory.USER, VariableCategory.TRIGGER],
-        possibleDataOutput: [OutputDataType.ALL]
+        possibleDataOutput: [OutputDataType.ARRAY, OutputDataType.TEXT]
     },
     evaluator: (trigger) => {
         if (trigger == null || trigger.metadata == null || trigger.metadata.eventData == null || trigger.metadata.eventData.giftReceivers == null) {
diff --git a/src/backend/variables/builtin/twitch/subs/sub-users.ts b/src/backend/variables/builtin/twitch/subs/sub-users.ts
index 793604d2e..a4821b96b 100644
--- a/src/backend/variables/builtin/twitch/subs/sub-users.ts
+++ b/src/backend/variables/builtin/twitch/subs/sub-users.ts
@@ -8,15 +8,15 @@ const logger = require("../../../../logwrapper");
 const model : ReplaceVariable = {
     definition: {
         handle: "subNames",
-        description: "Returns an array of subscriptions you currently have. Items contain 'username', 'tier' and 'isGift' properties",
+        description: "Returns an array of subscribers you currently have. Items contain `username`, `tier` and `isGift` properties.",
         usage: "subNames",
         examples: [
             {
                 usage: "subNames",
-                description: 'Returns: [{username: "firebottle", displayname: "FireBottle", tier: 2000, isGift:false}, {username: "ebiggz", displayname: "EBiggz", tier: 1000, isGift:true}] To be used with array or custom variables'
+                description: 'Returns: [{username: "firebottle", displayname: "FireBottle", tier: 2000, isGift:false}, {username: "ebiggz", displayname: "EBiggz", tier: 1000, isGift:true}] To be used with array or custom variables.'
             }
         ],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.ARRAY]
     },
     evaluator: async () => {
         const { streamer } = accountAccess.getAccounts();
diff --git a/src/backend/variables/builtin/user/roles/random-custom-role-user-raw.ts b/src/backend/variables/builtin/user/roles/random-custom-role-user-raw.ts
index de39aad5c..bfafbe80b 100644
--- a/src/backend/variables/builtin/user/roles/random-custom-role-user-raw.ts
+++ b/src/backend/variables/builtin/user/roles/random-custom-role-user-raw.ts
@@ -8,7 +8,7 @@ const model : ReplaceVariable = {
     definition: {
         handle: "rawRandomCustomRoleUser",
         usage: "rawRandomCustomRoleUser[role]",
-        description: "Returns a random user that has the specified custom role as an object containing `id`, `username`, and `displayName` fields.",
+        description: "Returns a random user that has the specified custom role as an object containing `id`, `username`, and `displayName` properties.",
         categories: [VariableCategory.USER],
         possibleDataOutput: [OutputDataType.OBJECT]
     },
diff --git a/src/backend/variables/builtin/user/roles/user-roles.ts b/src/backend/variables/builtin/user/roles/user-roles.ts
index d029923f3..7f5510a89 100644
--- a/src/backend/variables/builtin/user/roles/user-roles.ts
+++ b/src/backend/variables/builtin/user/roles/user-roles.ts
@@ -40,7 +40,7 @@ const model : ReplaceVariable = {
             }
         ],
         categories: [VariableCategory.COMMON, VariableCategory.USER],
-        possibleDataOutput: [OutputDataType.ALL]
+        possibleDataOutput: [OutputDataType.ARRAY]
     },
     evaluator: async (trigger, username: null | string, roleType) : Promise<unknown[]> => {
         if (username == null && roleType == null) {
diff --git a/src/backend/variables/builtin/user/username-array.ts b/src/backend/variables/builtin/user/username-array.ts
index 4f88d9c5e..af6b7ed93 100644
--- a/src/backend/variables/builtin/user/username-array.ts
+++ b/src/backend/variables/builtin/user/username-array.ts
@@ -8,7 +8,7 @@ const model : ReplaceVariable = {
         handle: "usernameArray",
         description: "Returns an array of all usernames saved in the user db",
         categories: [VariableCategory.ADVANCED],
-        possibleDataOutput: [OutputDataType.TEXT]
+        possibleDataOutput: [OutputDataType.ARRAY]
     },
     evaluator: async () => {
         const usernames = await viewerDatabase.getAllUsernames();

From 63f2867f51cd05ae4cf584b7591d4ca366a5e060 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Tue, 17 Dec 2024 22:12:18 -0500
Subject: [PATCH 28/54] fix: filter values showing Not Set

---
 src/backend/events/filters/filter-factory.ts    | 4 ++--
 src/gui/app/directives/filters/filterDisplay.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/backend/events/filters/filter-factory.ts b/src/backend/events/filters/filter-factory.ts
index 25143e4d1..e99df666d 100644
--- a/src/backend/events/filters/filter-factory.ts
+++ b/src/backend/events/filters/filter-factory.ts
@@ -202,8 +202,8 @@ export function createPresetFilter({
         comparisonTypes.push(ComparisonType.IS_NOT);
     }
 
-    const valueDisplay = getSelectedValueDisplay ?? (async (filterSettings, $injector: auto.IInjectorService) => {
-        return (await $injector.invoke(presetValues, {}, {}))
+    const valueDisplay = getSelectedValueDisplay ?? (async (filterSettings, filterType: any, $injector: auto.IInjectorService) => {
+        return (await $injector.invoke(filterType.getPresetValues, {}, {}))
             .find(pv => pv.value === filterSettings.value)?.display ?? "[Not Set]";
     });
 
diff --git a/src/gui/app/directives/filters/filterDisplay.js b/src/gui/app/directives/filters/filterDisplay.js
index d0ef60245..3bfeae297 100644
--- a/src/gui/app/directives/filters/filterDisplay.js
+++ b/src/gui/app/directives/filters/filterDisplay.js
@@ -26,7 +26,8 @@
                             resolve("[Not Set]");
                         } else {
                             const value = await $injector.invoke($ctrl.filterType.getSelectedValueDisplay, {}, {
-                                filterSettings: $ctrl.filter
+                                filterSettings: $ctrl.filter,
+                                filterType: $ctrl.filterType
                             });
                             resolve(value);
                         }

From fdcbb41b407ab0fde6c9edb4ed4a35e84cf0545c Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Wed, 18 Dec 2024 16:04:42 -0500
Subject: [PATCH 29/54] fix: sub kind filter

---
 .../events/filters/builtin/twitch/sub-kind.ts | 35 ++++++++++++++++---
 src/backend/events/filters/filter-factory.ts  |  4 +--
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/backend/events/filters/builtin/twitch/sub-kind.ts b/src/backend/events/filters/builtin/twitch/sub-kind.ts
index 265750193..4ec0d7c97 100644
--- a/src/backend/events/filters/builtin/twitch/sub-kind.ts
+++ b/src/backend/events/filters/builtin/twitch/sub-kind.ts
@@ -1,13 +1,15 @@
-import { createPresetFilter } from "../../filter-factory";
+import { EventFilter } from "../../../../../types/events";
+import { ComparisonType } from "../../../../../shared/filter-constants";
 
-const filter = createPresetFilter({
+const filter: EventFilter = {
     id: "firebot:sub-kind",
     name: "Kind of Sub",
     description: "Filter by the kind of sub (resub vs first sub)",
     events: [
         { eventSourceId: "twitch", eventId: "sub" }
     ],
-    eventMetaKey: "isResub",
+    comparisonTypes: [ComparisonType.IS],
+    valueType: "preset",
     presetValues: () => [
         {
             value: "first",
@@ -17,7 +19,30 @@ const filter = createPresetFilter({
             value: "resub",
             display: "Resub"
         }
-    ]
-});
+    ],
+    getSelectedValueDisplay: (filterSettings) => {
+        switch (filterSettings.value) {
+            case "first":
+                return "First Sub";
+            case "resub":
+                return "Resub";
+            default:
+                return "[Not set]";
+        }
+    },
+    predicate: (filterSettings, eventData) => {
+        const { value } = filterSettings;
+        const { eventMeta } = eventData;
+
+        if (value == null) {
+            return true;
+        }
+
+        const isResub = eventMeta.isResub;
+        const expectingResub = value === "resub";
+
+        return isResub === expectingResub;
+    }
+};
 
 export default filter;
\ No newline at end of file
diff --git a/src/backend/events/filters/filter-factory.ts b/src/backend/events/filters/filter-factory.ts
index e99df666d..cfb0425b6 100644
--- a/src/backend/events/filters/filter-factory.ts
+++ b/src/backend/events/filters/filter-factory.ts
@@ -220,9 +220,7 @@ export function createPresetFilter({
 
             const data = extractPropertyWithPath(eventMeta, getMetaKey(eventMetaKey, eventData, filterSettings));
 
-            const output = data === value ||
-                (data === true && value === "true") ||
-                (data === false && value === "false");
+            const output = data === value || data.toString() === value;
 
             return comparisonType === ComparisonType.IS ? output : !output;
         }

From 9c1d50b3022344f97b1f20b8a4b766a4b262ddf6 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Wed, 18 Dec 2024 17:23:13 -0500
Subject: [PATCH 30/54] feat: prefill Simulate Event dialog

---
 src/gui/app/directives/controls/dynamic-parameter.js       | 7 +++++++
 .../directives/modals/events/simulateGroupEventsModal.js   | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/gui/app/directives/controls/dynamic-parameter.js b/src/gui/app/directives/controls/dynamic-parameter.js
index c65d33b5c..e5a4439b0 100644
--- a/src/gui/app/directives/controls/dynamic-parameter.js
+++ b/src/gui/app/directives/controls/dynamic-parameter.js
@@ -181,6 +181,13 @@
                             ctrl.metadata.value = ctrl.metadata.options[0];
                         }
                     }
+
+                    // If it is a boolean and no default is supplied, set to false
+                    if (ctrl.metadata.type === "boolean") {
+                        if (ctrl.metadata.default == null) {
+                            ctrl.metadata.value = false;
+                        }
+                    }
                 }
 
                 console.log(ctrl.metadata);
diff --git a/src/gui/app/directives/modals/events/simulateGroupEventsModal.js b/src/gui/app/directives/modals/events/simulateGroupEventsModal.js
index 07de3d47c..de73b1db9 100644
--- a/src/gui/app/directives/modals/events/simulateGroupEventsModal.js
+++ b/src/gui/app/directives/modals/events/simulateGroupEventsModal.js
@@ -94,13 +94,14 @@
 
                     const eventSource = await backendCommunicator.fireEventAsync("getEventSource", event);
                     if (eventSource.manualMetadata) {
-                        $ctrl.metadata = Object.keys(eventSource.manualMetadata).map(mmd => {
+                        $ctrl.metadata = Object.keys(eventSource.manualMetadata).map((mmd) => {
                             const meta = eventSource.manualMetadata[mmd];
                             const dataType = meta == null ? "string" : meta.type || typeof meta;
                             const data = {
                                 key: mmd,
                                 title: getTitle(mmd),
                                 type: dataType,
+                                value: dataType !== "enum" ? meta : undefined,
                                 options: meta?.options || {}
                             };
 

From cee52a6e848ecbbb87b9b92189b76f5d08b6713f Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Fri, 20 Dec 2024 20:48:53 -0500
Subject: [PATCH 31/54] chore: refactor settings access (#2936)

* settings refactor wip

* refactor backend settings

* refactor frontend settings
---
 .../electron/events/when-ready.js             |   4 +-
 .../electron/events/windows-all-closed.js     |   6 +-
 .../app-management/electron/tray-creation.js  |   4 +-
 .../electron/window-management.js             |   6 +-
 src/backend/auth/auth-manager.ts              |   6 +-
 src/backend/backup-manager.ts                 |  12 +-
 .../chat-listeners/active-user-handler.js     |   4 +-
 .../chat/commands/chat-command-handler.ts     |   4 +-
 src/backend/cloud-sync/profile-sync.js        |   4 +-
 src/backend/common/common-listeners.js        |   6 +-
 src/backend/common/connection-manager.js      |   6 +-
 .../custom-scripts/custom-script-helpers.js   |   2 +-
 .../custom-scripts/custom-script-runner.js    |   8 +-
 src/backend/common/handlers/mediaProcessor.js |  20 +-
 src/backend/common/screenshot-helpers.ts      |   6 +-
 src/backend/common/settings-access.js         | 342 -------
 src/backend/common/settings-manager.ts        | 332 +++++++
 src/backend/currency/currency-access.ts       |   4 +-
 src/backend/effects/builtin/celebration.js    |   8 +-
 src/backend/effects/builtin/clear-effects.js  |  10 +-
 src/backend/effects/builtin/clips.js          |   6 +-
 src/backend/effects/builtin/html.js           |  14 +-
 src/backend/effects/builtin/loop-effects.js   |   6 +-
 src/backend/effects/builtin/play-sound.js     |   6 +-
 src/backend/effects/builtin/play-video.js     |  10 +-
 .../effects/builtin/random-reddit-image.js    |   8 +-
 src/backend/effects/builtin/shoutout.js       |   6 +-
 src/backend/effects/builtin/show-image.js     |  10 +-
 src/backend/effects/builtin/show-text.js      |  10 +-
 src/backend/events/twitch-events/gift-sub.ts  |   4 +-
 .../v4/areas/v4-overlay-instances-importer.js |   8 +-
 .../import/v4/areas/v4-scripts-importer.js    |   6 +-
 .../aws/text-to-speech-polly-effect.js        |  12 +-
 .../integrations/integration-manager.js       |  14 +-
 .../quick-actions/quick-action-manager.js     |  10 +-
 src/backend/twitch-api/ad-manager.ts          |   4 +-
 src/backend/twitch-api/stream-info-manager.ts |   4 +-
 src/backend/viewers/viewer-database.ts        |   4 +-
 .../viewers/viewer-online-status-manager.ts   |   4 +-
 src/gui/app/app-main.js                       |  18 +-
 .../controllers/chat-messages.controller.js   |  28 +-
 .../app/controllers/settings.controller.js    |  86 +-
 src/gui/app/controllers/viewers.controller.js |   2 +-
 .../chat/quick-actions/quick-actions.js       |   8 +-
 .../eosAudioOutputDevice.js                   |   6 +-
 .../eosOverlayInstance.js                     |   6 +-
 .../directives/misc/stream-info.component.js  |   8 +-
 .../modals/chat/chat-settings-modal.js        |  74 +-
 .../modals/chat/edit-activity-events-modal.js |  14 +-
 .../addOrEditCustomCommandModal.js            |  10 +-
 .../modals/misc/connectionPanelModal.js       |   6 +-
 .../misc/create-overlay-instances.modal.js    |   2 +-
 .../misc/edit-overlay-instances-modal.js      |  14 +-
 .../modals/misc/setupWizardModal.js           |  10 +-
 .../modals/viewers/viewerDetailsModal.js      |   2 +-
 .../settings/categories/advanced-settings.js  |  48 +-
 .../settings/categories/backups-settings.js   |  16 +-
 .../settings/categories/database-settings.js  |  12 +-
 .../settings/categories/general-settings.js   |  67 +-
 .../settings/categories/overlay-settings.js   |  28 +-
 .../settings/categories/scripts-settings.js   |  12 +-
 .../settings/categories/trigger-settings.js   |  16 +-
 .../settings/categories/tts-settings.js       |  14 +-
 src/gui/app/directives/sidebar/sidebar.js     |   2 +-
 src/gui/app/services/activity-feed.service.js |   4 +-
 src/gui/app/services/chat-messages.service.js |  85 +-
 .../services/connection-manager.service.js    |  22 +-
 src/gui/app/services/connection.service.js    |   2 +-
 src/gui/app/services/integration.service.js   |  16 +-
 .../services/overlay-url-helper.service.js    |   6 +-
 src/gui/app/services/settings.service.js      | 847 +-----------------
 .../app/services/sidebar-manager.service.js   |   4 +-
 src/gui/app/services/sort-tags.service.js     |  12 +-
 src/gui/app/services/sound.service.js         |  26 +-
 src/gui/app/services/tts.service.js           |  12 +-
 src/gui/app/services/updates.service.js       |   6 +-
 src/gui/app/services/utility.service.js       |  10 +-
 src/gui/app/services/viewers.service.js       |   2 +-
 .../app/templates/chat/_chat-messages.html    |   4 +-
 src/server/http-server-manager.ts             |   4 +-
 src/types/settings.d.ts                       | 193 ++++
 81 files changed, 1015 insertions(+), 1689 deletions(-)
 delete mode 100644 src/backend/common/settings-access.js
 create mode 100644 src/backend/common/settings-manager.ts
 create mode 100644 src/types/settings.d.ts

diff --git a/src/backend/app-management/electron/events/when-ready.js b/src/backend/app-management/electron/events/when-ready.js
index e7873e59f..0d4e1a5b7 100644
--- a/src/backend/app-management/electron/events/when-ready.js
+++ b/src/backend/app-management/electron/events/when-ready.js
@@ -176,8 +176,8 @@ exports.whenReady = async () => {
     builtinGameLoader.loadGames();
 
     windowManagement.updateSplashScreenStatus("Loading custom variables...");
-    const {settings} = require("../../../common/settings-access");
-    if (settings.getPersistCustomVariables()) {
+    const { SettingsManager } = require("../../../common/settings-manager");
+    if (SettingsManager.getSetting("PersistCustomVariables")) {
         const customVariableManager = require("../../../common/custom-variable-manager");
         customVariableManager.loadVariablesFromFile();
     }
diff --git a/src/backend/app-management/electron/events/windows-all-closed.js b/src/backend/app-management/electron/events/windows-all-closed.js
index 154e7b96b..1a962024e 100644
--- a/src/backend/app-management/electron/events/windows-all-closed.js
+++ b/src/backend/app-management/electron/events/windows-all-closed.js
@@ -7,7 +7,7 @@ exports.windowsAllClosed = async () => {
     const logger = require("../../../logwrapper");
     logger.debug("All windows closed triggered");
 
-    const { settings } = require("../../../common/settings-access");
+    const { SettingsManager } = require("../../../common/settings-manager");
     const backupManager = require("../../../backup-manager");
 
     // Stop all scheduled tasks
@@ -27,7 +27,7 @@ exports.windowsAllClosed = async () => {
     chatModerationManager.stopService();
 
     // Persist custom variables
-    if (settings.getPersistCustomVariables()) {
+    if (SettingsManager.getSetting("PersistCustomVariables")) {
         const customVariableManager = require("../../../common/custom-variable-manager");
         customVariableManager.persistVariablesToFile();
     }
@@ -36,7 +36,7 @@ exports.windowsAllClosed = async () => {
     const viewerOnlineStatusManager = require("../../../viewers/viewer-online-status-manager");
     await viewerOnlineStatusManager.setAllViewersOffline();
 
-    if (settings.backupOnExit()) {
+    if (SettingsManager.getSetting("BackupOnExit")) {
         // Make a backup
         await backupManager.startBackup(false, app.quit);
     } else {
diff --git a/src/backend/app-management/electron/tray-creation.js b/src/backend/app-management/electron/tray-creation.js
index 2a2e4db62..f308351c8 100644
--- a/src/backend/app-management/electron/tray-creation.js
+++ b/src/backend/app-management/electron/tray-creation.js
@@ -6,7 +6,7 @@ const electron = require("electron");
 const { Menu, Tray, app, nativeImage } = electron;
 
 const frontendCommunicator = require('../../common/frontend-communicator.js');
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 
 let mainTray;
 let minimizedToTray = false;
@@ -62,7 +62,7 @@ module.exports = function createTray(mainWindow) {
     });
 
     mainWindow.on('minimize', () => {
-        if (settings.getMinimizeToTray() && minimizedToTray !== true) {
+        if (SettingsManager.getSetting("MinimizeToTray") && minimizedToTray !== true) {
             mainWindow.hide();
             minimizedToTray = true;
         }
diff --git a/src/backend/app-management/electron/window-management.js b/src/backend/app-management/electron/window-management.js
index 76b4b2136..17df2f822 100644
--- a/src/backend/app-management/electron/window-management.js
+++ b/src/backend/app-management/electron/window-management.js
@@ -11,7 +11,7 @@ const logger = require("../../logwrapper");
 const { setupTitlebar, attachTitlebarToWindow } = require("custom-electron-titlebar/main");
 const screenHelpers = require("./screen-helpers");
 const frontendCommunicator = require("../../common/frontend-communicator");
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 
 const argv = require('../../common/argv-parser');
 
@@ -473,7 +473,7 @@ async function createMainWindow() {
             username: "Firebot"
         });
 
-        if (settings.getOpenStreamPreviewOnLaunch() === true) {
+        if (SettingsManager.getSetting("OpenStreamPreviewOnLaunch") === true) {
             createStreamPreviewWindow();
         }
 
@@ -483,7 +483,7 @@ async function createMainWindow() {
 
     mainWindow.on("close", (event) => {
         const connectionManager = require("../../common/connection-manager");
-        if (!settings.hasJustUpdated() && connectionManager.chatIsConnected() && connectionManager.streamerIsOnline()) {
+        if (!SettingsManager.getSetting("JustUpdated") && connectionManager.chatIsConnected() && connectionManager.streamerIsOnline()) {
             event.preventDefault();
             dialog.showMessageBox(mainWindow, {
                 message: "Are you sure you want to close Firebot while connected to Twitch?",
diff --git a/src/backend/auth/auth-manager.ts b/src/backend/auth/auth-manager.ts
index b2ff2be18..f9d9adb29 100644
--- a/src/backend/auth/auth-manager.ts
+++ b/src/backend/auth/auth-manager.ts
@@ -2,20 +2,20 @@ import { EventEmitter } from "events";
 import ClientOAuth2 from "client-oauth2";
 import logger from "../logwrapper";
 import { AuthProvider, AuthProviderDefinition } from "./auth";
-import { settings } from "../common/settings-access";
+import { SettingsManager } from "../common/settings-manager";
 import frontendCommunicator from "../common/frontend-communicator";
 import { Notification, app } from "electron";
 import windowManagement from "../app-management/electron/window-management";
 
 class AuthManager extends EventEmitter {
-    private readonly _httpPort: string;
+    private readonly _httpPort: number;
     private _authProviders: AuthProvider[];
 
     constructor() {
         super();
 
         this._authProviders = [];
-        this._httpPort = settings.getWebServerPort();
+        this._httpPort = SettingsManager.getSetting("WebServerPort");
     }
 
     registerAuthProvider(provider: AuthProviderDefinition): void {
diff --git a/src/backend/backup-manager.ts b/src/backend/backup-manager.ts
index 96944f99f..0c664c6cd 100644
--- a/src/backend/backup-manager.ts
+++ b/src/backend/backup-manager.ts
@@ -6,7 +6,7 @@ import { glob } from "glob";
 import { DeflateOptions, Zip, ZipDeflate, unzipSync } from "fflate";
 import logger from "./logwrapper";
 import utils from "./utility";
-import { settings } from "./common/settings-access";
+import { SettingsManager } from "./common/settings-manager";
 import dataAccess from "./common/data-access.js";
 import frontendCommunicator from "./common/frontend-communicator";
 
@@ -31,7 +31,7 @@ class BackupManager {
     }
 
     private async cleanUpOldBackups(callback: () => void) {
-        const maxBackups = settings.maxBackupCount();
+        const maxBackups = SettingsManager.getSetting("MaxBackupCount");
 
         if (maxBackups !== "All") {
             const fileNames = (await fsp.readdir(this._backupFolderPath))
@@ -78,7 +78,7 @@ class BackupManager {
 
         // listen for all archive data to be written
         output.on("close", async () => {
-            settings.setLastBackupDate(new Date());
+            SettingsManager.saveSetting("LastBackupDate", new Date());
             await this.cleanUpOldBackups(callback);
         });
 
@@ -107,7 +107,7 @@ class BackupManager {
         //archive.directory(folderPath, "profiles");
 
         const varIgnoreInArchive = ['backups/**', 'clips/**', 'logs/**', 'overlay.html'];
-        const ignoreResources = settings.backupIgnoreResources();
+        const ignoreResources = SettingsManager.getSetting("BackupIgnoreResources");
 
         if (ignoreResources && !manualActivation) {
             logger.info("Ignoring overlay-resources folder");
@@ -147,8 +147,8 @@ class BackupManager {
     }
 
     async onceADayBackUpCheck() {
-        const shouldBackUp = settings.backupOnceADay(),
-            lastBackupDate = settings.lastBackupDate(),
+        const shouldBackUp = SettingsManager.getSetting("BackupOnceADay"),
+            lastBackupDate = SettingsManager.getSetting("LastBackupDate"),
             todayDate = new Date();
 
         if (shouldBackUp) {
diff --git a/src/backend/chat/chat-listeners/active-user-handler.js b/src/backend/chat/chat-listeners/active-user-handler.js
index 1dbb40524..374e191d6 100644
--- a/src/backend/chat/chat-listeners/active-user-handler.js
+++ b/src/backend/chat/chat-listeners/active-user-handler.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const chatHelpers = require("../chat-helpers");
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 const frontendCommunicator = require("../../common/frontend-communicator");
 const utils = require("../../utility");
 const chatRolesManager = require("../../roles/chat-roles-manager");
@@ -235,7 +235,7 @@ exports.addActiveUser = async (chatUser, includeInOnline = false, forceActive =
 
     const viewerDatabase = require("../../viewers/viewer-database");
 
-    const ttl = settings.getActiveChatUserListTimeout() * 60;
+    const ttl = SettingsManager.getSetting("ActiveChatUserListTimeout") * 60;
 
     let user = await viewerDatabase.getViewerById(chatUser.userId);
 
diff --git a/src/backend/chat/commands/chat-command-handler.ts b/src/backend/chat/commands/chat-command-handler.ts
index 2bb84bfa8..2fadbd997 100644
--- a/src/backend/chat/commands/chat-command-handler.ts
+++ b/src/backend/chat/commands/chat-command-handler.ts
@@ -11,7 +11,7 @@ import commandManager from "./command-manager";
 import commandCooldownManager from "./command-cooldown-manager";
 import twitchApi from "../../twitch-api/api";
 import commandRunner from "./command-runner";
-import { settings } from "../../common/settings-access";
+import { SettingsManager } from "../../common/settings-manager";
 
 const DEFAULT_COOLDOWN_MESSAGE = "This command is still on cooldown for: {timeLeft}";
 const DEFAULT_RESTRICTION_MESSAGE = "Sorry, you cannot use this command because: {reason}";
@@ -130,7 +130,7 @@ class CommandHandler {
             }
 
             // 'inherit' or undefined = inherit app settings
-            if (command.allowTriggerBySharedChat !== true && !settings.getAllowCommandsInSharedChat()) {
+            if (command.allowTriggerBySharedChat !== true && !SettingsManager.getSetting("AllowCommandsInSharedChat")) {
                 return false;
             }
         }
diff --git a/src/backend/cloud-sync/profile-sync.js b/src/backend/cloud-sync/profile-sync.js
index 1c110c1ab..e3d5b2c8d 100644
--- a/src/backend/cloud-sync/profile-sync.js
+++ b/src/backend/cloud-sync/profile-sync.js
@@ -6,7 +6,7 @@ const logger = require("../logwrapper");
 const commandList = require("./sync-handlers/command-list");
 const quoteList = require("./sync-handlers/quotes-list");
 const frontendCommunicator = require("../common/frontend-communicator");
-const { settings } = require("../common/settings-access");
+const { SettingsManager } = require("../common/settings-manager");
 const rankManager = require("../ranks/rank-manager");
 
 async function syncProfileData(profileSyncData) {
@@ -25,7 +25,7 @@ async function syncProfileData(profileSyncData) {
         'variables': variableManager.getReplaceVariables().map(v => v.definition),
         'ranks': rankManager.getAllItems(),
         'quotes': quotes,
-        'allowQuoteCSVDownloads': settings.getAllowQuoteCSVDownloads()
+        'allowQuoteCSVDownloads': SettingsManager.getSetting("AllowQuoteCSVDownloads")
     };
 
     const binId = await cloudSync.sync(completeSyncJSON);
diff --git a/src/backend/common/common-listeners.js b/src/backend/common/common-listeners.js
index e263cb43b..6b669a66c 100644
--- a/src/backend/common/common-listeners.js
+++ b/src/backend/common/common-listeners.js
@@ -11,7 +11,7 @@ exports.setupCommonListeners = () => {
     const frontendCommunicator = require("./frontend-communicator");
     const dataAccess = require("./data-access");
     const profileManager = require("./profile-manager");
-    const { settings } = require("./settings-access");
+    const { SettingsManager } = require("./settings-manager");
     const backupManager = require("../backup-manager");
     const webServer = require("../../server/http-server-manager");
 
@@ -198,7 +198,7 @@ exports.setupCommonListeners = () => {
         const GhReleases = require("electron-gh-releases");
 
         //back up first
-        if (settings.backupBeforeUpdates()) {
+        if (SettingsManager.getSetting("BackupBeforeUpdates")) {
             await backupManager.startBackup();
         }
 
@@ -221,7 +221,7 @@ exports.setupCommonListeners = () => {
             renderWindow.webContents.send("updateDownloaded");
 
             // Prepare for update install on next run
-            settings.setJustUpdated(true);
+            SettingsManager.saveSetting("JustUpdated", true);
         });
     });
 
diff --git a/src/backend/common/connection-manager.js b/src/backend/common/connection-manager.js
index aa1eaefe5..fc3a3a299 100644
--- a/src/backend/common/connection-manager.js
+++ b/src/backend/common/connection-manager.js
@@ -3,7 +3,7 @@ const { EventEmitter } = require("events");
 const util = require("../utility");
 const logger = require("../logwrapper");
 const frontendCommunicator = require("./frontend-communicator");
-const { settings } = require("./settings-access");
+const { SettingsManager } = require("./settings-manager");
 const twitchApi = require("../twitch-api/api");
 const twitchChat = require("../chat/twitch-chat");
 const twitchPubSubClient = require("../twitch-api/pubsub/pubsub-client");
@@ -224,7 +224,7 @@ manager.on("service-connection-update", (data) => {
 });
 
 frontendCommunicator.onAsync("connect-sidebar-controlled-services", async () => {
-    const serviceIds = settings.getSidebarControlledServices();
+    const serviceIds = SettingsManager.getSetting("SidebarControlledServices");
 
     await manager.updateConnectionForServices(serviceIds.map(id => ({
         id,
@@ -233,7 +233,7 @@ frontendCommunicator.onAsync("connect-sidebar-controlled-services", async () =>
 });
 
 frontendCommunicator.on("disconnect-sidebar-controlled-services", () => {
-    const serviceIds = settings.getSidebarControlledServices();
+    const serviceIds = SettingsManager.getSetting("SidebarControlledServices");
     for (const id of serviceIds) {
         manager.updateServiceConnection(id, false);
     }
diff --git a/src/backend/common/handlers/custom-scripts/custom-script-helpers.js b/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
index e73787444..15262cc1d 100644
--- a/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
+++ b/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
@@ -2,7 +2,7 @@
 const twitchChat = require("../../../chat/twitch-chat");
 const twitchApi = require("../../../twitch-api/api");
 const profileManager = require("../../profile-manager");
-const settings = require('../../settings-access').settings;
+const settings = require('../../settings-manager').SettingsManager;
 const path = require("path");
 const logger = require("../../../logwrapper");
 const {
diff --git a/src/backend/common/handlers/custom-scripts/custom-script-runner.js b/src/backend/common/handlers/custom-scripts/custom-script-runner.js
index dada6bbf7..7f621c1bf 100644
--- a/src/backend/common/handlers/custom-scripts/custom-script-runner.js
+++ b/src/backend/common/handlers/custom-scripts/custom-script-runner.js
@@ -2,11 +2,11 @@
 const { ipcMain, shell } = require("electron");
 const { v4: uuid } = require("uuid");
 const logger = require("../../../logwrapper");
-const { settings } = require("../../settings-access");
 const utils = require("../../../utility");
 const profileManager = require("../../profile-manager");
 const { getScriptPath, buildRunRequest, mapParameters, mapV4EffectToV5 } = require("./custom-script-helpers");
 const effectRunner = require("../../effect-runner.js");
+import { SettingsManager } from "../../settings-manager";
 
 /**
  * @typedef { import('./script-types').ScriptData } ScriptData
@@ -36,7 +36,7 @@ async function executeScript(scriptData, trigger, isStartupScript = false) {
     let customScript;
     try {
         // Make sure we first remove the cached version, incase there was any changes
-        if (settings.getClearCustomScriptCache()) {
+        if (SettingsManager.getSetting("ClearCustomScriptCache")) {
             delete require.cache[require.resolve(scriptFilePath)];
         }
         customScript = require(scriptFilePath);
@@ -168,7 +168,7 @@ async function runStartUpScript(startUpScriptConfig) {
     const { scriptName } = startUpScriptConfig;
     logger.debug(`running startup script: ${scriptName}`);
 
-    if (!settings.isCustomScriptsEnabled()) {
+    if (SettingsManager.getSetting("RunCustomScripts") !== true) {
         logger.warn("Attempted to run startup script but custom scripts are disabled.");
         return;
     }
@@ -229,7 +229,7 @@ function runScript(effect, trigger) {
 
     logger.debug(`running script: ${scriptName}`);
 
-    if (!settings.isCustomScriptsEnabled()) {
+    if (SettingsManager.getSetting("RunCustomScripts")) {
         renderWindow.webContents.send(
             "error",
             "Something attempted to run a custom script but this feature is disabled!"
diff --git a/src/backend/common/handlers/mediaProcessor.js b/src/backend/common/handlers/mediaProcessor.js
index ed1119cdd..6911e4534 100644
--- a/src/backend/common/handlers/mediaProcessor.js
+++ b/src/backend/common/handlers/mediaProcessor.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const { ipcMain, dialog } = require("electron");
-const settings = require("../settings-access").settings;
+const { SettingsManager } = require("../settings-manager");
 const resourceTokenManager = require("../../resourceTokenManager.js");
 const util = require("../../utility");
 const logger = require("../../logwrapper");
@@ -73,7 +73,7 @@ function soundProcessor(effect) {
         selectedOutputDevice == null ||
     selectedOutputDevice.label === "App Default"
     ) {
-        selectedOutputDevice = settings.getAudioOutputDevice();
+        selectedOutputDevice = SettingsManager.getSetting("AudioOutputDevice");
     }
     data.audioOutputDevice = selectedOutputDevice;
 
@@ -82,9 +82,9 @@ function soundProcessor(effect) {
         data.resourceToken = resourceToken;
     }
 
-    if (settings.useOverlayInstances()) {
+    if (SettingsManager.getSetting("UseOverlayInstances")) {
         if (effect.overlayInstance != null) {
-            if (settings.getOverlayInstances().includes(effect.overlayInstance)) {
+            if (SettingsManager.getSetting("OverlayInstances").includes(effect.overlayInstance)) {
                 data.overlayInstance = effect.overlayInstance;
             }
         }
@@ -125,9 +125,9 @@ async function imageProcessor(effect, trigger) {
         "customCoords": effect.customCoords
     };
 
-    if (settings.useOverlayInstances()) {
+    if (SettingsManager.getSetting("UseOverlayInstances")) {
         if (effect.overlayInstance != null) {
-            if (settings.getOverlayInstances().includes(effect.overlayInstance)) {
+            if (SettingsManager.getSetting("OverlayInstances").includes(effect.overlayInstance)) {
                 data.overlayInstance = effect.overlayInstance;
             }
         }
@@ -181,9 +181,9 @@ function videoProcessor(effect) {
         "loop": effect.loop === true
     };
 
-    if (settings.useOverlayInstances()) {
+    if (SettingsManager.getSetting("UseOverlayInstances")) {
         if (effect.overlayInstance != null) {
-            if (settings.getOverlayInstances().includes(effect.overlayInstance)) {
+            if (SettingsManager.getSetting("OverlayInstances").includes(effect.overlayInstance)) {
                 data.overlayInstance = effect.overlayInstance;
             }
         }
@@ -230,10 +230,10 @@ async function showText(effect, trigger) {
         dto.position = getRandomPresetLocation();
     }
 
-    if (settings.useOverlayInstances()) {
+    if (SettingsManager.getSetting("UseOverlayInstances")) {
         if (dto.overlayInstance != null) {
             //reset overlay if it doesnt exist
-            if (!settings.getOverlayInstances().includes(dto.overlayInstance)) {
+            if (!SettingsManager.getSetting("OverlayInstances").includes(dto.overlayInstance)) {
                 dto.overlayInstance = null;
             }
         }
diff --git a/src/backend/common/screenshot-helpers.ts b/src/backend/common/screenshot-helpers.ts
index fdec15e75..f4031abb4 100644
--- a/src/backend/common/screenshot-helpers.ts
+++ b/src/backend/common/screenshot-helpers.ts
@@ -5,7 +5,7 @@ import logger from "../logwrapper";
 import twitchApi from "../twitch-api/api";
 import discordEmbedBuilder from "../integrations/builtin/discord/discord-embed-builder";
 import discord from "../integrations/builtin/discord/discord-message-sender";
-import { settings } from "../common/settings-access";
+import { SettingsManager } from "../common/settings-manager";
 import mediaProcessor from "../common/handlers/mediaProcessor";
 import webServer from "../../server/http-server-manager";
 import moment from "moment";
@@ -86,9 +86,9 @@ export function sendScreenshotToOverlay(screenshotDataUrl: string, effect: Scree
     }
 
     let overlayInstance = null;
-    if (settings.useOverlayInstances()) {
+    if (SettingsManager.getSetting("UseOverlayInstances")) {
         if (effect.overlayInstance != null) {
-            if (settings.getOverlayInstances().includes(effect.overlayInstance)) {
+            if (SettingsManager.getSetting("OverlayInstances").includes(effect.overlayInstance)) {
                 overlayInstance = effect.overlayInstance;
             }
         }
diff --git a/src/backend/common/settings-access.js b/src/backend/common/settings-access.js
deleted file mode 100644
index 30efc5dec..000000000
--- a/src/backend/common/settings-access.js
+++ /dev/null
@@ -1,342 +0,0 @@
-"use strict";
-
-const profileManager = require("./profile-manager");
-const logger = require("../logwrapper");
-const frontendCommunicator = require("./frontend-communicator");
-const fs = require("fs");
-
-// This file centralizes access to the settings db
-// We will need to refactor other files to use this.
-const settings = {};
-
-let settingsCache = {};
-
-settings.flushSettingsCache = function () {
-    settingsCache = {};
-    frontendCommunicator.send("flush-settings-cache");
-};
-
-frontendCommunicator.on("settings-updated-renderer", (settingsUpdate) => {
-    if (settingsUpdate == null) {
-        return;
-    }
-    const { path, data } = settingsUpdate;
-    if (path == null || path === '') {
-        return;
-    }
-    settingsCache[path] = data;
-});
-
-frontendCommunicator.on("purge-settings-cache", () => {
-    settingsCache = {};
-});
-
-function getSettingsFile() {
-    return profileManager.getJsonDbInProfile("/settings");
-}
-
-function pushDataToFile(path, data) {
-    try {
-        getSettingsFile().push(path, data);
-        settingsCache[path] = data;
-        frontendCommunicator.send("settings-updated-main", { path, data });
-    } catch (err) {
-        logger.debug(err.message);
-    }
-}
-
-
-function handleCorruptSettingsFile() {
-    logger.warn("settings.json file appears to be corrupt. Resetting file...");
-
-    const settingsPath = profileManager.getPathInProfile("settings.json");
-    fs.writeFileSync(settingsPath, JSON.stringify({
-        settings: {
-            firstTimeUse: false
-        }
-    }));
-}
-
-function getDataFromFile(path, forceCacheUpdate = false, defaultValue = undefined) {
-    try {
-        if (settingsCache[path] == null || forceCacheUpdate) {
-            const data = getSettingsFile().getData(path);
-            settingsCache[path] = data ?? defaultValue;
-        }
-    } catch (err) {
-        if (defaultValue !== undefined) {
-            settingsCache[path] = defaultValue;
-        }
-        if (err.name !== "DataError") {
-            logger.warn(err);
-            if (
-                err.name === 'DatabaseError' &&
-                err.inner instanceof SyntaxError &&
-                err.inner.stack.includes('JSON.parse')
-            ) {
-                handleCorruptSettingsFile();
-            }
-        }
-    }
-    return settingsCache[path];
-}
-
-settings.getAutoFlagBots = function () {
-    const autoFlagBots = getDataFromFile("/settings/autoFlagBots");
-    return autoFlagBots != null ? autoFlagBots : true;
-};
-
-settings.getEventSettings = function () {
-    return getDataFromFile("/settings/eventSettings");
-};
-
-settings.isCustomScriptsEnabled = function () {
-    return getDataFromFile("/settings/runCustomScripts") === true;
-};
-
-settings.setCustomScriptsEnabled = function (enabled) {
-    pushDataToFile("/settings/runCustomScripts", enabled === true);
-};
-
-settings.ignoreSubsequentSubEventsAfterCommunitySub = function () {
-    const ignoreSubEvents = getDataFromFile("/settings/ignoreSubsequentSubEventsAfterCommunitySub");
-    return ignoreSubEvents != null ? ignoreSubEvents : true;
-};
-
-settings.hasJustUpdated = function () {
-    const updated = getDataFromFile("/settings/justUpdated");
-    return updated != null ? updated : false;
-};
-
-settings.setJustUpdated = function (justUpdated) {
-    pushDataToFile("/settings/justUpdated", justUpdated === true);
-};
-
-settings.getOverlayVersion = function () {
-    const version = getDataFromFile("/settings/copiedOverlayVersion");
-    return version != null ? version : "";
-};
-
-settings.setOverlayVersion = function (newVersion) {
-    pushDataToFile("/settings/copiedOverlayVersion", newVersion.toString());
-};
-
-settings.getClearCustomScriptCache = function () {
-    const clear = getDataFromFile("/settings/clearCustomScriptCache");
-    return clear != null ? clear : false;
-};
-
-settings.setClearCustomScriptCache = function (clear) {
-    pushDataToFile("/settings/clearCustomScriptCache", clear === true);
-};
-
-settings.getCustomScriptsEnabled = function () {
-    return getDataFromFile("/settings/runCustomScripts") === true;
-};
-
-settings.setCustomScriptsEnabled = function (enabled) {
-    pushDataToFile("/settings/runCustomScripts", enabled === true);
-};
-
-settings.getPersistCustomVariables = function () {
-    return getDataFromFile("/settings/persistCustomVariables") === true;
-};
-
-settings.setPersistCustomVariables = function (enabled) {
-    pushDataToFile("/settings/persistCustomVariables", enabled === true);
-};
-
-settings.useOverlayInstances = function () {
-    const oi = getDataFromFile("/settings/useOverlayInstances");
-    return oi != null ? oi : false;
-};
-
-settings.setUseOverlayInstances = function (oi) {
-    pushDataToFile("/settings/useOverlayInstances", oi === true);
-};
-
-settings.getOverlayInstances = function () {
-    const ois = getDataFromFile("/settings/overlayInstances");
-    return ois != null ? ois : [];
-};
-
-settings.setOverlayInstances = function (ois) {
-    pushDataToFile("/settings/overlayInstances", ois);
-};
-
-settings.getForceOverlayEffectsToContinueOnRefresh = function () {
-    const forceOverlayEffectsToContinueOnRefresh = getDataFromFile("/settings/forceOverlayEffectsToContinueOnRefresh", false, true);
-    return forceOverlayEffectsToContinueOnRefresh === true;
-};
-
-settings.setForceOverlayEffectsToContinueOnRefresh = function (value) {
-    pushDataToFile("/settings/forceOverlayEffectsToContinueOnRefresh", value);
-};
-
-settings.backupKeepAll = function () {
-    const backupKeepAll = getDataFromFile("/settings/backupKeepAll");
-    return backupKeepAll != null ? backupKeepAll : false;
-};
-
-settings.backupOnExit = function () {
-    const backupOnExit = getDataFromFile("/settings/backupOnExit");
-    return backupOnExit != null ? backupOnExit : true;
-};
-
-settings.backupIgnoreResources = function () {
-    const save = getDataFromFile("/settings/backupIgnoreResources");
-    return save != null ? save : true;
-};
-
-settings.setBackupIgnoreResources = function (backupIgnoreResources) {
-    pushDataToFile("/settings/backupIgnoreResources", backupIgnoreResources === false);
-};
-
-settings.backupBeforeUpdates = function () {
-    const backupBeforeUpdates = getDataFromFile("/settings/backupBeforeUpdates");
-    return backupBeforeUpdates != null ? backupBeforeUpdates : true;
-};
-
-settings.backupOnceADay = function () {
-    const backupOnceADay = getDataFromFile("/settings/backupOnceADay");
-    return backupOnceADay != null ? backupOnceADay : true;
-};
-
-settings.setBackupOnceADay = function (backupOnceADay) {
-    pushDataToFile("/settings/backupOnceADay", backupOnceADay === true);
-};
-
-settings.lastBackupDate = function () {
-    const lastBackup = getDataFromFile("/settings/lastBackupDate");
-    return lastBackup != null ? new Date(lastBackup) : null;
-};
-
-settings.setLastBackupDate = function (lastBackup) {
-    pushDataToFile("/settings/lastBackupDate", lastBackup.toJSON());
-};
-
-settings.maxBackupCount = function () {
-    const maxBackupCount = getDataFromFile("/settings/maxBackupCount");
-    return maxBackupCount != null ? maxBackupCount : 25;
-};
-
-settings.setMaxBackupCount = function (maxBackupCount) {
-    pushDataToFile("/settings/maxBackupCount", maxBackupCount);
-};
-
-settings.getAllowQuoteCSVDownloads = function () {
-    return getDataFromFile("/settings/allowQuoteCSVDownloads") !== false;
-};
-
-settings.getActiveChatUserListTimeout = function () {
-    const inactiveTimer = getDataFromFile("/settings/activeChatUsers/inactiveTimer");
-    return inactiveTimer != null ? parseInt(inactiveTimer) : 5;
-};
-
-settings.getWebSocketPort = function () {
-    const websocketPort = getDataFromFile("/settings/websocketPort");
-    return websocketPort != null ? websocketPort : 8080;
-};
-
-settings.getWebServerPort = function () {
-    const serverPort = getDataFromFile("/settings/webServerPort");
-    return serverPort != null ? serverPort : 7472;
-};
-
-settings.getViewerDbStatus = function () {
-    const status = getDataFromFile("/settings/viewerDB");
-    return status != null ? status : true;
-};
-
-/*
-* 0 = off,
-* 1 = bugfix,
-* 2 = feature,
-* 3 = major release,
-* 4 = betas
-*/
-settings.getAutoUpdateLevel = function () {
-    const updateLevel = getDataFromFile("/settings/autoUpdateLevel");
-    return updateLevel != null ? updateLevel : 2;
-};
-
-settings.getAudioOutputDevice = function () {
-    const device = getDataFromFile("/settings/audioOutputDevice");
-    return device != null
-        ? device
-        : { label: "System Default", deviceId: "default" };
-};
-
-settings.debugModeEnabled = function () {
-    const enabled = getDataFromFile("/settings/debugMode");
-    return enabled != null ? enabled : false;
-};
-
-settings.getWhileLoopEnabled = function () {
-    const enabled = getDataFromFile('/settings/whileLoopEnabled');
-    return enabled !== undefined ? enabled : false;
-};
-
-settings.setWhileLoopEnabled = function (enabled) {
-    pushDataToFile('/settings/whileLoopEnabled', enabled === true);
-};
-
-/**@returns {string[]} */
-settings.getSidebarControlledServices = function () {
-    const services = getDataFromFile("/settings/sidebarControlledServices");
-    return services != null
-        ? services
-        : ["chat"];
-};
-
-settings.getMinimizeToTray = function () {
-    const minimizeToTray = getDataFromFile('/settings/minimizeToTray');
-    return minimizeToTray === true;
-};
-settings.setMinimizeToTray = function (minimizeToTray) {
-    pushDataToFile('/settings/minimizeToTray', minimizeToTray === true);
-};
-
-settings.getOpenStreamPreviewOnLaunch = () => {
-    const openStreamPreviewOnLaunch = getDataFromFile("/settings/openStreamPreviewOnLaunch", false, false);
-    return openStreamPreviewOnLaunch === true;
-};
-settings.setOpenStreamPreviewOnLaunch = (enabled) => {
-    pushDataToFile("/settings/openStreamPreviewOnLaunch", enabled === true);
-};
-
-settings.getQuickActionSettings = () => {
-    return getDataFromFile("/settings/quickActions");
-};
-
-settings.setQuickActionSettings = (quickActions) => {
-    pushDataToFile("/settings/quickActions", quickActions);
-};
-
-settings.getWebOnlineCheckin = () => {
-    const webOnlineCheckin = getDataFromFile("/settings/webOnlineCheckin");
-    return webOnlineCheckin === true;
-};
-
-settings.setWebOnlineCheckin = (value) => {
-    pushDataToFile("/settings/webOnlineCheckin", value);
-};
-
-settings.getTriggerUpcomingAdBreakMinutes = function () {
-    const value = getDataFromFile("/settings/triggerUpcomingAdBreakMinutes", false, 0);
-    return value ?? 0;
-};
-
-settings.setTriggerUpcomingAdBreakMinutes = function (value) {
-    pushDataToFile("/settings/triggerUpcomingAdBreakMinutes", value);
-};
-
-settings.getAllowCommandsInSharedChat = function () {
-    return getDataFromFile("/settings/allowCommandsInSharedChat", false, false); // default OFF
-};
-
-settings.setAllowCommandsInSharedChat = function (value) {
-    pushDataToFile("/settings/allowCommandsInSharedChat", value);
-};
-
-exports.settings = settings;
diff --git a/src/backend/common/settings-manager.ts b/src/backend/common/settings-manager.ts
new file mode 100644
index 000000000..fe6c6c68e
--- /dev/null
+++ b/src/backend/common/settings-manager.ts
@@ -0,0 +1,332 @@
+import { EventEmitter } from "events";
+import { JsonDB } from "node-json-db";
+import fs from "fs";
+import logger from "../logwrapper";
+import profileManager from "./profile-manager";
+import dataAccess from "./data-access";
+import frontendCommunicator from "./frontend-communicator";
+import {
+    FirebotAutoUpdateLevel,
+    FirebotGlobalSettings,
+    FirebotSettingsDefaults,
+    FirebotSettingsPaths,
+    FirebotSettingsTypes
+} from "../../types/settings";
+
+class SettingsManager extends EventEmitter {
+    settingsCache = {};
+
+    private getSettingsFile(): JsonDB {
+        return profileManager.getJsonDbInProfile("/settings");
+    }
+
+    private getGlobalSettingsFile(): JsonDB {
+        return dataAccess.getJsonDbInUserData("./global-settings");
+    }
+
+    private handleCorruptSettingsFile() {
+        logger.warn("settings.json file appears to be corrupt. Resetting file...");
+
+        const settingsPath = profileManager.getPathInProfile("settings.json");
+        fs.writeFileSync(settingsPath, JSON.stringify({
+            settings: {
+                firstTimeUse: false
+            }
+        }));
+    }
+
+    private getDataFromFile(settingPath: string, forceCacheUpdate = false, defaultValue = undefined) {
+        try {
+            if (this.settingsCache[settingPath] == null || forceCacheUpdate) {
+                const data = this.getSettingsFile().getData(settingPath);
+                this.settingsCache[settingPath] = data ?? defaultValue;
+            }
+        } catch (err) {
+            if (defaultValue !== undefined) {
+                this.settingsCache[settingPath] = defaultValue;
+            }
+            if (err.name !== "DataError") {
+                logger.warn(err);
+                if (
+                    err.name === "DatabaseError" &&
+                err.inner instanceof SyntaxError &&
+                err.inner.stack.includes("JSON.parse")
+                ) {
+                    this.handleCorruptSettingsFile();
+                }
+            }
+        }
+        return this.settingsCache[settingPath];
+    }
+
+    private getDataFromGlobalSettingsFile(settingPath: string, forceCacheUpdate = false, defaultValue = undefined) {
+        try {
+            if (this.settingsCache[settingPath] == null || forceCacheUpdate) {
+                const data = this.getGlobalSettingsFile().getData(settingPath);
+                this.settingsCache[settingPath] = data ?? defaultValue;
+            }
+        } catch (err) {
+            if (defaultValue !== undefined) {
+                this.settingsCache[settingPath] = defaultValue;
+            }
+            if (err.name !== "DataError") {
+                logger.warn(err);
+            }
+        }
+        return this.settingsCache[settingPath];
+    }
+
+    private pushDataToFile(settingPath: string, data: unknown) {
+        try {
+            this.getSettingsFile().push(settingPath, data);
+            this.settingsCache[settingPath] = data;
+            frontendCommunicator.send("settings:setting-updated", { settingPath, data });
+        } catch (err) {
+            logger.debug(err.message);
+        }
+    }
+
+    private pushDataToGlobalSettingsFile(settingPath: string, data: unknown) {
+        try {
+            this.getGlobalSettingsFile().push(settingPath, data);
+            this.settingsCache[settingPath] = data;
+            frontendCommunicator.send("settings:setting-updated", { settingPath, data });
+        } catch (err) {
+            logger.debug(err.message);
+        }
+    }
+
+    private deleteDataAtPath(settingPath: string) {
+        try {
+            this.getSettingsFile().delete(settingPath);
+            delete this.settingsCache[settingPath];
+            frontendCommunicator.send("settings:setting-deleted", settingPath);
+        } catch { }
+    }
+
+    /**
+     * Get the JSON data path for a specific Firebot setting in the settings file
+     *
+     * @param settingName Name of the setting
+     * @returns String representing the full JSON path of the setting data
+     */
+    getSettingPath(settingName: string) {
+        return FirebotSettingsPaths[settingName] ?? `/settings/${settingName[0].toLowerCase()}${settingName.slice(1)}`;
+    }
+
+    /**
+     * Get a Firebot setting value or its default
+     *
+     * @param settingName Name of the setting to get
+     * @param forceCacheUpdate Force an update to the settings cache. Defaults to `false`.
+     * @returns Setting value, or the default if one isn't explicitly set
+     */
+    getSetting<SettingName extends keyof FirebotSettingsTypes>(settingName: SettingName, forceCacheUpdate = false): FirebotSettingsTypes[SettingName] {
+        let value: FirebotSettingsTypes[SettingName];
+
+        if (FirebotGlobalSettings[settingName] === true) {
+            value = this.getDataFromGlobalSettingsFile(this.getSettingPath(settingName), forceCacheUpdate, FirebotSettingsDefaults[settingName]);
+        } else {
+            value = this.getDataFromFile(this.getSettingPath(settingName), forceCacheUpdate, FirebotSettingsDefaults[settingName]);
+        }
+
+        // Eventually, when we upgrade node-json-db, the library will handle this for us
+        if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/m.exec(value)) {
+            // This is a load-bearing cast
+            return new Date(value) as FirebotSettingsTypes[SettingName];
+        }
+
+        return value;
+    }
+
+    /**
+     * Save a Firebot setting
+     *
+     * @param settingName Name of the setting to save
+     * @param data Setting data
+     */
+    saveSetting<SettingName extends keyof FirebotSettingsTypes>(settingName: SettingName, data: FirebotSettingsTypes[SettingName]): void {
+        if (FirebotGlobalSettings[settingName] === true) {
+            this.pushDataToGlobalSettingsFile(this.getSettingPath(settingName), data);
+        } else {
+            this.pushDataToFile(this.getSettingPath(settingName), data);
+        }
+        this.emit(`settings:setting-saved:${settingName}`, data);
+    }
+
+    /**
+     * Delete a Firebot setting
+     *
+     * @param settingName Name of the setting to delete
+     */
+    deleteSetting<SettingName extends keyof FirebotSettingsTypes>(settingName: SettingName) {
+        this.deleteDataAtPath(this.getSettingPath(settingName));
+        this.emit(`settings:setting-deleted:${settingName}`);
+    }
+
+    /**
+     * Get a plugin setting or its default
+     *
+     * @param pluginName Name of the plugin
+     * @param settingName Name of the setting
+     * @param forceCacheUpdate Force an update to the settings cache. Defaults to `false`.
+     * @param defaultValue The default value to return if one isn't explicitly defined
+     * @returns The saved plugin setting value, or the default if it doesn't exist.
+     */
+    getPluginSetting(pluginName: string, settingName: string, forceCacheUpdate = false, defaultValue: unknown = undefined) {
+        return this.getDataFromFile(`/plugins/${pluginName}/${settingName}`, forceCacheUpdate, defaultValue);
+    }
+
+    /**
+     * Flushes the settings cache, forcing all settings to be retrieved from file on the next retrieval
+     */
+    flushSettingsCache() {
+        this.settingsCache = {};
+        frontendCommunicator.send("settings:settings-cache-flushed");
+    }
+
+
+    // Everything below this is deprecated. Leaving them for back compat with scripts.
+    // You should use either getSetting or saveSetting with the relevant setting name.
+
+    /** @deprecated Use `getSetting("EventSettings")` instead */
+    getEventSettings = () => this.getSetting("EventSettings");
+
+    /** @deprecated Use `getSetting("IgnoreSubsequentSubEventsAfterCommunitySub")` instead */
+    ignoreSubsequentSubEventsAfterCommunitySub = () => this.getSetting("IgnoreSubsequentSubEventsAfterCommunitySub");
+
+    /** @deprecated Use `getSetting("JustUpdated")` instead */
+    hasJustUpdated = (): boolean => this.getSetting("JustUpdated");
+
+    /** @deprecated Use `saveSetting("JustUpdated", value)` instead */
+    setJustUpdated = (value: boolean) => this.saveSetting("JustUpdated", value);
+
+    /** @deprecated Use `getSetting("CopiedOverlayVersion")` instead */
+    getOverlayVersion = () => this.getSetting("CopiedOverlayVersion");
+
+    /** @deprecated Use `saveSetting("CopiedOverlayVersion", value)` instead */
+    setOverlayVersion = (value: string) => this.saveSetting("CopiedOverlayVersion", value);
+
+    /** @deprecated Use `getSetting("ClearCustomScriptCache")` instead */
+    getClearCustomScriptCache = () => this.getSetting("ClearCustomScriptCache");
+
+    /** @deprecated Use `saveSetting("ClearCustomScriptCache", value)` instead */
+    setClearCustomScriptCache = (value: boolean) => this.saveSetting("ClearCustomScriptCache", value);
+
+    /** @deprecated Use `getSetting("RunCustomScripts")` instead */
+    isCustomScriptsEnabled = () => this.getSetting("RunCustomScripts");
+
+    /** @deprecated Use `getSetting("RunCustomScripts")` instead */
+    getCustomScriptsEnabled = () => this.getSetting("RunCustomScripts");
+
+    /** @deprecated Use `saveSetting("RunCustomScripts", value)` instead */
+    setCustomScriptsEnabled = (value: boolean) => this.saveSetting("RunCustomScripts", value);
+
+    /** @deprecated Use `getSetting("PersistCustomVariables")` instead */
+    getPersistCustomVariables = () => this.getSetting("PersistCustomVariables");
+
+    /** @deprecated Use `saveSetting("PersistCustomVariables", value)` instead */
+    setPersistCustomVariables = (value: boolean) => this.saveSetting("PersistCustomVariables", value);
+
+    /** @deprecated Use `getSetting("UseOverlayInstances")` instead */
+    useOverlayInstances = (): boolean => this.getSetting("UseOverlayInstances");
+
+    /** @deprecated Use `saveSetting("UseOverlayInstances", value)` instead */
+    setUseOverlayInstances = (value: boolean) => this.saveSetting("UseOverlayInstances", value);
+
+    /** @deprecated Use `getSetting("OverlayInstances")` instead */
+    getOverlayInstances = () => this.getSetting("OverlayInstances");
+
+    /** @deprecated Use `saveSetting("OverlayInstances", value)` instead */
+    setOverlayInstances = (value: string[]) => this.saveSetting("OverlayInstances", value);
+
+    /** @deprecated Use `getSetting("BackupKeepAll")` instead */
+    backupKeepAll = () => this.getSetting("BackupKeepAll");
+
+    /** @deprecated Use `getSetting("BackupOnExit")` instead */
+    backupOnExit = () => this.getSetting("BackupOnExit");
+
+    /** @deprecated Use `getSetting("BackupBeforeUpdates")` instead */
+    backupBeforeUpdates = () => this.getSetting("BackupBeforeUpdates");
+
+    /** @deprecated Use `getSetting("BackupOnceADay")` instead */
+    backupOnceADay = () => this.getSetting("BackupOnceADay");
+
+    /** @deprecated Use `saveSetting("BackupOnceADay", value)` instead */
+    setBackupOnceADay = (value: boolean) => this.saveSetting("BackupOnceADay", value);
+
+    /** @deprecated Use `getSetting("LastBackupDate")` instead */
+    lastBackupDate = () => this.getSetting("LastBackupDate");
+
+    /** @deprecated Use `saveSetting("LastBackupDate", value)` instead */
+    setLastBackupDate = (value: Date) => this.saveSetting("LastBackupDate", value);
+
+    /** @deprecated Use `getSetting("MaxBackupCount")` instead */
+    maxBackupCount = () => this.getSetting("MaxBackupCount");
+
+    /** @deprecated Use `getSetting("MaxBackupCount")` instead */
+    setMaxBackupCount = (value: number) => this.saveSetting("MaxBackupCount", value);
+
+    /** @deprecated Use `getSetting("AllowQuoteCSVDownloads")` instead */
+    getAllowQuoteCSVDownloads = () => this.getSetting("AllowQuoteCSVDownloads");
+
+    /** @deprecated Use `getSetting("ActiveChatUserListTimeout")` instead */
+    getActiveChatUserListTimeout = () => this.getSetting("ActiveChatUserListTimeout");
+
+    /** @deprecated Use `getSetting("WebServerPort")` instead */
+    getWebSocketPort = () => this.getSetting("WebServerPort");
+
+    /** @deprecated Use `getSetting("WebServerPort")` instead */
+    getWebServerPort = () => this.getSetting("WebServerPort");
+
+    /** @deprecated Use `getSetting("ViewerDB")` instead */
+    getViewerDbStatus = () => this.getSetting("ViewerDB");
+
+    /** @deprecated Use `getSetting("AutoUpdateLevel")` instead */
+    getAutoUpdateLevel = (): FirebotAutoUpdateLevel => this.getSetting("AutoUpdateLevel");
+
+    /** @deprecated Use `getSetting("AudioOutputDevice")` instead */
+    getAudioOutputDevice = () => this.getSetting("AudioOutputDevice");
+
+    /** @deprecated Use `getSetting("DebugMode")` instead */
+    debugModeEnabled = (): boolean => this.getSetting("DebugMode");
+
+    /** @deprecated Use `getSetting("WhileLoopEnabled")` instead */
+    getWhileLoopEnabled = (): boolean => this.getSetting("WhileLoopEnabled");
+
+    /** @deprecated Use `saveSetting("WhileLoopEnabled", value)` instead */
+    setWhileLoopEnabled = (value: boolean) => this.saveSetting("WhileLoopEnabled", value);
+
+    /** @deprecated Use `getSetting("SidebarControlledServices")` instead */
+    getSidebarControlledServices = (): string[] => this.getSetting("SidebarControlledServices");
+
+    /** @deprecated Use `getSetting("MinimizeToTray")` instead */
+    getMinimizeToTray = () => this.getSetting("MinimizeToTray");
+
+    /** @deprecated Use `saveSetting("MinimizeToTray", value)` instead */
+    setMinimizeToTray = (value: boolean) => this.saveSetting("MinimizeToTray", value);
+}
+
+const settings = new SettingsManager();
+
+frontendCommunicator.on("settings:get-setting-path", (settingName: keyof FirebotSettingsTypes) => {
+    return settings.getSettingPath(settingName);
+});
+
+frontendCommunicator.on("settings:get-setting", (settingName: keyof FirebotSettingsTypes) => {
+    return settings.getSetting(settingName);
+});
+
+frontendCommunicator.on("settings:save-setting", (request: { settingName: keyof FirebotSettingsTypes, data: FirebotSettingsTypes[keyof FirebotSettingsTypes] }) => {
+    settings.saveSetting(request.settingName, request.data);
+});
+
+frontendCommunicator.on("settings:delete-setting", (settingName: keyof FirebotSettingsTypes) => {
+    settings.deleteSetting(settingName);
+});
+
+frontendCommunicator.on("settings:flush-settings-cache", () => {
+    settings.flushSettingsCache();
+});
+
+export { settings as SettingsManager };
diff --git a/src/backend/currency/currency-access.ts b/src/backend/currency/currency-access.ts
index 233e1437f..feecee257 100644
--- a/src/backend/currency/currency-access.ts
+++ b/src/backend/currency/currency-access.ts
@@ -2,7 +2,7 @@ import { FirebotViewer } from "../../types/viewers";
 
 import logger from "../logwrapper";
 import frontendCommunicator from "../common/frontend-communicator";
-import { settings } from "../common/settings-access";
+import { SettingsManager } from "../common/settings-manager";
 import profileManager from "../common/profile-manager";
 
 export type Currency = {
@@ -38,7 +38,7 @@ class CurrencyAccess {
     }
 
     isViewerDBOn(): boolean {
-        return settings.getViewerDbStatus();
+        return SettingsManager.getSetting("ViewerDB");
     }
 
     refreshCurrencyCache(): void {
diff --git a/src/backend/effects/builtin/celebration.js b/src/backend/effects/builtin/celebration.js
index ee4aa56f5..4f7ee578f 100644
--- a/src/backend/effects/builtin/celebration.js
+++ b/src/backend/effects/builtin/celebration.js
@@ -1,8 +1,8 @@
 "use strict";
 
 const webServer = require("../../../server/http-server-manager");
-const { EffectCategory, EffectDependency } = require('../../../shared/effect-constants');
-const { settings } = require("../../common/settings-access");
+const { EffectCategory } = require('../../../shared/effect-constants');
+const { SettingsManager } = require("../../common/settings-manager");
 
 /**
  * The Celebration effect
@@ -100,9 +100,9 @@ const celebration = {
             celebrationDuration: celebrationDuration
         };
 
-        if (settings.useOverlayInstances()) {
+        if (SettingsManager.getSetting("UseOverlayInstances")) {
             if (effect.overlayInstance != null) {
-                if (settings.getOverlayInstances().includes(effect.overlayInstance)) {
+                if (SettingsManager.getSetting("OverlayInstances").includes(effect.overlayInstance)) {
                     data.overlayInstance = effect.overlayInstance;
                 }
             }
diff --git a/src/backend/effects/builtin/clear-effects.js b/src/backend/effects/builtin/clear-effects.js
index 58e05f825..e03b5fb8d 100644
--- a/src/backend/effects/builtin/clear-effects.js
+++ b/src/backend/effects/builtin/clear-effects.js
@@ -4,7 +4,7 @@ const webServer = require("../../../server/http-server-manager");
 const frontendCommunicator = require("../../common/frontend-communicator");
 const effectQueueRunner = require("../../effects/queues/effect-queue-runner");
 const { EffectCategory } = require('../../../shared/effect-constants');
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 const { abortAllEffectLists } = require("../../common/effect-abort-helpers");
 
 /**
@@ -39,7 +39,7 @@ const delay = {
                 label="Overlay Effects"
                 model="effect.overlay"
             />
-            <div class="mt-0 mr-0 mb-6 ml-6" uib-collapse="!effect.overlay || !settings.useOverlayInstances()">
+            <div class="mt-0 mr-0 mb-6 ml-6" uib-collapse="!effect.overlay || !settings.getSetting('UseOverlayInstances')">
                 <div class="btn-group">
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <span class="chat-effect-type">{{ getSelectedOverlayDisplay() }}</span> <span class="caret"></span>
@@ -90,7 +90,7 @@ const delay = {
     optionsController: ($scope, effectQueuesService, settingsService) => {
         $scope.settings = settingsService;
         $scope.effectQueues = effectQueuesService.getEffectQueues() || [];
-        $scope.overlayInstances = settingsService.getOverlayInstances() || [];
+        $scope.overlayInstances = settingsService.getSetting("OverlayInstances") || [];
 
         if ($scope.effect.overlayInstance != null && $scope.effect.overlayInstance !== "all") {
             if (!$scope.overlayInstances.includes($scope.effect.overlayInstance)) {
@@ -148,7 +148,7 @@ const delay = {
     /**
    * When the effect is triggered by something
    */
-    onTriggerEvent: async event => {
+    onTriggerEvent: async (event) => {
         const effect = event.effect;
 
         if (effect.queues) {
@@ -166,7 +166,7 @@ const delay = {
         }
 
         if (effect.overlay) {
-            if (settings.useOverlayInstances() && effect.overlayInstance != null) {
+            if (SettingsManager.getSetting("UseOverlayInstances") && effect.overlayInstance != null) {
                 if (effect.overlayInstance === "all") {
                     webServer.sendToOverlay("OVERLAY:REFRESH", { global: true });
 
diff --git a/src/backend/effects/builtin/clips.js b/src/backend/effects/builtin/clips.js
index 6adb4150d..1cd89a7ee 100644
--- a/src/backend/effects/builtin/clips.js
+++ b/src/backend/effects/builtin/clips.js
@@ -2,7 +2,7 @@
 
 const clipProcessor = require("../../common/handlers/createClipProcessor");
 const { EffectCategory, EffectDependency } = require('../../../shared/effect-constants');
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 const mediaProcessor = require("../../common/handlers/mediaProcessor");
 const webServer = require("../../../server/http-server-manager");
 const utils = require("../../utility");
@@ -202,9 +202,9 @@ const clip = {
                 }
 
                 let overlayInstance = null;
-                if (settings.useOverlayInstances()) {
+                if (SettingsManager.getSetting("UseOverlayInstances")) {
                     if (effect.overlayInstance != null) {
-                        if (settings.getOverlayInstances().includes(effect.overlayInstance)) {
+                        if (SettingsManager.getSetting("OverlayInstances").includes(effect.overlayInstance)) {
                             overlayInstance = effect.overlayInstance;
                         }
                     }
diff --git a/src/backend/effects/builtin/html.js b/src/backend/effects/builtin/html.js
index 6feb25157..06febf522 100644
--- a/src/backend/effects/builtin/html.js
+++ b/src/backend/effects/builtin/html.js
@@ -1,8 +1,8 @@
 "use strict";
 
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 const webServer = require("../../../server/http-server-manager");
-const { EffectCategory, EffectDependency } = require('../../../shared/effect-constants');
+const { EffectCategory } = require('../../../shared/effect-constants');
 
 /**
  * The HTML effect
@@ -99,7 +99,7 @@ const html = {
    * When the effect is triggered by something
    * Used to validate fields in the option template.
    */
-    optionsValidator: effect => {
+    optionsValidator: (effect) => {
         const errors = [];
         if (effect.html == null) {
             errors.push("Please enter some HTML to show in the overlay.");
@@ -112,7 +112,7 @@ const html = {
     /**
    * When the effect is triggered by something
    */
-    onTriggerEvent: async event => {
+    onTriggerEvent: async (event) => {
         // What should this do when triggered.
         const effect = event.effect;
 
@@ -136,9 +136,9 @@ const html = {
             exitDuration: effect.exitDuration
         };
 
-        if (settings.useOverlayInstances()) {
+        if (SettingsManager.getSetting("UseOverlayInstances")) {
             if (effect.overlayInstance != null) {
-                if (settings.getOverlayInstances().includes(effect.overlayInstance)) {
+                if (SettingsManager.getSetting("OverlayInstances").includes(effect.overlayInstance)) {
                     data.overlayInstance = effect.overlayInstance;
                 }
             }
@@ -157,7 +157,7 @@ const html = {
         },
         event: {
             name: "html",
-            onOverlayEvent: event => {
+            onOverlayEvent: (event) => {
                 // The absolute position prevents the html effect from always being underneath other effects.
                 const element = $(event.html).css({"position": "absolute"});
 
diff --git a/src/backend/effects/builtin/loop-effects.js b/src/backend/effects/builtin/loop-effects.js
index 16b326ee3..fdd0d4b58 100644
--- a/src/backend/effects/builtin/loop-effects.js
+++ b/src/backend/effects/builtin/loop-effects.js
@@ -3,7 +3,7 @@
 const effectRunner = require("../../common/effect-runner");
 const { EffectCategory } = require('../../../shared/effect-constants');
 const logger = require("../../logwrapper");
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 const conditionManager = require("./conditional-effects/conditions/condition-manager");
 
 const wait = ms => new Promise(r => setTimeout(r, ms));
@@ -69,7 +69,7 @@ const model = {
    */
     optionsController: ($scope, settingsService) => {
 
-        $scope.whileLoopEnabled = settingsService.getWhileLoopEnabled();
+        $scope.whileLoopEnabled = settingsService.getSetting("WhileLoopEnabled");
 
         if ($scope.effect.effectList == null) {
             $scope.effect.effectList = [];
@@ -111,7 +111,7 @@ const model = {
                 return resolve(true);
             }
 
-            if (effect.loopMode === 'conditional' && !settings.getWhileLoopEnabled()) {
+            if (effect.loopMode === 'conditional' && !SettingsManager.getSetting("WhileLoopEnabled")) {
                 return resolve(true);
             }
 
diff --git a/src/backend/effects/builtin/play-sound.js b/src/backend/effects/builtin/play-sound.js
index d5fde51cd..b5d1990d6 100644
--- a/src/backend/effects/builtin/play-sound.js
+++ b/src/backend/effects/builtin/play-sound.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 const resourceTokenManager = require("../../resourceTokenManager");
 const webServer = require("../../../server/http-server-manager");
 const fs = require('fs/promises');
@@ -133,7 +133,7 @@ const playSound = {
         // Set output device.
         let selectedOutputDevice = effect.audioOutputDevice;
         if (selectedOutputDevice == null || selectedOutputDevice.label === "App Default") {
-            selectedOutputDevice = settings.getAudioOutputDevice();
+            selectedOutputDevice = SettingsManager.getSetting("AudioOutputDevice");
         }
         data.audioOutputDevice = selectedOutputDevice;
 
@@ -161,7 +161,7 @@ const playSound = {
                 });
 
                 if (selectedOutputDevice.deviceId === "overlay"
-                    && settings.getForceOverlayEffectsToContinueOnRefresh() === true) {
+                    && SettingsManager.getSetting("ForceOverlayEffectsToContinueOnRefresh") === true) {
                     let currentDuration = 0;
                     let returnNow = false;
                     const overlayInstance = effect.overlayInstance ?? "Default";
diff --git a/src/backend/effects/builtin/play-video.js b/src/backend/effects/builtin/play-video.js
index 2e4bef5a1..60b63ab50 100644
--- a/src/backend/effects/builtin/play-video.js
+++ b/src/backend/effects/builtin/play-video.js
@@ -1,10 +1,10 @@
 "use strict";
 
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 const resourceTokenManager = require("../../resourceTokenManager");
 const webServer = require("../../../server/http-server-manager");
 const mediaProcessor = require("../../common/handlers/mediaProcessor");
-const { EffectCategory, EffectDependency } = require('../../../shared/effect-constants');
+const { EffectCategory } = require('../../../shared/effect-constants');
 const logger = require("../../logwrapper");
 const accountAccess = require("../../common/account-access");
 const util = require("../../utility");
@@ -397,9 +397,9 @@ const playVideo = {
             }
         }
 
-        if (settings.useOverlayInstances()) {
+        if (SettingsManager.getSetting("UseOverlayInstances")) {
             if (effect.overlayInstance != null) {
-                if (settings.getOverlayInstances().includes(effect.overlayInstance)) {
+                if (SettingsManager.getSetting("OverlayInstances").includes(effect.overlayInstance)) {
                     data.overlayInstance = effect.overlayInstance;
                 }
             }
@@ -408,7 +408,7 @@ const playVideo = {
         const overlayInstance = data.overlayInstance ?? "Default";
 
         async function waitFunction(duration) {
-            if (settings.getForceOverlayEffectsToContinueOnRefresh() === true) {
+            if (SettingsManager.getSetting("ForceOverlayEffectsToContinueOnRefresh") === true) {
                 let currentDuration = 0;
                 let returnNow = false;
 
diff --git a/src/backend/effects/builtin/random-reddit-image.js b/src/backend/effects/builtin/random-reddit-image.js
index b60d0448b..b6677e827 100644
--- a/src/backend/effects/builtin/random-reddit-image.js
+++ b/src/backend/effects/builtin/random-reddit-image.js
@@ -3,7 +3,7 @@
 const redditProcessor = require("../../common/handlers/redditProcessor");
 const twitchChat = require("../../chat/twitch-chat");
 const mediaProcessor = require("../../common/handlers/mediaProcessor");
-const settings = require("../../common/settings-access").settings;
+const { SettingsManager } = require("../../common/settings-manager");
 const logger = require("../../logwrapper");
 const webServer = require("../../../server/http-server-manager");
 const { EffectCategory } = require('../../../shared/effect-constants');
@@ -132,11 +132,11 @@ const model = {
                 };
 
 
-                if (settings.useOverlayInstances()) {
+                if (SettingsManager.getSetting("UseOverlayInstances")) {
                     if (event.effect.overlayInstance != null) {
                         if (
-                            settings
-                                .getOverlayInstances()
+                            SettingsManager
+                                .getSetting("OverlayInstances")
                                 .includes(event.effect.overlayInstance)
                         ) {
                             data.overlayInstance = event.effect.overlayInstance;
diff --git a/src/backend/effects/builtin/shoutout.js b/src/backend/effects/builtin/shoutout.js
index a7a4da903..83bbb544f 100644
--- a/src/backend/effects/builtin/shoutout.js
+++ b/src/backend/effects/builtin/shoutout.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 const mediaProcessor = require("../../common/handlers/mediaProcessor");
 const webServer = require("../../../server/http-server-manager");
 const twitchApi = require("../../twitch-api/api");
@@ -248,9 +248,9 @@ const effect = {
             effect.position = mediaProcessor.randomLocation();
         }
 
-        if (settings.useOverlayInstances()) {
+        if (SettingsManager.getSetting("UseOverlayInstances")) {
             if (effect.overlayInstance != null) {
-                if (!settings.getOverlayInstances().includes(effect.overlayInstance)) {
+                if (!SettingsManager.getSetting("OverlayInstances").includes(effect.overlayInstance)) {
                     effect.overlayInstance = null;
                 }
             }
diff --git a/src/backend/effects/builtin/show-image.js b/src/backend/effects/builtin/show-image.js
index 66889af72..8b29ca0b3 100644
--- a/src/backend/effects/builtin/show-image.js
+++ b/src/backend/effects/builtin/show-image.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 const resourceTokenManager = require("../../resourceTokenManager");
 const mediaProcessor = require("../../common/handlers/mediaProcessor");
 const webServer = require("../../../server/http-server-manager");
@@ -65,9 +65,9 @@ const showImage = {
         </div>
     </div>
     </div>
-    
+
     <eos-overlay-dimensions effect="effect" pad-top="true"></eos-overlay-dimensions>
-   
+
     <eos-overlay-position effect="effect" class="setting-padtop"></eos-overlay-position>
 
     <div class="effect-setting-container setting-padtop">
@@ -187,9 +187,9 @@ const showImage = {
             imageRotation: effect.rotation ? effect.rotation + effect.rotType : "0deg"
         };
 
-        if (settings.useOverlayInstances()) {
+        if (SettingsManager.getSetting("UseOverlayInstances")) {
             if (effect.overlayInstance != null) {
-                if (settings.getOverlayInstances().includes(effect.overlayInstance)) {
+                if (SettingsManager.getSetting("OverlayInstances").includes(effect.overlayInstance)) {
                     data.overlayInstance = effect.overlayInstance;
                 }
             }
diff --git a/src/backend/effects/builtin/show-text.js b/src/backend/effects/builtin/show-text.js
index c4ccc3506..04a465b8d 100644
--- a/src/backend/effects/builtin/show-text.js
+++ b/src/backend/effects/builtin/show-text.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const { settings } = require("../../common/settings-access");
+const { SettingsManager } = require("../../common/settings-manager");
 const webServer = require("../../../server/http-server-manager");
 const logger = require("../../logwrapper");
 const { EffectCategory } = require('../../../shared/effect-constants');
@@ -141,7 +141,7 @@ const showText = {
         $scope.editorClass = "text-editor-white-bg";
 
         $scope.editorSettings = {
-            editorBackground: settingsService.getWysiwygBackground()
+            editorBackground: settingsService.getSetting("WysiwygBackground")
         };
 
         function updateEditorClass() {
@@ -154,7 +154,7 @@ const showText = {
         updateEditorClass();
 
         $scope.editorBackgroundChanged = function() {
-            settingsService.setWysiwygBackground($scope.editorSettings.editorBackground);
+            settingsService.saveSetting("WysiwygBackground", $scope.editorSettings.editorBackground);
             updateEditorClass();
         };
 
@@ -268,10 +268,10 @@ const showText = {
             dto.position = mediaProcessor.randomLocation(); //eslint-disable-line no-undef
         }
 
-        if (settings.useOverlayInstances()) {
+        if (SettingsManager.getSetting("UseOverlayInstances")) {
             if (dto.overlayInstance != null) {
                 //reset overlay if it doesnt exist
-                if (!settings.getOverlayInstances().includes(dto.overlayInstance)) {
+                if (!SettingsManager.getSetting("OverlayInstances").includes(dto.overlayInstance)) {
                     dto.overlayInstance = null;
                 }
             }
diff --git a/src/backend/events/twitch-events/gift-sub.ts b/src/backend/events/twitch-events/gift-sub.ts
index d48aefb46..ef1db1933 100644
--- a/src/backend/events/twitch-events/gift-sub.ts
+++ b/src/backend/events/twitch-events/gift-sub.ts
@@ -1,6 +1,6 @@
 import NodeCache from "node-cache";
 import { DateTime } from "luxon";
-import { settings } from "../../common/settings-access";
+import { SettingsManager } from "../../common/settings-manager";
 import eventManager from "../../events/EventManager";
 import logger from "../../logwrapper";
 
@@ -36,7 +36,7 @@ export function triggerSubGift(
     giftSubMonths: number,
     streak: number
 ): void {
-    if (settings.ignoreSubsequentSubEventsAfterCommunitySub()) {
+    if (SettingsManager.getSetting("IgnoreSubsequentSubEventsAfterCommunitySub")) {
         logger.debug(`Attempting to process community gift sub from ${gifterDisplayName} at ${DateTime.now().toFormat("HH:mm:ss:SSS")}`);
         const cacheKey = `${gifterDisplayName}:${subPlan}`;
 
diff --git a/src/backend/import/v4/areas/v4-overlay-instances-importer.js b/src/backend/import/v4/areas/v4-overlay-instances-importer.js
index 35f90a537..ab34b1455 100644
--- a/src/backend/import/v4/areas/v4-overlay-instances-importer.js
+++ b/src/backend/import/v4/areas/v4-overlay-instances-importer.js
@@ -3,7 +3,7 @@
 const path = require("path");
 const logger = require("../../../logwrapper");
 const importHelpers = require("../import-helpers");
-const { settings } = require("../../../common/settings-access");
+const { SettingsManager } = require("../../../common/settings-manager");
 
 
 async function checkForV4SettingsFile() {
@@ -29,12 +29,12 @@ exports.run = async () => {
 
         if (allV4Settings != null) {
             const useOverlayInstances = allV4Settings.settings.useOverlayInstances === true;
-            settings.setUseOverlayInstances(useOverlayInstances);
+            SettingsManager.saveSetting("UseOverlayInstances", useOverlayInstances);
 
             const overlayInstances = allV4Settings.settings.overlayInstances || [];
-            settings.setOverlayInstances(overlayInstances);
+            SettingsManager.saveSetting("OverlayInstances", overlayInstances);
 
-            settings.flushSettingsCache();
+            SettingsManager.flushSettingsCache();
         }
     }
 
diff --git a/src/backend/import/v4/areas/v4-scripts-importer.js b/src/backend/import/v4/areas/v4-scripts-importer.js
index cd7f98c94..bc72f788e 100644
--- a/src/backend/import/v4/areas/v4-scripts-importer.js
+++ b/src/backend/import/v4/areas/v4-scripts-importer.js
@@ -5,7 +5,7 @@ const logger = require("../../../logwrapper");
 const importHelpers = require("../import-helpers");
 const fse = require("fs-extra");
 const profileManager = require("../../../common/profile-manager");
-const { settings } = require("../../../common/settings-access");
+const { SettingsManager } = require("../../../common/settings-manager");
 
 const v4ScriptsPath = path.join(importHelpers.v4DataPath, "/scripts");
 const v5ScriptsPath = profileManager.getPathInProfile("/scripts");
@@ -45,9 +45,9 @@ exports.run = async () => {
 
         if (allV4Settings != null) {
             const runCustomScripts = allV4Settings.settings.runCustomScripts === true;
-            settings.setCustomScriptsEnabled(runCustomScripts);
+            SettingsManager.saveSetting("RunCustomScripts", runCustomScripts);
 
-            settings.flushSettingsCache();
+            SettingsManager.flushSettingsCache();
         }
 
     }
diff --git a/src/backend/integrations/builtin/aws/text-to-speech-polly-effect.js b/src/backend/integrations/builtin/aws/text-to-speech-polly-effect.js
index d833ec871..d9eac842f 100644
--- a/src/backend/integrations/builtin/aws/text-to-speech-polly-effect.js
+++ b/src/backend/integrations/builtin/aws/text-to-speech-polly-effect.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const { getPathInTmpDir } = require("../../../common/data-access");
-const { settings } = require("../../../common/settings-access");
+const { SettingsManager } = require("../../../common/settings-manager");
 const resourceTokenManager = require("../../../resourceTokenManager");
 const webServer = require("../../../../server/http-server-manager");
 const { v4: uuid } = require("uuid");
@@ -359,7 +359,7 @@ const playSound = {
         };
 
         $q.when(backendCommunicator.fireEventAsync("getAwsPollyVoices"))
-            .then(voices => {
+            .then((voices) => {
                 $scope.isFetchingVoices = false;
 
                 const voicesArray = voices.voices;
@@ -455,7 +455,7 @@ const playSound = {
             });
 
         $q.when(backendCommunicator.fireEventAsync("getAwsPollyLexicons"))
-            .then(lexicons => {
+            .then((lexicons) => {
                 $scope.isFetchingLexicons = false;
 
                 $scope.lexicons = lexicons.lexicons;
@@ -471,7 +471,7 @@ const playSound = {
     /**
    * When the effect is saved
    */
-    optionsValidator: effect => {
+    optionsValidator: (effect) => {
         const errors = [];
 
         if (effect.engine !== "standard" && effect.engine !== "neural") {
@@ -491,7 +491,7 @@ const playSound = {
     /**
    * When the effect is triggered by something
    */
-    onTriggerEvent: async event => {
+    onTriggerEvent: async (event) => {
         const effect = event.effect;
 
         const awsIntegration = integrationManager.getIntegrationDefinitionById("aws");
@@ -591,7 +591,7 @@ const playSound = {
         // Set output device.
         let selectedOutputDevice = effect.audioOutputDevice;
         if (selectedOutputDevice == null || selectedOutputDevice.label === "App Default") {
-            selectedOutputDevice = settings.getAudioOutputDevice();
+            selectedOutputDevice = SettingsManager.getSetting("AudioOutputDevice");
         }
         data.audioOutputDevice = selectedOutputDevice;
 
diff --git a/src/backend/integrations/integration-manager.js b/src/backend/integrations/integration-manager.js
index 22ad4b839..3d6918c29 100644
--- a/src/backend/integrations/integration-manager.js
+++ b/src/backend/integrations/integration-manager.js
@@ -5,7 +5,7 @@ const profileManager = require("../common/profile-manager");
 const authManager = require("../auth/auth-manager");
 const EventEmitter = require("events");
 const { shell } = require('electron');
-const { settings } = require('../common/settings-access');
+const { SettingsManager } = require('../common/settings-manager');
 const frontEndCommunicator = require('../common/frontend-communicator');
 const { setValuesForFrontEnd, buildSaveDataFromSettingValues } = require("../common/firebot-setting-helpers");
 
@@ -63,7 +63,7 @@ class IntegrationManager extends EventEmitter {
             global.renderWindow.webContents.send("integrationsUpdated");
         }
 
-        integration.integration.on("connected", id => {
+        integration.integration.on("connected", (id) => {
             renderWindow.webContents.send("integrationConnectionUpdate", {
                 id: id,
                 connected: true
@@ -72,7 +72,7 @@ class IntegrationManager extends EventEmitter {
             logger.info(`Successfully connected to ${id}`);
         });
 
-        integration.integration.on("disconnected", id => {
+        integration.integration.on("disconnected", (id) => {
             renderWindow.webContents.send("integrationConnectionUpdate", {
                 id: id,
                 connected: false
@@ -81,7 +81,7 @@ class IntegrationManager extends EventEmitter {
             logger.info(`Disconnected from ${id}`);
         });
 
-        integration.integration.on("reconnect", id => {
+        integration.integration.on("reconnect", (id) => {
             logger.debug(`Reconnecting to ${id}...`);
             this.connectIntegration(id);
         });
@@ -158,7 +158,7 @@ class IntegrationManager extends EventEmitter {
     getAllIntegrationDefinitions() {
         return this._integrations
             .map(i => i.definition)
-            .map(i => {
+            .map((i) => {
                 return {
                     id: i.id,
                     name: i.name,
@@ -210,7 +210,7 @@ class IntegrationManager extends EventEmitter {
         }
 
         if (int.definition.linkType === "auth") {
-            shell.openExternal(`http://localhost:${settings.getWebServerPort()}/api/v1/auth?providerId=${encodeURIComponent(int.definition.authProviderDetails.id)}`);
+            shell.openExternal(`http://localhost:${SettingsManager.getSetting("WebServerPort")}/api/v1/auth?providerId=${encodeURIComponent(int.definition.authProviderDetails.id)}`);
         } else if (int.definition.linkType === "id") {
             frontEndCommunicator.send("requestIntegrationAccountId", {
                 integrationId: int.definition.id,
@@ -419,7 +419,7 @@ ipcMain.on("disconnectIntegration", (event, integrationId) => {
     manager.disconnectIntegration(integrationId);
 });
 
-ipcMain.on("getAllIntegrationDefinitions", event => {
+ipcMain.on("getAllIntegrationDefinitions", (event) => {
     logger.info("got 'get all integrations' request");
     event.returnValue = manager.getAllIntegrationDefinitions();
 });
diff --git a/src/backend/quick-actions/quick-action-manager.js b/src/backend/quick-actions/quick-action-manager.js
index fd8c93827..f6cf25f5e 100644
--- a/src/backend/quick-actions/quick-action-manager.js
+++ b/src/backend/quick-actions/quick-action-manager.js
@@ -6,7 +6,7 @@ const effectRunner = require("../common/effect-runner");
 const presetEffectListManager = require("../effects/preset-lists/preset-effect-list-manager");
 const { EffectTrigger } = require("../../shared/effect-constants");
 const accountAccess = require("../common/account-access");
-const { settings } = require("../common/settings-access");
+const { SettingsManager } = require("../common/settings-manager");
 
 /** @typedef {import("../../shared/types").QuickActionDefinition} QuickActionDefinition */
 
@@ -55,10 +55,10 @@ class QuickActionManager extends JsonDbManager {
         if (!savedQuickAction) {
             return;
         }
-        const quickActionSettings = settings.getQuickActionSettings();
+        const quickActionSettings = SettingsManager.getSetting("QuickActions");
         if (!Object.keys(quickActionSettings).includes(quickAction.id)) {
             quickActionSettings[quickAction.id] = { enabled: true, position: Object.keys(quickActionSettings).length };
-            settings.setQuickActionSettings(quickActionSettings);
+            SettingsManager.saveSetting("QuickActions", quickActionSettings);
         }
         if (notify) {
             this.triggerUiRefresh();
@@ -68,9 +68,9 @@ class QuickActionManager extends JsonDbManager {
 
     deleteQuickAction(customQuickActionId) {
         if (super.deleteItem(customQuickActionId)) {
-            const quickActionSettings = settings.getQuickActionSettings();
+            const quickActionSettings = SettingsManager.getSetting("QuickActions");
             delete quickActionSettings[customQuickActionId];
-            settings.setQuickActionSettings(quickActionSettings);
+            SettingsManager.saveSetting("QuickActions", quickActionSettings);
         }
     }
 
diff --git a/src/backend/twitch-api/ad-manager.ts b/src/backend/twitch-api/ad-manager.ts
index 837c4544d..a25efb34c 100644
--- a/src/backend/twitch-api/ad-manager.ts
+++ b/src/backend/twitch-api/ad-manager.ts
@@ -4,7 +4,7 @@ import logger from "../logwrapper";
 import accountAccess from "../common/account-access";
 import twitchApi from "./api";
 import frontendCommunicator from "../common/frontend-communicator";
-import { settings } from "../common/settings-access";
+import { SettingsManager } from "../common/settings-manager";
 import eventManager from "../events/EventManager";
 
 class AdManager {
@@ -59,7 +59,7 @@ class AdManager {
                 duration: adSchedule.duration
             });
 
-            const upcomingTriggerMinutes = Number(settings.getTriggerUpcomingAdBreakMinutes());
+            const upcomingTriggerMinutes = Number(SettingsManager.getSetting("TriggerUpcomingAdBreakMinutes"));
             const minutesUntilNextAdBreak = this.secondsUntilNextAdBreak / 60;
 
             if (upcomingTriggerMinutes > 0
diff --git a/src/backend/twitch-api/stream-info-manager.ts b/src/backend/twitch-api/stream-info-manager.ts
index 99b96f5ac..3a801bd7d 100644
--- a/src/backend/twitch-api/stream-info-manager.ts
+++ b/src/backend/twitch-api/stream-info-manager.ts
@@ -2,7 +2,7 @@ import { DateTime } from "luxon";
 import axios from "axios";
 import logger from "../logwrapper";
 import accountAccess from "../common/account-access";
-import { settings } from "../common/settings-access";
+import { SettingsManager } from "../common/settings-manager";
 import frontendCommunicator from "../common/frontend-communicator";
 import TwitchApi from "./api";
 import {
@@ -93,7 +93,7 @@ class TwitchStreamInfoManager {
             this.streamInfo.viewers = stream.viewers;
             this.streamInfo.startedAt = stream.startDate;
 
-            if (settings.getWebOnlineCheckin() === true) {
+            if (SettingsManager.getSetting("WebOnlineCheckin") === true) {
                 await this.doWebCheckin();
             }
 
diff --git a/src/backend/viewers/viewer-database.ts b/src/backend/viewers/viewer-database.ts
index 927b83df5..819da270a 100644
--- a/src/backend/viewers/viewer-database.ts
+++ b/src/backend/viewers/viewer-database.ts
@@ -3,7 +3,7 @@ import Datastore from "@seald-io/nedb";
 import { DateTime } from "luxon";
 
 import { BasicViewer, FirebotViewer } from "../../types/viewers";
-import { settings } from "../common/settings-access";
+import { SettingsManager } from "../common/settings-manager";
 import logger from "../logwrapper";
 import profileManager from "../common/profile-manager";
 import accountAccess from "../common/account-access";
@@ -138,7 +138,7 @@ class ViewerDatabase extends EventEmitter {
      * @returns `true` if the viewer database is enabled, or `false` otherwise
      */
     isViewerDBOn(): boolean {
-        return settings.getViewerDbStatus();
+        return SettingsManager.getSetting("ViewerDB");
     }
 
     async connectViewerDatabase(): Promise<void> {
diff --git a/src/backend/viewers/viewer-online-status-manager.ts b/src/backend/viewers/viewer-online-status-manager.ts
index fcb0e79f5..13235f7c1 100644
--- a/src/backend/viewers/viewer-online-status-manager.ts
+++ b/src/backend/viewers/viewer-online-status-manager.ts
@@ -1,7 +1,7 @@
 import { BasicViewer, FirebotViewer } from "../../types/viewers";
 import logger from "../logwrapper";
 
-import { settings } from "../common/settings-access";
+import { SettingsManager } from "../common/settings-manager";
 import viewerDatabase from "./viewer-database";
 import chatRolesManager from "../roles/chat-roles-manager";
 import connectionManager from "../common/connection-manager";
@@ -100,7 +100,7 @@ class ViewerOnlineStatusManager {
                 lastSeen: now
             };
 
-            if (await chatRolesManager.userIsKnownBot(viewer.id) === true && settings.getAutoFlagBots()) {
+            if (await chatRolesManager.userIsKnownBot(viewer.id) === true && SettingsManager.getSetting("AutoFlagBots")) {
                 dbData.disableAutoStatAccrual = true;
                 dbData.disableActiveUserList = true;
             }
diff --git a/src/gui/app/app-main.js b/src/gui/app/app-main.js
index 5c32fb97c..7c9bbcd24 100644
--- a/src/gui/app/app-main.js
+++ b/src/gui/app/app-main.js
@@ -194,8 +194,8 @@
         connectionService.validateAccounts();
 
         ttsService.obtainVoices().then(() => {
-            if (settingsService.getDefaultTtsVoiceId() == null) {
-                settingsService.setDefaultTtsVoiceId(ttsService.getOsDefaultVoiceId());
+            if (settingsService.getSetting("DefaultTtsVoiceId") == null) {
+                settingsService.saveSetting("DefaultTtsVoiceId", ttsService.getOsDefaultVoiceId());
             }
         });
 
@@ -390,12 +390,12 @@
         //$scope.accounts = connectionService.accounts;
         //$scope.profiles = connectionService.profiles;
 
-        if (settingsService.hasJustUpdated()) {
+        if (settingsService.getSetting("JustUpdated")) {
             utilityService.showUpdatedModal();
-            settingsService.setJustUpdated(false);
-        } else if (settingsService.isFirstTimeUse()) {
+            settingsService.saveSetting("JustUpdated", false);
+        } else if (settingsService.getSetting("FirstTimeUse")) {
             utilityService.showSetupWizard();
-            settingsService.setFirstTimeUse(false);
+            settingsService.saveSetting("FirstTimeUse", false);
         }
 
         /**
@@ -415,7 +415,7 @@
 
         // Apply Theme
         $scope.appTheme = function() {
-            return settingsService.getTheme();
+            return settingsService.getSetting("Theme");
         };
 
         $rootScope.showSpinner = false;
@@ -516,7 +516,7 @@
 
     app.filter("hideBotMessages", function(settingsService, accountAccess) {
         return function(elements) {
-            const shouldHide = settingsService.chatHideBotAccountMessages();
+            const shouldHide = settingsService.getSetting("ChatHideBotAccountMessages");
             if (!shouldHide) {
                 return elements;
             }
@@ -533,7 +533,7 @@
 
     app.filter("hideWhispers", function(settingsService) {
         return function(elements) {
-            const shouldHide = settingsService.getChatHideWhispers();
+            const shouldHide = settingsService.getSetting("ChatHideWhispers");
             if (!shouldHide) {
                 return elements;
             }
diff --git a/src/gui/app/controllers/chat-messages.controller.js b/src/gui/app/controllers/chat-messages.controller.js
index f7d934157..acfde9dbb 100644
--- a/src/gui/app/controllers/chat-messages.controller.js
+++ b/src/gui/app/controllers/chat-messages.controller.js
@@ -44,7 +44,7 @@
             };
 
             $scope.updateLayoutSettings = (updatedSettings) => {
-                let settings = settingsService.getDashboardLayoutSettings();
+                let settings = settingsService.getSetting("DashboardLayout");
 
                 if (settings == null) {
                     settings = {
@@ -53,7 +53,7 @@
                         dashboardActivityFeed: "275px"
                     };
 
-                    settingsService.setDashboardLayoutSettings(settings);
+                    settingsService.saveSetting("DashboardLayout", settings);
                 }
 
                 if (updatedSettings) {
@@ -61,7 +61,7 @@
                         settings[key] = value;
                     });
 
-                    settingsService.setDashboardLayoutSettings(settings);
+                    settingsService.saveSetting("DashboardLayout", settings);
                 }
 
                 $scope.layout = settings;
@@ -72,17 +72,17 @@
             function getUpdatedChatSettings() {
                 $scope.updateLayoutSettings();
 
-                $scope.compactDisplay = settingsService.isChatCompactMode();
-                $scope.alternateBackgrounds = settingsService.chatAlternateBackgrounds();
-                $scope.hideDeletedMessages = settingsService.chatHideDeletedMessages();
-                $scope.showAvatars = settingsService.getShowAvatars();
-                $scope.showTimestamps = settingsService.getShowTimestamps();
-                $scope.showBttvEmotes = settingsService.getShowBttvEmotes();
-                $scope.showFfzEmotes = settingsService.getShowFfzEmotes();
-                $scope.showSevenTvEmotes = settingsService.getShowSevenTvEmotes();
-                $scope.showPronouns = settingsService.getShowPronouns();
-                $scope.customFontSizeEnabled = settingsService.getChatCustomFontSizeEnabled();
-                $scope.customFontSize = settingsService.getChatCustomFontSize();
+                $scope.compactDisplay = settingsService.getSetting("ChatCompactMode");
+                $scope.alternateBackgrounds = settingsService.getSetting("ChatAlternateBackgrounds");
+                $scope.hideDeletedMessages = settingsService.getSetting("ChatHideDeletedMessages");
+                $scope.showAvatars = settingsService.getSetting("ChatAvatars");
+                $scope.showTimestamps = settingsService.getSetting("ChatTimestamps");
+                $scope.showBttvEmotes = settingsService.getSetting("ChatShowBttvEmotes");
+                $scope.showFfzEmotes = settingsService.getSetting("ChatShowFfzEmotes");
+                $scope.showSevenTvEmotes = settingsService.getSetting("ChatShowSevenTvEmotes");
+                $scope.showPronouns = settingsService.getSetting("ChatPronouns");
+                $scope.customFontSizeEnabled = settingsService.getSetting("ChatCustomFontSizeEnabled");
+                $scope.customFontSize = settingsService.getSetting("ChatCustomFontSize");
                 $scope.customFontSizeStyle = $scope.customFontSizeEnabled ?
                     `font-size: ${$scope.customFontSize}px !important;` : "";
             }
diff --git a/src/gui/app/controllers/settings.controller.js b/src/gui/app/controllers/settings.controller.js
index 92299caef..10f8991ae 100644
--- a/src/gui/app/controllers/settings.controller.js
+++ b/src/gui/app/controllers/settings.controller.js
@@ -96,7 +96,7 @@
             };
 
             $scope.getSelectedVoiceName = () => {
-                const selectedVoiceId = settingsService.getDefaultTtsVoiceId();
+                const selectedVoiceId = settingsService.getSetting("DefaultTtsVoiceId");
                 const voice = ttsService.getVoiceById(selectedVoiceId);
                 return voice ? voice.name : "Unknown Voice";
             };
@@ -107,7 +107,7 @@
             }, {});
 
             $scope.ttsVolumeSlider = {
-                value: settingsService.getTtsVoiceVolume(),
+                value: settingsService.getSetting("TtsVoiceVolume"),
                 options: {
                     floor: 0,
                     ceil: 1,
@@ -117,20 +117,20 @@
                         return Math.floor(value * 10);
                     },
                     onChange: (_, value) => {
-                        settingsService.setTtsVoiceVolume(value);
+                        settingsService.saveSetting("TtsVoiceVolume", value);
                     }
                 }
             };
 
             $scope.ttsRateSlider = {
-                value: settingsService.getTtsVoiceRate(),
+                value: settingsService.getSetting("TtsVoiceRate"),
                 options: {
                     floor: 0.1,
                     ceil: 10,
                     step: 0.1,
                     precision: 1,
                     onChange: (_, value) => {
-                        settingsService.setTtsVoiceRate(value);
+                        settingsService.saveSetting("TtsVoiceRate", value);
                     }
                 }
             };
@@ -183,10 +183,10 @@
                 backupService.startBackup();
             };
 
-            $scope.currentMaxBackups = settingsService.maxBackupCount();
+            $scope.currentMaxBackups = settingsService.getSetting("MaxBackupCount");
 
             $scope.updateMaxBackups = function(option) {
-                settingsService.setMaxBackupCount(option);
+                settingsService.saveSetting("MaxBackupCount", option);
             };
 
             $scope.openDevTools = () => {
@@ -209,10 +209,10 @@
             };
 
             $scope.toggleWhileLoops = () => {
-                const whileLoopsEnabled = settingsService.getWhileLoopEnabled();
+                const whileLoopsEnabled = settingsService.getSetting("WhileLoopEnabled");
 
                 if (whileLoopsEnabled) {
-                    settingsService.setWhileLoopEnabled(false);
+                    settingsService.saveSetting("WhileLoopEnabled", false);
                 } else {
                     utilityService
                         .showConfirmationModal({
@@ -223,26 +223,12 @@
                         })
                         .then((confirmed) => {
                             if (confirmed) {
-                                settingsService.setWhileLoopEnabled(true);
+                                settingsService.saveSetting("WhileLoopEnabled", true);
                             }
                         });
                 }
             };
 
-            $scope.setActiveChatUsers = (value) => {
-                value = value === true;
-                settingsService.setActiveChatUsers(value);
-                ipcRenderer.send("setActiveChatUsers", value);
-            };
-
-            $scope.setActiveChatUserTimeout = (value) => {
-                if (value == null) {
-                    value = "10";
-                }
-                settingsService.setActiveChatUserListTimeout(value);
-                ipcRenderer.send('setActiveChatUserTimeout', value);
-            };
-
             $scope.audioOutputDevices = [{
                 label: "System Default",
                 deviceId: "default"
@@ -281,12 +267,12 @@
             }
             );
 
-            if (settingsService.getAutoUpdateLevel() > 3) {
-                settingsService.setAutoUpdateLevel(3);
+            if (settingsService.getSetting("AutoUpdateLevel") > 3) {
+                settingsService.saveSetting("AutoUpdateLevel", 3);
             }
 
             $scope.autoUpdateSlider = {
-                value: settingsService.getAutoUpdateLevel(),
+                value: settingsService.getSetting("AutoUpdateLevel"),
                 options: {
                     showSelectionBar: true,
                     showTicks: true,
@@ -312,7 +298,7 @@
                         return "orange";
                     },
                     onChange: function() {
-                        settingsService.setAutoUpdateLevel($scope.autoUpdateSlider.value);
+                        settingsService.saveSetting("AutoUpdateLevel", $scope.autoUpdateSlider.value);
                     }
                 }
             };
@@ -332,7 +318,7 @@
                 }
             };
 
-            $scope.currentPort = settingsService.getWebSocketPort();
+            $scope.currentPort = settingsService.getSetting("WebServerPort");
 
             /**
             * Modals
@@ -476,47 +462,5 @@
                 };
                 utilityService.showModal(showBackupListModalContext);
             };
-
-            $scope.showChangePortModal = function() {
-                const showChangePortModalContext = {
-                    templateUrl: "changePortModal.html",
-                    size: "sm",
-                    controllerFunc: ($scope, settingsService, $uibModalInstance) => {
-                        $scope.newPort = settingsService.getWebSocketPort();
-
-                        $scope.newPortError = false;
-
-                        // When the user clicks a call to action that will close the modal, such as "Save"
-                        $scope.changePort = function() {
-                            // validate port number
-                            const newPort = $scope.newPort;
-                            if (
-                                newPort == null ||
-                newPort === "" ||
-                newPort <= 1024 ||
-                newPort >= 49151
-                            ) {
-                                $scope.newPortError = true;
-                                return;
-                            }
-
-                            // Save port. This will save to both firebot and the overlay.
-                            settingsService.setWebSocketPort(newPort);
-
-                            $uibModalInstance.close(newPort);
-                        };
-
-                        // When they hit cancel, click the little x, or click outside the modal, we don't want to do anything.
-                        $scope.dismiss = function() {
-                            $uibModalInstance.dismiss("cancel");
-                        };
-                    },
-                    closeCallback: (port) => {
-                        // Update the local port scope var so setting input updates
-                        $scope.currentPort = port;
-                    }
-                };
-                utilityService.showModal(showChangePortModalContext);
-            };
         });
 }());
diff --git a/src/gui/app/controllers/viewers.controller.js b/src/gui/app/controllers/viewers.controller.js
index 41efdc2bf..5037770f5 100644
--- a/src/gui/app/controllers/viewers.controller.js
+++ b/src/gui/app/controllers/viewers.controller.js
@@ -7,7 +7,7 @@
         .controller("viewersController", function($route, $scope, viewersService, currencyService,
             utilityService, settingsService) {
 
-            $scope.viewerTablePageSize = settingsService.getViewerListPageSize();
+            $scope.viewerTablePageSize = settingsService.getSetting("ViewerListPageSize");
 
             $scope.showUserDetailsModal = (userId) => {
                 const closeFunc = () => {
diff --git a/src/gui/app/directives/chat/quick-actions/quick-actions.js b/src/gui/app/directives/chat/quick-actions/quick-actions.js
index 060825087..51604674e 100644
--- a/src/gui/app/directives/chat/quick-actions/quick-actions.js
+++ b/src/gui/app/directives/chat/quick-actions/quick-actions.js
@@ -64,10 +64,10 @@
                 $scope.quickActionsService = quickActionsService;
                 $scope.logger = logger;
 
-                $ctrl.settings = settingsService.getQuickActionSettings();
+                $ctrl.settings = settingsService.getSetting("QuickActions");
 
                 backendCommunicator.on("all-quick-actions", () => {
-                    $ctrl.settings = settingsService.getQuickActionSettings();
+                    $ctrl.settings = settingsService.getSetting("QuickActions");
                 });
 
                 $ctrl.triggerQuickAction = (quickActionId) => {
@@ -90,7 +90,7 @@
                             };
                         });
 
-                        settingsService.setQuickActionSettings($ctrl.settings);
+                        settingsService.saveSetting("QuickActions", $ctrl.settings);
                     } else {
                         let highestPosition = Math.max(...Object.values($ctrl.settings).map(s => s.position));
                         quickActionsService.quickActions.forEach((qa) => {
@@ -149,7 +149,7 @@
                             settings: () => $ctrl.settings
                         },
                         dismissCallback: () => {
-                            settingsService.setQuickActionSettings($ctrl.settings);
+                            settingsService.saveSetting("QuickActions", $ctrl.settings);
                         }
                     });
                 };
diff --git a/src/gui/app/directives/effect-option-settings/eosAudioOutputDevice.js b/src/gui/app/directives/effect-option-settings/eosAudioOutputDevice.js
index e7f44d04c..1b2609e86 100644
--- a/src/gui/app/directives/effect-option-settings/eosAudioOutputDevice.js
+++ b/src/gui/app/directives/effect-option-settings/eosAudioOutputDevice.js
@@ -49,7 +49,7 @@
                         };
                     }
 
-                    $q.when(navigator.mediaDevices.enumerateDevices()).then(deviceList => {
+                    $q.when(navigator.mediaDevices.enumerateDevices()).then((deviceList) => {
                         deviceList = deviceList
                             .filter(
                                 d =>
@@ -57,7 +57,7 @@
                 d.deviceId !== "communications" &&
                 d.deviceId !== "default"
                             )
-                            .map(d => {
+                            .map((d) => {
                                 return { label: d.label, deviceId: d.deviceId };
                             });
 
@@ -68,7 +68,7 @@
                     if (ctrl.effect.overlayInstance != null) {
                         if (
                             !settingsService
-                                .getOverlayInstances()
+                                .getSetting("OverlayInstances")
                                 .includes(ctrl.effect.overlayInstance)
                         ) {
                             ctrl.effect.overlayInstance = null;
diff --git a/src/gui/app/directives/effect-option-settings/eosOverlayInstance.js b/src/gui/app/directives/effect-option-settings/eosOverlayInstance.js
index a0026ef13..4c769b654 100644
--- a/src/gui/app/directives/effect-option-settings/eosOverlayInstance.js
+++ b/src/gui/app/directives/effect-option-settings/eosOverlayInstance.js
@@ -10,14 +10,14 @@
                 padTop: "<"
             },
             template: `
-            <eos-container header="Overlay Instance" pad-top="$ctrl.padTop" ng-if="$ctrl.settings.useOverlayInstances()">
+            <eos-container header="Overlay Instance" pad-top="$ctrl.padTop" ng-if="$ctrl.settings.getSetting('UseOverlayInstances')">
                 <div class="btn-group">
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <span class="chat-effect-type">{{$ctrl.effect.overlayInstance ? $ctrl.effect.overlayInstance : 'Default'}}</span> <span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu chat-effect-dropdown">
                         <li ng-click="$ctrl.effect.overlayInstance = null"><a href>Default</a></li>
-                        <li ng-repeat="instanceName in $ctrl.settings.getOverlayInstances()" ng-click="$ctrl.effect.overlayInstance = instanceName"><a href>{{instanceName}}</a></li>
+                        <li ng-repeat="instanceName in $ctrl.settings.getSetting('OverlayInstances')" ng-click="$ctrl.effect.overlayInstance = instanceName"><a href>{{instanceName}}</a></li>
                         <li class="divider"></li>
                         <li ng-click="$ctrl.showEditOverlayInstancesModal()"><a href>Edit Instances</a></li>
                     </ul>
@@ -34,7 +34,7 @@
                     if (ctrl.effect.overlayInstance != null) {
                         if (
                             !settingsService
-                                .getOverlayInstances()
+                                .getSetting("OverlayInstances")
                                 .includes(ctrl.effect.overlayInstance)
                         ) {
                             ctrl.effect.overlayInstance = null;
diff --git a/src/gui/app/directives/misc/stream-info.component.js b/src/gui/app/directives/misc/stream-info.component.js
index 8d62a062e..cf8548ff6 100644
--- a/src/gui/app/directives/misc/stream-info.component.js
+++ b/src/gui/app/directives/misc/stream-info.component.js
@@ -9,19 +9,19 @@
             bindings: {},
             template: `
                 <div ng-if="sis.streamInfo.isLive" class="stream-info-stats-wrapper">
-                    <div class="stream-info-stat" ng-show="settings.getShowUptimeStat()">
+                    <div class="stream-info-stat" ng-show="settings.getSetting('ShowUptimeStat')">
                         <span style="margin-right: 5px; background: red;display: inline-block;width: 12px;height: 12px;border-radius: 15px;"></span>
                         <span>{{sessionTimeDisplay}}</span>
                     </div>
 
-                    <div class="stream-info-stat" ng-show="settings.getShowViewerCountStat()" style="margin-left:10px">
+                    <div class="stream-info-stat" ng-show="settings.getSetting('ShowViewerCountStat')" style="margin-left:10px">
                         <i class="fas fa-user" style="margin-right: 5px; font-size: 12px;" />
                         <span>{{sis.streamInfo.viewers}}</span>
                     </div>
 
-                    <hype-train-indicator ng-if="settings.getShowHypeTrainIndicator() && hts.hypeTrainActive"></hype-train-indicator>
+                    <hype-train-indicator ng-if="settings.getSetting('ShowHypeTrainIndicator') && hts.hypeTrainActive"></hype-train-indicator>
 
-                    <ad-break-indicator ng-if="settings.getShowAdBreakIndicator() && abs.showAdBreakTimer"></ad-break-service>
+                    <ad-break-indicator ng-if="settings.getSetting('ShowAdBreakIndicator') && abs.showAdBreakTimer"></ad-break-service>
                 </div>
             `,
             controller: function($scope, streamInfoService, settingsService, hypeTrainService, adBreakService, $interval) {
diff --git a/src/gui/app/directives/modals/chat/chat-settings-modal.js b/src/gui/app/directives/modals/chat/chat-settings-modal.js
index 9f0981b93..5af48c1ea 100644
--- a/src/gui/app/directives/modals/chat/chat-settings-modal.js
+++ b/src/gui/app/directives/modals/chat/chat-settings-modal.js
@@ -13,17 +13,17 @@
                     <div class="chat-settings-header">Main Settings</div>
                     <div class="mt-4 mb-8 px-8">
                         <chat-settings-toggle
-                            setting="settings.getShowChatViewerList()"
+                            setting="settings.getSetting('ShowChatViewerList')"
                             title="Show Chat User List"
                             input-id="chatUserList"
-                            on-update="settings.setShowChatViewerList(setting)"
+                            on-update="settings.saveSetting('ShowChatViewerList', setting)"
                         ></chat-settings-toggle>
 
                         <chat-settings-toggle
-                            setting="settings.showActivityFeed()"
+                            setting="settings.getSetting('ShowActivityFeed')"
                             title="Show Activity Feed"
                             input-id="activityFeed"
-                            on-update="settings.setShowActivityFeed(setting)"
+                            on-update="settings.saveSetting('ShowActivityFeed', setting)"
                         ></chat-settings-toggle>
                     </div>
 
@@ -78,42 +78,42 @@
                         </div>
 
                         <chat-settings-toggle
-                            setting="settings.chatAlternateBackgrounds()"
+                            setting="settings.getSetting('ChatAlternateBackgrounds')"
                             title="Alternate Backgrounds"
                             input-id="alternateBackgrounds"
-                            on-update="settings.setChatAlternateBackgrounds(setting)"
+                            on-update="settings.saveSetting('ChatAlternateBackgrounds', setting)"
                         ></chat-settings-toggle>
 
                         <chat-settings-toggle
-                            setting="settings.getShowAvatars()"
+                            setting="settings.getSetting('ChatAvatars')"
                             title="Show Avatars"
                             input-id="showAvatars"
-                            on-update="settings.setShowAvatars(setting)"
+                            on-update="settings.saveSetting('ChatAvatars', setting)"
                         ></chat-settings-toggle>
 
                         <chat-settings-toggle
-                            setting="settings.getShowTimestamps()"
+                            setting="settings.getSetting('ChatTimestamps')"
                             title="Show Timestamps"
                             input-id="showTimestamps"
-                            on-update="settings.setShowTimestamps(setting)"
+                            on-update="settings.saveSetting('ChatTimestamps', setting)"
                         ></chat-settings-toggle>
 
                         <chat-settings-toggle
-                            setting="settings.getShowPronouns()"
+                            setting="settings.getSetting('ChatPronouns')"
                             title="Show Pronouns"
                             external-link="https://pronouns.alejo.io/"
                             input-id="showPronouns"
-                            on-update="settings.setShowPronouns(setting)"
+                            on-update="settings.saveSetting('ChatPronouns', setting)"
                         ></chat-settings-toggle>
 
                         <chat-settings-toggle
-                            setting="settings.getChatCustomFontSizeEnabled()"
+                            setting="settings.getSetting('ChatCustomFontSizeEnabled')"
                             title="Show Custom Font Size"
                             input-id="showCustomFontSize"
                             on-update="toggleCustomFontEnabled()"
                         ></chat-settings-toggle>
 
-                        <div class="volume-slider-wrapper" ng-show="settings.getChatCustomFontSizeEnabled()">
+                        <div class="volume-slider-wrapper" ng-show="settings.getSetting('ChatCustomFontSizeEnabled')">
                             <rzslider rz-slider-model="customFontSize" rz-slider-options="fontSliderOptions"></rzslider>
                         </div>
                     </div>
@@ -122,7 +122,7 @@
                     <div class="chat-settings-header">Emote Settings</div>
                     <div class="mt-4 mb-8 px-8">
                         <chat-settings-toggle
-                            setting="settings.getShowBttvEmotes()"
+                            setting="settings.getSetting('ChatShowBttvEmotes')"
                             title="Show BTTV Emotes"
                             external-link="https://betterttv.com/"
                             input-id="bttvEmotes"
@@ -130,7 +130,7 @@
                         ></chat-settings-toggle>
 
                         <chat-settings-toggle
-                            setting="settings.getShowFfzEmotes()"
+                            setting="settings.getSetting('ChatShowFfzEmotes')"
                             title="Show FFZ Emotes"
                             external-link="https://frankerfacez.com/"
                             input-id="ffzEmotes"
@@ -138,7 +138,7 @@
                         ></chat-settings-toggle>
 
                         <chat-settings-toggle
-                            setting="settings.getShowSevenTvEmotes()"
+                            setting="settings.getSetting('ChatShowSevenTvEmotes')"
                             title="Show 7TV Emotes"
                             external-link="https://7tv.app/"
                             input-id="sevenTvEmotes"
@@ -159,25 +159,25 @@
                         </div>
 
                         <chat-settings-toggle
-                            setting="settings.chatHideDeletedMessages()"
+                            setting="settings.getSetting('ChatHideDeletedMessages')"
                             title="Hide Deleted Messages"
                             tooltip="'Turning this on will cover deleted messages with a blackbox. Hovering over the message will reveal it. Great for letting your mods hide spoilers!'"
                             input-id="hideDeletedMessages"
-                            on-update="settings.setChatHideDeletedMessages(setting)"
+                            on-update="settings.saveSetting('ChatHideDeletedMessages', setting)"
                         ></chat-settings-toggle>
 
                         <chat-settings-toggle
-                            setting="settings.chatHideBotAccountMessages()"
+                            setting="settings.getSetting('ChatHideBotAccountMessages')"
                             title="Hide messages from Bot account"
                             input-id="hideBotMessages"
-                            on-update="settings.setChatHideBotAccountMessages(setting)"
+                            on-update="settings.saveSetting('ChatHideBotAccountMessages', setting)"
                         ></chat-settings-toggle>
 
                         <chat-settings-toggle
-                            setting="settings.getChatHideWhispers()"
+                            setting="settings.getSetting('ChatHideWhispers')"
                             title="Hide whispers in chat feed"
                             input-id="chatHideWhispers"
-                            on-update="settings.setChatHideWhispers(setting)"
+                            on-update="settings.saveSetting('ChatHideWhispers', setting)"
                         ></chat-settings-toggle>
                     </div>
 
@@ -201,25 +201,25 @@
                     onlyStreamer: "Only when I /clear",
                     always: "When I or mods /clear"
                 };
-                $scope.chatFeedMode = settingsService.getClearChatFeedMode();
-                $scope.setChatFeedMode = mode => settingsService.setClearChatFeedMode(mode);
+                $scope.chatFeedMode = settingsService.getSetting("ClearChatFeedMode");
+                $scope.setChatFeedMode = mode => settingsService.saveSetting("ClearChatFeedMode", mode);
 
-                $scope.compactMode = settingsService.isChatCompactMode();
+                $scope.compactMode = settingsService.getSetting("ChatCompactMode");
                 $scope.toggleCompactMode = function() {
                     $scope.compactMode = !$scope.compactMode;
-                    settingsService.setChatCompactMode($scope.compactMode);
+                    settingsService.saveSetting("ChatCompactMode", $scope.compactMode);
                 };
 
                 $scope.playNotification = function() {
                     soundService.playChatNotification();
                 };
 
-                $scope.selectedNotificationSound = settingsService.getTaggedNotificationSound();
+                $scope.selectedNotificationSound = settingsService.getSetting("ChatTaggedNotificationSound");
 
-                $scope.notificationVolume = settingsService.getTaggedNotificationVolume();
+                $scope.notificationVolume = settingsService.getSetting("ChatTaggedNotificationVolume");
 
                 $scope.volumeUpdated = function() {
-                    settingsService.setTaggedNotificationVolume($scope.notificationVolume);
+                    settingsService.saveSetting("ChatTaggedNotificationVolume", $scope.notificationVolume);
                 };
 
                 $scope.sliderOptions = {
@@ -248,7 +248,7 @@
                         $rootScope.$broadcast("rzSliderForceRender");
                     }, 50);
 
-                    settingsService.setTaggedNotificationSound({
+                    settingsService.saveSetting("ChatTaggedNotificationSound", {
                         name: sound.name,
                         path: sound.name === "Custom" ? sound.path : undefined
                     });
@@ -257,28 +257,28 @@
                 $scope.setShowThirdPartyEmotes = (party) => {
                     switch (party) {
                         case "bttv":
-                            settingsService.setShowBttvEmotes(!settingsService.getShowBttvEmotes());
+                            settingsService.saveSetting("ChatShowBttvEmotes", !settingsService.getSetting("ChatShowBttvEmotes"));
                             break;
                         case "ffz":
-                            settingsService.setShowFfzEmotes(!settingsService.getShowFfzEmotes());
+                            settingsService.saveSetting("ChatShowFfzEmotes", !settingsService.getSetting("ChatShowFfzEmotes"));
                             break;
                         case "7tv":
-                            settingsService.setShowSevenTvEmotes(!settingsService.getShowSevenTvEmotes());
+                            settingsService.saveSetting("ChatShowSevenTvEmotes", !settingsService.getSetting("ChatShowSevenTvEmotes"));
                     }
 
                     chatMessagesService.refreshEmotes();
                 };
 
                 $scope.toggleCustomFontEnabled = () => {
-                    settingsService.setChatCustomFontSizeEnabled(!settingsService.getChatCustomFontSizeEnabled());
+                    settingsService.saveSetting("ChatCustomFontSizeEnabled", !settingsService.getSetting("ChatCustomFontSizeEnabled"));
                     $timeout(() => {
                         $rootScope.$broadcast("rzSliderForceRender");
                     }, 50);
                 };
 
-                $scope.customFontSize = settingsService.getChatCustomFontSize();
+                $scope.customFontSize = settingsService.getSetting("ChatCustomFontSize");
                 $scope.fontSizeUpdated = function() {
-                    settingsService.setChatCustomFontSize($scope.customFontSize);
+                    settingsService.saveSetting("ChatCustomFontSize", $scope.customFontSize);
                 };
                 $scope.fontSliderOptions = {
                     floor: 10,
diff --git a/src/gui/app/directives/modals/chat/edit-activity-events-modal.js b/src/gui/app/directives/modals/chat/edit-activity-events-modal.js
index 11c4537ce..3dbefbb98 100644
--- a/src/gui/app/directives/modals/chat/edit-activity-events-modal.js
+++ b/src/gui/app/directives/modals/chat/edit-activity-events-modal.js
@@ -18,21 +18,21 @@
                         <span style="font-weight: 900;" id="selectAllLabel">Select All</span>
                         <span>
                             <input class="tgl tgl-light sr-only" id="select-all" type="checkbox" aria-labelledby="selectAllLabel"
-                            ng-checked="$ctrl.allEventsChecked()" 
+                            ng-checked="$ctrl.allEventsChecked()"
                             ng-click="$ctrl.toggleAllEvents()"/>
                         <label class="tgl-btn" for="select-all"></label>
                     </span>
-                </div> 
+                </div>
                 <div ng-repeat="event in $ctrl.events | orderBy:'eventName' | filter:eventSearch">
                   <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:5px;">
                       <span><span style="font-weight: 900;">{{event.eventName}}</span> <span>({{event.sourceName}})</span></span>
                       <span>
                           <input class="tgl tgl-light sr-only" id="{{event.sourceId}}:{{event.eventId}}" type="checkbox" aria-label="{{event.sourceId}} {{event.eventId}}"
-                            ng-checked="$ctrl.eventIsChecked(event)" 
+                            ng-checked="$ctrl.eventIsChecked(event)"
                             ng-click="$ctrl.toggleEventChecked(event)"/>
                         <label class="tgl-btn" for="{{event.sourceId}}:{{event.eventId}}"></label>
                       </span>
-                  </div>                   
+                  </div>
                 </div>
               </div>
             </div>
@@ -52,11 +52,11 @@
 
                 $ctrl.events = [];
 
-                $ctrl.allowedEvents = settingsService.getAllowedActivityEvents();
+                $ctrl.allowedEvents = settingsService.getSetting("AllowedActivityEvents");
 
                 $q.when(backendCommunicator
                     .fireEventAsync("get-activity-feed-supported-events"))
-                    .then(supportedEvents => {
+                    .then((supportedEvents) => {
                         if (supportedEvents != null) {
                             $ctrl.events = supportedEvents;
                         }
@@ -90,7 +90,7 @@
 
                 $ctrl.save = () => {
                     console.log($ctrl.allowedEvents);
-                    settingsService.setAllowedActivityEvents($ctrl.allowedEvents);
+                    settingsService.saveSetting("AllowedActivityEvents", $ctrl.allowedEvents);
                     $ctrl.close();
                 };
 
diff --git a/src/gui/app/directives/modals/commands/addOrEditCustomCommand/addOrEditCustomCommandModal.js b/src/gui/app/directives/modals/commands/addOrEditCustomCommand/addOrEditCustomCommandModal.js
index ceebce9dc..bc3d7db95 100644
--- a/src/gui/app/directives/modals/commands/addOrEditCustomCommand/addOrEditCustomCommandModal.js
+++ b/src/gui/app/directives/modals/commands/addOrEditCustomCommand/addOrEditCustomCommandModal.js
@@ -19,7 +19,7 @@
 
             $ctrl.command = {
                 active: true,
-                simple: !settingsService.getDefaultToAdvancedCommandMode(),
+                simple: !settingsService.getSetting("DefaultToAdvancedCommandMode"),
                 sendCooldownMessage: true,
                 cooldownMessage: "This command is still on cooldown for: {timeLeft}",
                 cooldown: {},
@@ -96,9 +96,9 @@
                     $ctrl.command.simple = !$ctrl.command.simple;
 
                     if ($ctrl.isNewCommand &&
-                        !settingsService.getDefaultToAdvancedCommandMode() &&
-                        !settingsService.getSeenAdvancedCommandModePopup()) {
-                        settingsService.setSeenAdvancedCommandModePopup(true);
+                        !settingsService.getSetting("DefaultToAdvancedCommandMode") &&
+                        !settingsService.getSetting("SeenAdvancedCommandModePopup")) {
+                        settingsService.saveSetting("SeenAdvancedCommandModePopup", true);
                         utilityService.showConfirmationModal({
                             title: "Default Mode",
                             question: `Do you want to always use Advanced Mode for new Commands?`,
@@ -109,7 +109,7 @@
                             cancelBtnType: "btn-default"
                         }).then((confirmed) => {
                             if (confirmed) {
-                                settingsService.setDefaultToAdvancedCommandMode(true);
+                                settingsService.saveSetting("DefaultToAdvancedCommandMode", true);
                                 ngToast.create({
                                     className: 'success',
                                     content: "New commands will now default to Advanced Mode.",
diff --git a/src/gui/app/directives/modals/misc/connectionPanelModal.js b/src/gui/app/directives/modals/misc/connectionPanelModal.js
index 9c791b576..0cd961d96 100644
--- a/src/gui/app/directives/modals/misc/connectionPanelModal.js
+++ b/src/gui/app/directives/modals/misc/connectionPanelModal.js
@@ -91,7 +91,7 @@
 
 
             $ctrl.toggledServiceIsChecked = function(service) {
-                let sidebarControlledServices = settingsService.getSidebarControlledServices();
+                let sidebarControlledServices = settingsService.getSetting("SidebarControlledServices");
                 if (sidebarControlledServices.includes(service)) {
                     sidebarControlledServices = sidebarControlledServices.filter(
                         s => s !== service
@@ -99,11 +99,11 @@
                 } else {
                     sidebarControlledServices.push(service);
                 }
-                settingsService.setSidebarControlledServices(sidebarControlledServices);
+                settingsService.saveSetting("SidebarControlledServices", sidebarControlledServices);
             };
 
             $ctrl.serviceIsChecked = function(service) {
-                const sidebarControlledServices = settingsService.getSidebarControlledServices();
+                const sidebarControlledServices = settingsService.getSetting("SidebarControlledServices");
                 return sidebarControlledServices.includes(service);
             };
 
diff --git a/src/gui/app/directives/modals/misc/create-overlay-instances.modal.js b/src/gui/app/directives/modals/misc/create-overlay-instances.modal.js
index d536528d6..6c738d56f 100644
--- a/src/gui/app/directives/modals/misc/create-overlay-instances.modal.js
+++ b/src/gui/app/directives/modals/misc/create-overlay-instances.modal.js
@@ -37,7 +37,7 @@
                 $ctrl.create = () => {
                     if (
                         settingsService
-                            .getOverlayInstances()
+                            .getSetting("OverlayInstances")
                             .includes($ctrl.name) || $ctrl.name === ""
                     ) {
                         $ctrl.createError = true;
diff --git a/src/gui/app/directives/modals/misc/edit-overlay-instances-modal.js b/src/gui/app/directives/modals/misc/edit-overlay-instances-modal.js
index 451571997..30e43d645 100644
--- a/src/gui/app/directives/modals/misc/edit-overlay-instances-modal.js
+++ b/src/gui/app/directives/modals/misc/edit-overlay-instances-modal.js
@@ -45,25 +45,23 @@
                 const $ctrl = this;
 
                 $ctrl.getOverlayInstances = () => {
-                    return settingsService.getOverlayInstances();
+                    return settingsService.getSetting("OverlayInstances");
                 };
 
-                $ctrl.usingObs = settingsService.getOverlayCompatibility() === "OBS";
-
                 $ctrl.deleteOverlayInstanceAtIndex = (index) => {
-                    const instances = settingsService.getOverlayInstances();
+                    const instances = settingsService.getSetting("OverlayInstances");
 
                     instances.splice(index, 1);
 
-                    settingsService.setOverlayInstances(instances);
+                    settingsService.saveSetting("OverlayInstances", instances);
                 };
 
                 const addOverlayInstance = (overlayInstance) => {
-                    const instances = settingsService.getOverlayInstances();
+                    const instances = settingsService.getSetting("OverlayInstances");
 
                     instances.push(overlayInstance);
 
-                    settingsService.setOverlayInstances(instances);
+                    settingsService.saveSetting("OverlayInstances", instances);
                 };
 
                 $ctrl.showViewUrlModal = (instanceName) => {
@@ -73,7 +71,7 @@
                 $ctrl.showCreateInstanceModal = () => {
                     utilityService.showModal({
                         component: "createOverlayInstancesModal",
-                        closeCallback: response => {
+                        closeCallback: (response) => {
                             addOverlayInstance(response.instanceName);
                         }
                     });
diff --git a/src/gui/app/directives/modals/misc/setupWizardModal.js b/src/gui/app/directives/modals/misc/setupWizardModal.js
index 5aab0156b..ea119614d 100644
--- a/src/gui/app/directives/modals/misc/setupWizardModal.js
+++ b/src/gui/app/directives/modals/misc/setupWizardModal.js
@@ -222,7 +222,7 @@
                         <p style="font-weight: 700;margin-top: 20px;">Would you like to be <a href="https:firebot.app/watch">featured on our website</a> during your live streams?</p>
                         <div style="margin-top: 20px;">
                             <label class="control-fb control--checkbox" style="margin-bottom: 0px; font-size: 16px;opacity:0.9;display:inline-block;"> Yes, feature my stream!
-                                <input type="checkbox" ng-click="$ctrl.settings.setWebOnlineCheckin(!$ctrl.settings.getWebOnlineCheckin())" ng-checked="$ctrl.settings.getWebOnlineCheckin()" >
+                                <input type="checkbox" ng-click="$ctrl.settings.saveSetting('WebOnlineCheckin', !$ctrl.settings.getSetting('WebOnlineCheckin'))" ng-checked="$ctrl.settings.getSetting('WebOnlineCheckin')" >
                                 <div class="control__indicator"></div>
                             </label>
                         </div>
@@ -373,7 +373,7 @@
 
             $ctrl.v4DataDetected = false;
             backendCommunicator.fireEventAsync("v4-data-check")
-                .then(detected => {
+                .then((detected) => {
                     $ctrl.v4DataDetected = detected;
                 });
 
@@ -406,11 +406,11 @@
                 $ctrl.importStarted = true;
             });
 
-            backendCommunicator.on("v4-import-update", data => {
+            backendCommunicator.on("v4-import-update", (data) => {
                 $ctrl.currentlyImporting = data.importing;
             });
 
-            backendCommunicator.on("v4-import-complete", data => {
+            backendCommunicator.on("v4-import-complete", (data) => {
                 $ctrl.importCompleted = true;
                 $ctrl.importStarted = false;
                 $ctrl.importSuccess = data.success;
@@ -492,7 +492,7 @@
 
             $ctrl.startBackupRestoreProcess = () => {
                 backupService.openBackupZipFilePicker()
-                    .then(backupFilePath => {
+                    .then((backupFilePath) => {
                         if (backupFilePath != null) {
                             backupService.initiateBackupRestore(backupFilePath);
                         }
diff --git a/src/gui/app/directives/modals/viewers/viewerDetailsModal.js b/src/gui/app/directives/modals/viewers/viewerDetailsModal.js
index 274627707..f8a5305cd 100644
--- a/src/gui/app/directives/modals/viewers/viewerDetailsModal.js
+++ b/src/gui/app/directives/modals/viewers/viewerDetailsModal.js
@@ -191,7 +191,7 @@
 
                 $ctrl.hasFirebotData = false;
 
-                $ctrl.viewerDbEnabled = settingsService.getViewerDB();
+                $ctrl.viewerDbEnabled = settingsService.getSetting("ViewerDB");
 
                 $ctrl.accountAccess = accountAccess;
 
diff --git a/src/gui/app/directives/settings/categories/advanced-settings.js b/src/gui/app/directives/settings/categories/advanced-settings.js
index 057de40a9..f2871d642 100644
--- a/src/gui/app/directives/settings/categories/advanced-settings.js
+++ b/src/gui/app/directives/settings/categories/advanced-settings.js
@@ -8,69 +8,69 @@
             template: `
                 <div>
 
-                    <firebot-setting 
+                    <firebot-setting
                         name="Debug Mode"
                         description="When Debug Mode is enabled, Firebot will log a lot more information to its log files. This is often useful when troubleshooting an obscure problem."
                     >
                         <setting-description-addon>
                             <b>Firebot must be restarted for changes to this setting to take effect.</b>
                         </setting-description-addon>
-                        <firebot-button 
-                            text="{{settings.debugModeEnabled() ? 'Disable Debug Mode' : 'Enable Debug Mode' }}"
-                            ng-click="settings.setDebugModeEnabled(!settings.debugModeEnabled())"
+                        <firebot-button
+                            text="{{settings.getSetting('DebugMode') ? 'Disable Debug Mode' : 'Enable Debug Mode' }}"
+                            ng-click="settings.saveSetting('DebugMode', !settings.getSetting('DebugMode'))"
                         />
                     </firebot-setting>
 
-                    <firebot-setting 
+                    <firebot-setting
                         name="While Loop"
                         description="Enable or disable the conditional 'While Loop' option in the Loop Effects effect."
                     >
                         <setting-description-addon>
                             <b>If you aren't careful, you can cause an infinite loop and freeze Firebot.</b>
                         </setting-description-addon>
-                        <firebot-button 
-                            text="{{settings.getWhileLoopEnabled() ? 'Disable While Loops' : 'Enable While Loops' }}"
+                        <firebot-button
+                            text="{{settings.getSetting('WhileLoopEnabled') ? 'Disable While Loops' : 'Enable While Loops' }}"
                             ng-click="toggleWhileLoops()"
                         />
                     </firebot-setting>
 
-                    <firebot-setting 
+                    <firebot-setting
                         name="Quote ID Recalculation"
                         description="Quote IDs in Firebot are static, even if a quote before another is deleted. If you would like to recalculate your quote IDs so that there isn't any skipped quote numbers, you can use this option."
                     >
                         <setting-description-addon>
                             <b>We recommend that you make a backup first, just in case.</b>
                         </setting-description-addon>
-                        <firebot-button 
+                        <firebot-button
                             text="Recalculate Quote IDs"
                             ng-click="recalculateQuoteIds()"
                         />
                     </firebot-setting>
 
-                    <firebot-setting 
+                    <firebot-setting
                         name="Allow Quote .CSV Export"
                         description="Whether or not you want the 'Export as .CSV' button available for quotes on the profile page."
                     >
-                        <firebot-select 
+                        <firebot-select
                             options="{ true: 'On', false: 'Off' }"
-                            ng-init="allowQuoteCsv = settings.getAllowQuoteCSVDownloads()"
-                            selected="allowQuoteCsv" 
-                            on-update="settings.setAllowQuoteCSVDownloads(option === 'true')"
+                            ng-init="allowQuoteCsv = settings.getSetting('AllowQuoteCSVDownloads')"
+                            selected="allowQuoteCsv"
+                            on-update="settings.saveSetting('AllowQuoteCSVDownloads', option === 'true')"
                             right-justify="true"
                             aria-label="Choose Whether or not you want the 'Export as .CSV' button available for quotes on the profile page."
 
                         />
                     </firebot-setting>
 
-                    <firebot-setting 
+                    <firebot-setting
                         name="Persist Custom Variables"
                         description="Whether or not custom variables should be persisted to a file when Firebot closes."
                     >
-                        <firebot-select 
+                        <firebot-select
                             options="{ true: 'On', false: 'Off' }"
-                            ng-init="persistVariables = settings.getPersistCustomVariables()"
-                            selected="persistVariables" 
-                            on-update="settings.setPersistCustomVariables(option === 'true')"
+                            ng-init="persistVariables = settings.getSettings('PersistCustomVariables')"
+                            selected="persistVariables"
+                            on-update="settings.saveSetting('PersistCustomVariables', option === 'true')"
                             right-justify="true"
                             aria-label="enable or disabel persistent Custom Variables"
                         />
@@ -86,10 +86,10 @@
                 $scope.settings = settingsService;
 
                 $scope.toggleWhileLoops = () => {
-                    const whileLoopsEnabled = settingsService.getWhileLoopEnabled();
+                    const whileLoopsEnabled = settingsService.getSetting("WhileLoopEnabled");
 
                     if (whileLoopsEnabled) {
-                        settingsService.setWhileLoopEnabled(false);
+                        settingsService.saveSetting("WhileLoopEnabled", false);
                     } else {
                         utilityService
                             .showConfirmationModal({
@@ -98,9 +98,9 @@
                                 confirmLabel: "I understand, enable.",
                                 confirmBtnType: "btn-primary"
                             })
-                            .then(confirmed => {
+                            .then((confirmed) => {
                                 if (confirmed) {
-                                    settingsService.setWhileLoopEnabled(true);
+                                    settingsService.saveSetting("WhileLoopEnabled", true);
                                 }
                             });
                     }
@@ -114,7 +114,7 @@
                             confirmLabel: "Recalculate",
                             confirmBtnType: "btn-danger"
                         })
-                        .then(confirmed => {
+                        .then((confirmed) => {
                             if (confirmed) {
                                 backendCommunicator.fireEvent("recalc-quote-ids");
                             }
diff --git a/src/gui/app/directives/settings/categories/backups-settings.js b/src/gui/app/directives/settings/categories/backups-settings.js
index b8b243660..0a9efa513 100644
--- a/src/gui/app/directives/settings/categories/backups-settings.js
+++ b/src/gui/app/directives/settings/categories/backups-settings.js
@@ -17,10 +17,10 @@
                         description="The maximum number of backups to keep. When Firebot makes a new backup, it will delete the oldest if this number has been reached."
                     >
                         <dropdown-select
-                            ng-init="currentMaxBackups = settings.maxBackupCount()"
+                            ng-init="currentMaxBackups = settings.getSetting('MaxBackupCount')"
                             options="[3,5,10,25,'All']"
                             selected="currentMaxBackups"
-                            on-update="settings.setMaxBackupCount(option)"
+                            on-update="settings.saveSetting('MaxBackupCount', option)"
                             aria-label="Choose your Max Number of backups"
 
                         ></dropdown-select>
@@ -38,8 +38,8 @@
                             ></tooltip>
                             <input
                                 type="checkbox"
-                                ng-click="settings.setBackupIgnoreResources(!settings.backupIgnoreResources())"
-                                ng-checked="settings.backupIgnoreResources()"
+                                ng-click="settings.saveSetting('BackupIgnoreResources', !settings.getSetting('BackupIgnoreResources'))"
+                                ng-checked="settings.getSetting('BackupIgnoreResources')"
                                 aria-label="Don't include overlay resource folder in backups"
                             />
                             <div class="control__indicator"></div>
@@ -56,8 +56,8 @@
                             >When Firebot closes
                             <input
                                 type="checkbox"
-                                ng-click="settings.setBackupOnExit(!settings.backupOnExit())"
-                                ng-checked="settings.backupOnExit()"
+                                ng-click="settings.saveSetting('BackupOnExit', !settings.getSetting('BackupOnExit'))"
+                                ng-checked="settings.getSetting('BackupOnExit')"
                                 aria-label="Automatic update when Firebot closes"
                             />
                             <div class="control__indicator"></div>
@@ -66,8 +66,8 @@
                             >Once a day
                             <input
                                 type="checkbox"
-                                ng-click="settings.setBackupOnceADay(!settings.backupOnceADay())"
-                                ng-checked="settings.backupOnceADay()"
+                                ng-click="settings.saveSetting('BackupOnceADay', !settings.getSetting('BackupOnceADay'))"
+                                ng-checked="settings.getSetting('BackupOnceADay')"
                                 aria-label="Automatic update Once a day"
                             />
                             <div class="control__indicator"></div>
diff --git a/src/gui/app/directives/settings/categories/database-settings.js b/src/gui/app/directives/settings/categories/database-settings.js
index 0de2c8a77..477aff9be 100644
--- a/src/gui/app/directives/settings/categories/database-settings.js
+++ b/src/gui/app/directives/settings/categories/database-settings.js
@@ -14,9 +14,9 @@
                     >
                         <firebot-select
                             options="{ true: 'On', false: 'Off' }"
-                            ng-init="viewerDb = settings.getViewerDB()"
+                            ng-init="viewerDb = settings.getSetting('ViewerDB')"
                             selected="viewerDb"
-                            on-update="settings.setViewerDB(option === 'true')"
+                            on-update="settings.saveSetting('ViewerDB', option === 'true')"
                             right-justify="true"
                             aria-label="enable or disable Viewer Database"
                         />
@@ -28,9 +28,9 @@
                     >
                         <firebot-select
                             options="{ true: 'On', false: 'Off' }"
-                            ng-init="autoFlagBots = settings.getAutoFlagBots()"
+                            ng-init="autoFlagBots = settings.getSetting('AutoFlagBots')"
                             selected="autoFlagBots"
-                            on-update="settings.setAutoFlagBots(option === 'true')"
+                            on-update="settings.saveSetting('AutoFlagBots', option === 'true')"
                             right-justify="true"
                             aria-label="enable or disable Auto Flag Bots"
                         />
@@ -42,9 +42,9 @@
                     >
                         <firebot-select
                             options="[5,10,15,20,25,30,35,40,45,50,55,60]"
-                            ng-init="viewerListPageSize = settings.getViewerListPageSize()"
+                            ng-init="viewerListPageSize = settings.getSetting('ViewerListPageSize')"
                             selected="viewerListPageSize"
-                            on-update="settings.setViewerListPageSize(option)"
+                            on-update="settings.saveSetting('ViewerListPageSize', option)"
                             right-justify="true"
                             aria-label="enable or disable Viewers Table Page Size"
                         />
diff --git a/src/gui/app/directives/settings/categories/general-settings.js b/src/gui/app/directives/settings/categories/general-settings.js
index d1cf82ae9..a48aaf3c0 100644
--- a/src/gui/app/directives/settings/categories/general-settings.js
+++ b/src/gui/app/directives/settings/categories/general-settings.js
@@ -11,9 +11,9 @@
                         <firebot-select
                             aria-label="App Theme"
                             options="['Light', 'Midnight', 'Obsidian']"
-                            ng-init="selectedTheme = settings.getTheme()"
+                            ng-init="selectedTheme = settings.getSetting('Theme')"
                             selected="selectedTheme"
-                            on-update="settings.setTheme(option)"
+                            on-update="settings.saveSetting('Theme', option)"
                             right-justify="true"
                         />
                     </firebot-setting>
@@ -23,11 +23,11 @@
                         description="When minimized, Firebot will minimize to tray instead of task bar"
                     >
                         <toggle-button
-                            toggle-model="settings.getMinimizeToTray()"
-                            on-toggle="settings.setMinimizeToTray(!settings.getMinimizeToTray())"
+                            toggle-model="settings.getSetting('MinimizeToTray')"
+                            on-toggle="settings.saveSetting('MinimizeToTray', !settings.getSetting('MinimizeToTray'))"
                             font-size="40"
                             aria-label="Minimize to Tray, When minimized, Firebot will minimize to tray instead of task bar"
-                            accessibility-label="(settings.getMinimizeToTray() ? 'Enabled' : 'Disabled') + ' When minimized, Firebot will minimize to tray instead of task bar'"
+                            accessibility-label="(settings.getSetting('MinimizeToTray') ? 'Enabled' : 'Disabled') + ' When minimized, Firebot will minimize to tray instead of task bar'"
                         />
                     </firebot-setting>
 
@@ -36,11 +36,11 @@
                         description="Get audible alerts when Firebot connects or disconnects."
                     >
                         <toggle-button
-                            toggle-model="settings.soundsEnabled() === 'On'"
-                            on-toggle="settings.setSoundsEnabled(settings.soundsEnabled() === 'On' ? 'Off' : 'On')"
+                            toggle-model="settings.getSetting('SoundsEnabled') === 'On'"
+                            on-toggle="settings.saveSetting('SoundsEnabled', settings.getSetting('SoundsEnabled') === 'On' ? 'Off' : 'On')"
                             font-size="40"
-                            aria-label="Minimize to Tray, When minimized, Firebot will minimize to tray instead of task bar"
-                            accessibility-label="(settings.soundsEnabled() ? 'Enabled' : 'Disabled') + ' Get audible alerts when Firebot connects or disconnects.'"
+                            aria-label="Connection Sounds: Get audible alerts when Firebot connects or disconnects"
+                            accessibility-label="(settings.getSetting('SoundsEnabled') === 'On' ? 'Enabled' : 'Disabled') + ' Get audible alerts when Firebot connects or disconnects.'"
                         />
                     </firebot-setting>
 
@@ -56,22 +56,22 @@
                                 data-toggle="dropdown"
                                 aria-haspopup="true"
                                 aria-expanded="true"
-                                aria-label="Choose your audio output device {{settings.getAudioOutputDevice().label}}"
+                                aria-label="Choose your audio output device {{settings.getSetting('AudioOutputDevice').label}}"
                             >
-                                <span class="dropdown-text">{{settings.getAudioOutputDevice().label}}</span>
+                                <span class="dropdown-text">{{settings.getSetting('AudioOutputDevice').label}}</span>
                                 <span class="caret"></span>
                             </button>
                             <ul class="dropdown-menu right-justified-dropdown">
                                 <li ng-repeat="device in audioOutputDevices">
                                     <a
                                         href
-                                        ng-click="settings.setAudioOutputDevice(device)"
+                                        ng-click="settings.saveSetting('AudioOutputDevice', device)"
                                     >{{device.label}}</a>
                                 </li>
                                 <li class="divider"></li>
                                 <li
                                     role="menuitem"
-                                    ng-click="settings.setAudioOutputDevice({label: 'Send To Overlay', deviceId: 'overlay'})"
+                                    ng-click="settings.saveSetting('AudioOutputDevice', {label: 'Send To Overlay', deviceId: 'overlay'})"
                                 >
                                     <a href>Send To Overlay</a>
                                 </li>
@@ -85,12 +85,12 @@
                         releases however. Enable if you want to be notified of new beta releases."
                     >
                         <toggle-button
-                            toggle-model="settings.notifyOnBeta()"
-                            on-toggle="settings.setNotifyOnBeta(!settings.notifyOnBeta())"
+                            toggle-model="settings.getSetting('NotifyOnBeta')"
+                            on-toggle="settings.saveSetting('NotifyOnBeta', !settings.getSetting('NotifyOnBeta'))"
                             font-size="40"
                             aria-label="Firebot automatically updates to new stable versions. It does not automatically update to betas or major new
                         releases however. Enable if you want to be notified of new beta releases."
-                            accessibility-label="(settings.notifyOnBeta() ? 'Enabled' : 'Disabled') + ' Firebot automatically updates to new stable versions. It does not automatically update to betas or major new
+                            accessibility-label="(settings.getSetting('NotifyOnBeta') ? 'Enabled' : 'Disabled') + ' Firebot automatically updates to new stable versions. It does not automatically update to betas or major new
                         releases however. Enable if you want to be notified of new beta releases.'"
                         />
                     </firebot-setting>
@@ -110,11 +110,11 @@
                         </setting-description-addon>
 
                         <toggle-button
-                            toggle-model="settings.getWebOnlineCheckin()"
-                            on-toggle="settings.setWebOnlineCheckin(!settings.getWebOnlineCheckin())"
+                            toggle-model="settings.getSetting('WebOnlineCheckin')"
+                            on-toggle="settings.saveSetting('WebOnlineCheckin', !settings.getSetting('WebOnlineCheckin'))"
                             font-size="40"
                             aria-label="Enable this setting to have your stream displayed on Firebot's website when you're live"
-                            accessibility-label="(settings.getWebOnlineCheckin() ? 'Enabled' : 'Disabled') + ' Enable this setting to have your stream displayed on Firebot\\'s website when you\\'re live'"
+                            accessibility-label="(settings.getSetting('WebOnlineCheckin') ? 'Enabled' : 'Disabled') + ' Enable this setting to have your stream displayed on Firebot\\'s website when you\\'re live'"
                         />
                     </firebot-setting>
 
@@ -127,8 +127,8 @@
                                 >Uptime
                                 <input
                                     type="checkbox"
-                                    ng-click="settings.setShowUptimeStat(!settings.getShowUptimeStat())"
-                                    ng-checked="settings.getShowUptimeStat()"
+                                    ng-click="settings.saveSetting('ShowUptimeStat', !settings.getSetting('ShowUptimeStat'))"
+                                    ng-checked="settings.getSetting('ShowUptimeStat')"
                                     aria-label="Uptime"
                                 />
                                 <div class="control__indicator"></div>
@@ -137,8 +137,8 @@
                                 >Viewer count
                                 <input
                                     type="checkbox"
-                                    ng-click="settings.setShowViewerCountStat(!settings.getShowViewerCountStat())"
-                                    ng-checked="settings.getShowViewerCountStat()"
+                                    ng-click="settings.saveSetting('ShowViewerCountStat', !settings.getSetting('ShowViewerCountStat'))"
+                                    ng-checked="settings.getSetting('ShowViewerCountStat')"
                                     aria-label="Viewer count"
                                 />
                                 <div class="control__indicator"></div>
@@ -147,8 +147,8 @@
                                 >Hype Trains
                                 <input
                                     type="checkbox"
-                                    ng-click="settings.setShowHypeTrainIndicator(!settings.getShowHypeTrainIndicator())"
-                                    ng-checked="settings.getShowHypeTrainIndicator()"
+                                    ng-click="settings.saveSetting('ShowHypeTrainIndicator', !settings.getSetting('ShowHypeTrainIndicator'))"
+                                    ng-checked="settings.getSetting('ShowHypeTrainIndicator')"
                                     aria-label="Hype Trains"
                                 />
                                 <div class="control__indicator"></div>
@@ -157,8 +157,8 @@
                                 >Ad Breaks
                                 <input
                                     type="checkbox"
-                                    ng-click="settings.setShowAdBreakIndicator(!settings.getShowAdBreakIndicator())"
-                                    ng-checked="settings.getShowAdBreakIndicator()"
+                                    ng-click="settings.saveSetting('ShowAdBreakIndicator', !settings.getSetting('ShowAdBreakIndicator'))"
+                                    ng-checked="settings.getSetting('ShowAdBreakIndicator')"
                                     aria-label="Ad Breaks"
                                 />
                                 <div class="control__indicator"></div>
@@ -172,7 +172,7 @@
                     >
                         <firebot-select
                             options="[5,10,15,20,25,30,35,40,45,50,55,60]"
-                            ng-init="selectedTimeout = settings.getActiveChatUserListTimeout()"
+                            ng-init="selectedTimeout = settings.getSetting('ActiveChatUserListTimeout')"
                             selected="selectedTimeout"
                             on-update="setActiveChatUserTimeout(option)"
                             right-justify="true"
@@ -186,10 +186,10 @@
                         description="Automatically open the Stream Preview window when Firebot launches."
                     >
                         <toggle-button
-                            toggle-model="settings.getOpenStreamPreviewOnLaunch()"
-                            on-toggle="settings.setOpenStreamPreviewOnLaunch(!settings.getOpenStreamPreviewOnLaunch())"
+                            toggle-model="settings.getSetting('OpenStreamPreviewOnLaunch')"
+                            on-toggle="settings.saveSetting('OpenStreamPreviewOnLaunch', !settings.getSetting('OpenStreamPreviewOnLaunch'))"
                             font-size="40"
-                            accessibility-label="(settings.getOpenStreamPreviewOnLaunch() ? 'Enabled' : 'Disabled') + ' Stream Preview on Launch'"
+                            accessibility-label="(settings.getSetting('OpenStreamPreviewOnLaunch') ? 'Enabled' : 'Disabled') + ' Stream Preview on Launch'"
                         />
                     </firebot-setting>
                 </div>
@@ -208,7 +208,7 @@
             $q.when(navigator.mediaDevices.enumerateDevices()).then((deviceList) => {
                 deviceList = deviceList
                     .filter(
-                        (d) => d.kind === "audiooutput" && d.deviceId !== "communications" && d.deviceId !== "default"
+                        d => d.kind === "audiooutput" && d.deviceId !== "communications" && d.deviceId !== "default"
                     )
                     .map((d) => {
                         return { label: d.label, deviceId: d.deviceId };
@@ -221,8 +221,7 @@
                 if (value == null) {
                     value = "10";
                 }
-                settingsService.setActiveChatUserListTimeout(value);
-                ipcRenderer.send("setActiveChatUserTimeout", value);
+                settingsService.saveSetting("ActiveChatUserListTimeout", value);
             };
         }
     });
diff --git a/src/gui/app/directives/settings/categories/overlay-settings.js b/src/gui/app/directives/settings/categories/overlay-settings.js
index efc9b760a..9d68c4bd7 100644
--- a/src/gui/app/directives/settings/categories/overlay-settings.js
+++ b/src/gui/app/directives/settings/categories/overlay-settings.js
@@ -14,7 +14,7 @@
                     >
                         <firebot-button
                             text="Get Overlay Path"
-                            ng-click="settings.showOverlayInfoModal()"
+                            ng-click="showOverlayInfoModal()"
                         />
                     </firebot-setting>
 
@@ -24,15 +24,15 @@
                     >
                         <span
                             style="padding-right: 10px"
-                            ng-if="settings.useOverlayInstances()"
+                            ng-if="settings.getSetting('UseOverlayInstances')"
                         >
                             <a href ng-click="showEditOverlayInstancesModal()">Edit Instances</a>
                         </span>
                         <firebot-select
                             options="{ true: 'On', false: 'Off' }"
-                            ng-init="overlayInstances = settings.useOverlayInstances()"
+                            ng-init="overlayInstances = settings.getSetting('UseOverlayInstances')"
                             selected="overlayInstances"
-                            on-update="settings.setUseOverlayInstances(option === 'true')"
+                            on-update="settings.saveSetting('UseOverlayInstances', option === 'true')"
                             right-justify="true"
                             aria-label="enable or disable Overlay Instances"
                         />
@@ -45,10 +45,10 @@
                         even if they're set to wait."
                     >
                         <toggle-button
-                            toggle-model="settings.getForceOverlayEffectsToContinueOnRefresh()"
-                            on-toggle="settings.setForceOverlayEffectsToContinueOnRefresh(!settings.getForceOverlayEffectsToContinueOnRefresh())"
+                            toggle-model="settings.getSetting('ForceOverlayEffectsToContinueOnRefresh')"
+                            on-toggle="settings.saveSetting('ForceOverlayEffectsToContinueOnRefresh', !settings.getSetting('ForceOverlayEffectsToContinueOnRefresh'))"
                             font-size="40"
-                            accessibility-label="(settings.getForceOverlayEffectsToContinueOnRefresh() ? 'Enabled' : 'Disabled') + '
+                            accessibility-label="(settings.getSetting('ForceOverlayEffectsToContinueOnRefresh') ? 'Enabled' : 'Disabled') + '
                              When refreshing an overlay or using the Clear Effects effect on it, this will force any Play Video or Play
                              Sound effects currently playing on that overlay to continue to the next effect, even if they\\'re set to wait.'"
                         />
@@ -69,11 +69,8 @@
             controller: function($scope, settingsService, utilityService) {
                 $scope.settings = settingsService;
 
-                $scope.showFontManagementModal = function() {
-                    utilityService.showModal({
-                        component: "fontManagementModal",
-                        size: "sm"
-                    });
+                $scope.showOverlayInfoModal = function(overlayInstance) {
+                    utilityService.showOverlayInfoModal(overlayInstance);
                 };
 
                 $scope.showEditOverlayInstancesModal = function() {
@@ -81,6 +78,13 @@
                         component: "editOverlayInstancesModal"
                     });
                 };
+
+                $scope.showFontManagementModal = function() {
+                    utilityService.showModal({
+                        component: "fontManagementModal",
+                        size: "sm"
+                    });
+                };
             }
         });
 }());
diff --git a/src/gui/app/directives/settings/categories/scripts-settings.js b/src/gui/app/directives/settings/categories/scripts-settings.js
index 0bc79ef9f..1e3467724 100644
--- a/src/gui/app/directives/settings/categories/scripts-settings.js
+++ b/src/gui/app/directives/settings/categories/scripts-settings.js
@@ -21,9 +21,9 @@
                         </setting-description-addon>
                         <firebot-select
                             options="{ true: 'Enabled', false: 'Disabled' }"
-                            ng-init="customScriptsEnabled = settings.getCustomScriptsEnabled()"
+                            ng-init="customScriptsEnabled = settings.getSetting('RunCustomScripts')"
                             selected="customScriptsEnabled"
-                            on-update="settings.setCustomScriptsEnabled(option === 'true')"
+                            on-update="settings.saveSetting('RunCustomScripts', option === 'true')"
                             right-justify="true"
                             aria-label="Enable or disable custom scripts"
                         />
@@ -35,7 +35,7 @@
                     >
                         <firebot-button
                             text="Manage Startup Scripts"
-                            disabled="!settings.getCustomScriptsEnabled()"
+                            disabled="!settings.getSetting('RunCustomScripts')"
                             ng-click="openStartupScriptsModal()"
                         />
                     </firebot-setting>
@@ -46,10 +46,10 @@
                     >
                         <firebot-select
                             options="{ true: 'On', false: 'Off' }"
-                            ng-init="clearCache = settings.getClearCustomScriptCache()"
-                            is-disabled="!settings.getCustomScriptsEnabled()"
+                            ng-init="clearCache = settings.getSetting('ClearCustomScriptCache')"
+                            is-disabled="!settings.getSetting('RunCustomScripts')"
                             selected="clearCache"
-                            on-update="settings.setClearCustomScriptCache(option === 'true')"
+                            on-update="settings.saveSetting('ClearCustomScriptCache', option === 'true')"
                             right-justify="true"
                             aria-label="Enable or disable the Clearing of Custom Script Cache"
                         />
diff --git a/src/gui/app/directives/settings/categories/trigger-settings.js b/src/gui/app/directives/settings/categories/trigger-settings.js
index 2eafd8fa6..d7adf4f33 100644
--- a/src/gui/app/directives/settings/categories/trigger-settings.js
+++ b/src/gui/app/directives/settings/categories/trigger-settings.js
@@ -16,9 +16,9 @@
                     >
                         <firebot-select
                             options="{ true: 'Advanced', false: 'Simple' }"
-                            ng-init="selectedCmdMode = settings.getDefaultToAdvancedCommandMode()"
+                            ng-init="selectedCmdMode = settings.getSetting('DefaultToAdvancedCommandMode')"
                             selected="selectedCmdMode"
-                            on-update="settings.setDefaultToAdvancedCommandMode(option === 'true')"
+                            on-update="settings.saveSetting('DefaultToAdvancedCommandMode', option === 'true')"
                             right-justify="true"
                             aria-label="Choose your Default Mode For New Commands"
                         />
@@ -30,9 +30,9 @@
                     >
                         <firebot-select
                             options="{ true: 'Yes', false: 'No' }"
-                            ng-init="allowSharedChatCommands = settings.getAllowCommandsInSharedChat()"
+                            ng-init="allowSharedChatCommands = settings.getSetting('AllowCommandsInSharedChat')"
                             selected="allowSharedChatCommands"
-                            on-update="settings.setAllowCommandsInSharedChat(option === 'true')"
+                            on-update="settings.saveSetting('AllowCommandsInSharedChat', option === 'true')"
                             right-justify="true"
                             aria-label="Allow Shared Chat To Trigger Commands"
                         />
@@ -48,9 +48,9 @@
                     >
                         <firebot-select
                             options="{ true: 'Yes', false: 'No' }"
-                            ng-init="ignoreSubEvents = settings.ignoreSubsequentSubEventsAfterCommunitySub()"
+                            ng-init="ignoreSubEvents = settings.getSetting('IgnoreSubsequentSubEventsAfterCommunitySub')"
                             selected="ignoreSubEvents"
-                            on-update="settings.setIgnoreSubsequentSubEventsAfterCommunitySub(option === 'true')"
+                            on-update="settings.saveSetting('IgnoreSubsequentSubEventsAfterCommunitySub', option === 'true')"
                             right-justify="true"
                             aria-label="enable or disable Ignore Related Gift Sub Events"
                         />
@@ -62,9 +62,9 @@
                     >
                         <firebot-select
                             options="{ 0: 'Disabled', 1: '1 minute', 3: '3 minutes', 5: '5 minutes', 10: '10 minutes', 15: '15 minutes', 20: '20 minutes' }"
-                            ng-init="triggerUpcomingAdBreakMinutes = settings.getTriggerUpcomingAdBreakMinutes()"
+                            ng-init="triggerUpcomingAdBreakMinutes = settings.getSetting('TriggerUpcomingAdBreakMinutes')"
                             selected="triggerUpcomingAdBreakMinutes"
-                            on-update="settings.setTriggerUpcomingAdBreakMinutes(option)"
+                            on-update="settings.saveSetting('TriggerUpcomingAdBreakMinutes', option)"
                             right-justify="true"
                             aria-label="Choose your Upcoming Scheduled Ad Break Trigger"
                         />
diff --git a/src/gui/app/directives/settings/categories/tts-settings.js b/src/gui/app/directives/settings/categories/tts-settings.js
index da43f807f..19a50e1b3 100644
--- a/src/gui/app/directives/settings/categories/tts-settings.js
+++ b/src/gui/app/directives/settings/categories/tts-settings.js
@@ -16,7 +16,7 @@
                             options="ttsVoiceOptions"
                             ng-init="ttsVoice = getSelectedVoiceName()"
                             selected="ttsVoice"
-                            on-update="settings.setDefaultTtsVoiceId(option)"
+                            on-update="settings.saveSetting('DefaultTtsVoiceId', option)"
                             right-justify="true"
                             aria-label="Choose your Text to Speech voice"
                         />
@@ -67,7 +67,7 @@
                 $scope.settings = settingsService;
 
                 $scope.getSelectedVoiceName = () => {
-                    const selectedVoiceId = settingsService.getDefaultTtsVoiceId();
+                    const selectedVoiceId = settingsService.getSetting("DefaultTtsVoiceId");
                     const voice = ttsService.getVoiceById(selectedVoiceId);
                     return voice ? voice.name : "Unknown Voice";
                 };
@@ -75,7 +75,7 @@
                 $scope.ttsVoices = ttsService.getVoices();
 
                 $scope.getSelectedVoiceName = () => {
-                    const selectedVoiceId = settingsService.getDefaultTtsVoiceId();
+                    const selectedVoiceId = settingsService.getSetting("DefaultTtsVoiceId");
                     const voice = ttsService.getVoiceById(selectedVoiceId);
                     return voice ? voice.name : "Unknown Voice";
                 };
@@ -86,7 +86,7 @@
                 }, {});
 
                 $scope.ttsVolumeSlider = {
-                    value: settingsService.getTtsVoiceVolume(),
+                    value: settingsService.getSetting("TtsVoiceVolume"),
                     options: {
                         floor: 0,
                         ceil: 1,
@@ -97,13 +97,13 @@
                             return Math.floor(value * 10);
                         },
                         onChange: (_, value) => {
-                            settingsService.setTtsVoiceVolume(value);
+                            settingsService.saveSetting("TtsVoiceVolume", value);
                         }
                     }
                 };
 
                 $scope.ttsRateSlider = {
-                    value: settingsService.getTtsVoiceRate(),
+                    value: settingsService.getSetting("TtsVoiceRate"),
                     options: {
                         floor: 0.1,
                         ceil: 10,
@@ -111,7 +111,7 @@
                         precision: 1,
                         ariaLabel: "Text to speech rate ",
                         onChange: (_, value) => {
-                            settingsService.setTtsVoiceRate(value);
+                            settingsService.saveSetting("TtsVoiceRate", value);
                         }
                     }
                 };
diff --git a/src/gui/app/directives/sidebar/sidebar.js b/src/gui/app/directives/sidebar/sidebar.js
index 48477f0ec..fcf0d82cd 100644
--- a/src/gui/app/directives/sidebar/sidebar.js
+++ b/src/gui/app/directives/sidebar/sidebar.js
@@ -125,7 +125,7 @@
 
             ctrl.is = integrationService;
 
-            ctrl.isViewerDBOn = settingsService.getViewerDB;
+            ctrl.isViewerDBOn = () => settingsService.getSetting("ViewerDB");
 
             ctrl.extensionPages = () => uiExtensionsService.extensions.map(e => e.pages.map((p) => {
                 p.extensionId = e.id;
diff --git a/src/gui/app/services/activity-feed.service.js b/src/gui/app/services/activity-feed.service.js
index 97cc0ccda..d2b28953c 100644
--- a/src/gui/app/services/activity-feed.service.js
+++ b/src/gui/app/services/activity-feed.service.js
@@ -23,7 +23,7 @@
                     service.allActivities.length = 500;
                 }
 
-                const allowedEvents = settingsService.getAllowedActivityEvents();
+                const allowedEvents = settingsService.getSetting("AllowedActivityEvents");
                 if (!activity.event.forceAllow && !allowedEvents.includes(`${activity.source.id}:${activity.event.id}`)) {
                     return;
                 }
@@ -83,7 +83,7 @@
                     component: "editActivityEventsModal",
                     size: "sm",
                     closeCallback: () => {
-                        const allowedEvents = settingsService.getAllowedActivityEvents();
+                        const allowedEvents = settingsService.getSetting("AllowedActivityEvents");
                         service.activities = service.allActivities
                             .filter(a => allowedEvents.includes(`${a.source.id}:${a.event.id}`));
                     }
diff --git a/src/gui/app/services/chat-messages.service.js b/src/gui/app/services/chat-messages.service.js
index 35075e778..8a84fa128 100644
--- a/src/gui/app/services/chat-messages.service.js
+++ b/src/gui/app/services/chat-messages.service.js
@@ -28,11 +28,6 @@
             // The message/thread currently being replied to
             service.threadDetails = null;
 
-            // Tells us if we should process in app chat or not.
-            service.getChatFeed = function() {
-                return settingsService.getRealChatFeed();
-            };
-
             // Return the chat queue.
             service.getChatQueue = function() {
                 return service.chatQueue;
@@ -242,18 +237,9 @@
                 });
             };
 
-            // Gets view count setting for ui.
-            service.getChatViewCountSetting = function() {
-                const viewCount = settingsService.getChatViewCount();
-                if (viewCount === "On") {
-                    return true;
-                }
-                return false;
-            };
-
             // Gets view count setting for ui.
             service.getChatViewerListSetting = function() {
-                return settingsService.getShowChatViewerList();
+                return settingsService.getSetting("ShowChatViewerList");
             };
 
             function markMessageAsDeleted(messageId) {
@@ -307,29 +293,26 @@
             // }, 250);
 
             backendCommunicator.on("twitch:chat:rewardredemption", (redemption) => {
-                if (settingsService.getRealChatFeed()) {
-
-                    const redemptionItem = {
-                        id: uuid(),
-                        type: "redemption",
-                        data: redemption
-                    };
+                const redemptionItem = {
+                    id: uuid(),
+                    type: "redemption",
+                    data: redemption
+                };
 
-                    if (service.chatQueue && service.chatQueue.length > 0) {
-                        const lastQueueItem = service.chatQueue[service.chatQueue.length - 1];
-                        if (!lastQueueItem.rewardMatched &&
+                if (service.chatQueue && service.chatQueue.length > 0) {
+                    const lastQueueItem = service.chatQueue[service.chatQueue.length - 1];
+                    if (!lastQueueItem.rewardMatched &&
                             lastQueueItem.type === "message" &&
                             lastQueueItem.data.customRewardId != null &&
                             lastQueueItem.data.customRewardId === redemption.reward.id &&
                             lastQueueItem.data.userId === redemption.user.id) {
-                            lastQueueItem.rewardMatched = true;
-                            service.chatQueue.splice(-1, 0, redemptionItem);
-                            return;
-                        }
+                        lastQueueItem.rewardMatched = true;
+                        service.chatQueue.splice(-1, 0, redemptionItem);
+                        return;
                     }
-
-                    service.chatQueue.push(redemptionItem);
                 }
+
+                service.chatQueue.push(redemptionItem);
             });
 
             backendCommunicator.on("twitch:chat:user-joined", (user) => {
@@ -376,7 +359,7 @@
             });
 
             backendCommunicator.on("twitch:chat:clear-feed", (modUsername) => {
-                const clearMode = settingsService.getClearChatFeedMode();
+                const clearMode = settingsService.getSetting("ClearChatFeedMode");
 
                 const isStreamer = accountAccess.accounts.streamer.username.toLowerCase()
                     === modUsername.toLowerCase();
@@ -428,37 +411,35 @@
                     service.chatUserUpdated(user);
                 }
 
-                if (settingsService.getRealChatFeed()) {
-                    // Push new message to queue.
-                    const messageItem = {
-                        id: uuid(),
-                        type: "message",
-                        data: chatMessage
-                    };
+                // Push new message to queue.
+                const messageItem = {
+                    id: uuid(),
+                    type: "message",
+                    data: chatMessage
+                };
 
-                    if (chatMessage.customRewardId != null &&
+                if (chatMessage.customRewardId != null &&
                         service.chatQueue &&
                         service.chatQueue.length > 0) {
-                        const lastQueueItem = service.chatQueue[service.chatQueue.length - 1];
-                        if (lastQueueItem.type === "redemption" &&
+                    const lastQueueItem = service.chatQueue[service.chatQueue.length - 1];
+                    if (lastQueueItem.type === "redemption" &&
                             lastQueueItem.data.reward.id === chatMessage.customRewardId &&
                             lastQueueItem.data.user.id === chatMessage.userId) {
-                            messageItem.rewardMatched = true;
-                        }
+                        messageItem.rewardMatched = true;
                     }
+                }
 
-                    service.chatQueue.push(messageItem);
+                service.chatQueue.push(messageItem);
 
-                    service.pruneChatQueue();
-                }
+                service.pruneChatQueue();
             });
 
             service.allEmotes = [];
             service.filteredEmotes = [];
             service.refreshEmotes = () => {
-                const showBttvEmotes = settingsService.getShowBttvEmotes();
-                const showFfzEmotes = settingsService.getShowFfzEmotes();
-                const showSevenTvEmotes = settingsService.getShowSevenTvEmotes();
+                const showBttvEmotes = settingsService.getSetting("ChatShowBttvEmotes");
+                const showFfzEmotes = settingsService.getSetting("ChatShowFfzEmotes");
+                const showSevenTvEmotes = settingsService.getSetting("ChatShowSevenTvEmotes");
 
                 service.filteredEmotes = service.allEmotes.filter((e) => {
                     if (showBttvEmotes !== true && e.origin === "BTTV") {
@@ -487,9 +468,7 @@
             listenerService.registerListener(
                 { type: listenerService.ListenerType.CHAT_UPDATE },
                 (data) => {
-                    if (settingsService.getRealChatFeed() === true) {
-                        service.chatUpdateHandler(data);
-                    }
+                    service.chatUpdateHandler(data);
                 }
             );
 
diff --git a/src/gui/app/services/connection-manager.service.js b/src/gui/app/services/connection-manager.service.js
index 304980a50..94a4ca728 100644
--- a/src/gui/app/services/connection-manager.service.js
+++ b/src/gui/app/services/connection-manager.service.js
@@ -18,7 +18,7 @@
             let overlayStatus = listenerService.fireEventSync("getOverlayStatus");
 
             function delay(time) {
-                return new Promise(resolve => {
+                return new Promise((resolve) => {
                     setTimeout(() => {
                         resolve();
                     }, time || 100);
@@ -31,7 +31,7 @@
                 {
                     type: listenerService.ListenerType.OVERLAY_CONNECTION_STATUS
                 },
-                overlayStatusData => {
+                (overlayStatusData) => {
                     overlayStatus = overlayStatusData;
                 }
             );
@@ -45,13 +45,13 @@
             };
 
             service.setConnectionToChat = function(shouldConnect) {
-                return new Promise(resolve => {
+                return new Promise((resolve) => {
                     listenerService.registerListener(
                         {
                             type: listenerService.ListenerType.CHAT_CONNECTION_STATUS,
                             runOnce: true
                         },
-                        isChatConnected => {
+                        (isChatConnected) => {
                             resolve(isChatConnected);
                         }
                     );
@@ -66,12 +66,12 @@
 
             service.connectedServiceCount = function(services) {
                 if (services == null) {
-                    services = settingsService.getSidebarControlledServices();
+                    services = settingsService.getSetting("SidebarControlledServices");
                 }
 
                 let count = 0;
 
-                services.forEach(s => {
+                services.forEach((s) => {
                     switch (s) {
                         case "chat":
                             if (connectionService.connectedToChat) {
@@ -92,21 +92,21 @@
             };
 
             service.partialServicesConnected = function() {
-                const services = settingsService.getSidebarControlledServices();
+                const services = settingsService.getSetting("SidebarControlledServices");
                 const connectedCount = service.connectedServiceCount();
 
                 return connectedCount > 0 && services.length > connectedCount;
             };
 
             service.allServicesConnected = function() {
-                const services = settingsService.getSidebarControlledServices();
+                const services = settingsService.getSetting("SidebarControlledServices");
                 const connectedCount = service.connectedServiceCount();
 
                 return services.length === connectedCount;
             };
 
             service.toggleSidebarServices = function() {
-                const services = settingsService.getSidebarControlledServices();
+                const services = settingsService.getSetting("SidebarControlledServices");
 
                 // we only want to connect if none of the connections are currently connected
                 // otherwise we will attempt to disconnect everything.
@@ -190,12 +190,12 @@
                     }
                     case "integrations": {
                         const sidebarControlledIntegrations = settingsService
-                            .getSidebarControlledServices()
+                            .getSetting("SidebarControlledServices")
                             .filter(s => s.startsWith("integration."))
                             .map(s => s.replace("integration.", ""));
 
                         let connectedCount = 0;
-                        sidebarControlledIntegrations.forEach(i => {
+                        sidebarControlledIntegrations.forEach((i) => {
                             if (integrationService.integrationIsConnected(i)) {
                                 connectedCount++;
                             }
diff --git a/src/gui/app/services/connection.service.js b/src/gui/app/services/connection.service.js
index e39f13202..236634b28 100644
--- a/src/gui/app/services/connection.service.js
+++ b/src/gui/app/services/connection.service.js
@@ -201,7 +201,7 @@
             function updateSidebarServicesOverallStatus() {
                 let oneDisconnected = false;
                 let oneConnected = false;
-                const serviceIds = settingsService.getSidebarControlledServices();
+                const serviceIds = settingsService.getSetting("SidebarControlledServices");
                 for (const serviceId of serviceIds) {
 
                     if (serviceId == null || (serviceId !== "chat" && !serviceId.startsWith("integration."))) {
diff --git a/src/gui/app/services/integration.service.js b/src/gui/app/services/integration.service.js
index 8ae7346e2..a8c241631 100644
--- a/src/gui/app/services/integration.service.js
+++ b/src/gui/app/services/integration.service.js
@@ -82,12 +82,12 @@
                 integrationId,
                 shouldConnect
             ) {
-                return new Promise(resolve => {
+                return new Promise((resolve) => {
                     const listenerId = listenerService.registerListener(
                         {
                             type: listenerService.ListenerType.INTEGRATION_CONNECTION_UPDATE
                         },
-                        data => {
+                        (data) => {
                             if (data.id === integrationId) {
                                 listenerService.unregisterListener(
                                     listenerService.ListenerType.INTEGRATION_CONNECTION_UPDATE,
@@ -156,7 +156,7 @@
                     resolveObj: {
                         integration: () => integration
                     },
-                    closeCallback: resp => {
+                    closeCallback: (resp) => {
                         const action = resp.action;
 
                         if (action === 'save') {
@@ -190,28 +190,28 @@
                 if (integration == null || !integration.connectionToggle) {
                     return;
                 }
-                const sidebarControlledServices = settingsService.getSidebarControlledServices();
+                const sidebarControlledServices = settingsService.getSetting("SidebarControlledServices");
                 const service = `integration.${integration.id}`;
                 if (!sidebarControlledServices.includes(service)) {
                     sidebarControlledServices.push(service);
                 }
-                settingsService.setSidebarControlledServices(sidebarControlledServices);
+                settingsService.saveSetting("SidebarControlledServices", sidebarControlledServices);
             });
 
             backendCommunicator.on("integrationUnlinked", (intId) => {
-                let sidebarControlledServices = settingsService.getSidebarControlledServices();
+                let sidebarControlledServices = settingsService.getSetting("SidebarControlledServices");
                 const service = `integration.${intId}`;
                 if (sidebarControlledServices.includes(service)) {
                     sidebarControlledServices = sidebarControlledServices.filter(s => s !== service);
                 }
-                settingsService.setSidebarControlledServices(sidebarControlledServices);
+                settingsService.saveSetting("SidebarControlledServices", sidebarControlledServices);
             });
 
             listenerService.registerListener(
                 {
                     type: listenerService.ListenerType.INTEGRATION_CONNECTION_UPDATE
                 },
-                data => {
+                (data) => {
                     const integration = integrations.find(i => i.id === data.id);
                     if (integration != null) {
                         integration.connected = data.connected;
diff --git a/src/gui/app/services/overlay-url-helper.service.js b/src/gui/app/services/overlay-url-helper.service.js
index aaa99e739..06644b95f 100644
--- a/src/gui/app/services/overlay-url-helper.service.js
+++ b/src/gui/app/services/overlay-url-helper.service.js
@@ -12,11 +12,11 @@
             service.getOverlayPath = function(instanceName) {
                 let overlayPath = dataAccess.getPathInUserData("overlay.html");
 
-                const port = settingsService.getWebServerPort();
+                const port = settingsService.getSetting("WebServerPort");
 
                 const params = {};
                 if (port !== 7472 && !isNaN(port)) {
-                    params["port"] = settingsService.getWebServerPort();
+                    params["port"] = settingsService.getSetting("WebServerPort");
                 }
 
                 if (instanceName != null && instanceName !== "") {
@@ -24,7 +24,7 @@
                 }
 
                 let paramCount = 0;
-                Object.entries(params).forEach(p => {
+                Object.entries(params).forEach((p) => {
                     const key = p[0],
                         value = p[1];
 
diff --git a/src/gui/app/services/settings.service.js b/src/gui/app/services/settings.service.js
index c59067233..8c6937953 100644
--- a/src/gui/app/services/settings.service.js
+++ b/src/gui/app/services/settings.service.js
@@ -2,850 +2,69 @@
 (function () {
     //This handles settings access for frontend
 
-    const fs = require("fs");
-    const { ipcRenderer } = require("electron");
-
     angular
         .module("firebotApp")
-        .factory("settingsService", function (utilityService, logger, profileManager, dataAccess, backendCommunicator) {
+        .factory("settingsService", function (utilityService, backendCommunicator) {
             const service = {};
 
+            let settingPathCache = {};
             let settingsCache = {};
 
-            backendCommunicator.on("flush-settings-cache", () => {
-                settingsCache = {};
-            });
-
-            backendCommunicator.on("settings-updated-main", (settingsUpdate) => {
-                if (settingsUpdate == null) {
-                    return;
+            /** @param {string} settingName */
+            function getSettingPath(settingName) {
+                if (settingPathCache[settingName] == null) {
+                    settingPathCache[settingName] = backendCommunicator.fireEventSync("settings:get-setting-path", settingName);
                 }
-                const { path, data } = settingsUpdate;
-                if (path == null || path === '') {
-                    return;
-                }
-                settingsCache[path] = data;
-            });
 
-            function getSettingsFile() {
-                return profileManager.getJsonDbInProfile("/settings");
+                return settingPathCache[settingName];
             }
 
-            function pushDataToFile(path, data) {
-                try {
-                    getSettingsFile().push(path, data);
-                    settingsCache[path] = data;
-                    backendCommunicator.fireEvent("settings-updated-renderer", { path, data });
-                } catch (err) { } //eslint-disable-line no-empty
-            }
-
-            function getDataFromFile(path, forceCacheUpdate, defaultValue) {
-                try {
-                    if (settingsCache[path] == null || forceCacheUpdate) {
-                        const data = getSettingsFile().getData(path);
-                        settingsCache[path] = data ?? defaultValue;
-                    }
-                } catch (err) {
-                    if (defaultValue !== undefined) {
-                        settingsCache[path] = defaultValue;
-                    }
-                    if (err.name !== "DataError") {
-                        logger.warn(err);
-                    }
-                }
-                return settingsCache[path];
-            }
-
-            function deleteDataAtPath(path) {
-                try {
-                    getSettingsFile().delete(path);
-                    delete settingsCache[path];
-                    backendCommunicator.fireEvent("settings-updated-renderer", { path, data: null });
-                } catch (err) { } //eslint-disable-line no-empty
-            }
-
-            service.purgeSettingsCache = function () {
-                settingsCache = {};
-                backendCommunicator.fireEvent("purge-settings-cache");
-            };
-
-            service.getCustomScriptsEnabled = function () {
-                return getDataFromFile("/settings/runCustomScripts", false, false) === true;
-            };
-
-            service.setCustomScriptsEnabled = function (enabled) {
-                pushDataToFile("/settings/runCustomScripts", enabled === true);
-            };
-
-            service.getSidebarExpanded = function () {
-                const expanded = getDataFromFile("/settings/sidebarExpanded", false, true);
-                return expanded != null ? expanded : true;
-            };
-
-            service.setSidebarExpanded = function (expanded) {
-                pushDataToFile("/settings/sidebarExpanded", expanded === true);
-            };
-
-            service.getDefaultToAdvancedCommandMode = function () {
-                return getDataFromFile("/settings/defaultToAdvancedCommandMode", false, false) === true;
-            };
-
-            service.setDefaultToAdvancedCommandMode = function (defaultToAdvanced) {
-                pushDataToFile("/settings/defaultToAdvancedCommandMode", defaultToAdvanced === true);
-            };
-
-            service.getSeenAdvancedCommandModePopup = function () {
-                return getDataFromFile("/settings/seenAdvancedCommandModePopup", false, false) === true;
-            };
-
-            service.setSeenAdvancedCommandModePopup = function (seen) {
-                pushDataToFile("/settings/seenAdvancedCommandModePopup", seen === true);
-            };
-
-            service.getPersistCustomVariables = function () {
-                return getDataFromFile("/settings/persistCustomVariables", false, false) === true;
-            };
-
-            service.setPersistCustomVariables = function (enabled) {
-                pushDataToFile("/settings/persistCustomVariables", enabled === true);
-            };
-
-            service.getAllowQuoteCSVDownloads = function () {
-                return getDataFromFile("/settings/allowQuoteCSVDownloads", false, true) !== false;
-            };
-
-            service.setAllowQuoteCSVDownloads = function (enabled) {
-                pushDataToFile("/settings/allowQuoteCSVDownloads", enabled === true);
-            };
-
-            service.legacySortTagsImported = function () {
-                return getDataFromFile("/settings/legacySortTagsImported", false, false) === true;
-            };
-
-            service.setLegacySortTagsImported = function (enabled) {
-                pushDataToFile("/settings/legacySortTagsImported", enabled === true);
-            };
-
-            service.getViewerListPageSize = function () {
-                const viewerListPageSize = getDataFromFile("/settings/viewerListDatabase/pageSize", false, 10);
-                return viewerListPageSize != null ? viewerListPageSize : 10;
-            };
-
-            service.setViewerListPageSize = function (viewerListPageSize = 10) {
-                pushDataToFile("/settings/viewerListDatabase/pageSize", viewerListPageSize);
-            };
-
-            service.isBetaTester = function () {
-                const betaTester = getDataFromFile("/settings/beta", false, "No");
-                return betaTester != null ? betaTester : "No";
-            };
-
-            service.setBetaTester = function (isTester) {
-                pushDataToFile("/settings/beta", isTester);
-            };
-
-            service.getEmulator = function () {
-                const emulator = getDataFromFile("/settings/emulation", false, "nut-js");
-                return emulator != null ? emulator : "nut-js";
-            };
-
-            service.setEmulator = function (emulator) {
-                pushDataToFile("/settings/emulation", emulator);
-            };
-
-            service.getViewerDB = function () {
-                let viewerDB = getDataFromFile("/settings/viewerDB");
-
-                // If viewerDB setting is not set, default to true to avoid future "cant find datapath" errors.
-                if (viewerDB == null) {
-                    logger.debug('Viewer DB setting not found. Defaulting to true.');
-                    service.setViewerDB(true);
-                    viewerDB = getDataFromFile("/settings/viewerDB");
-                }
-                return viewerDB != null ? viewerDB : true;
-            };
-
-            service.setViewerDB = function (status) {
-                pushDataToFile("/settings/viewerDB", status);
-
-                if (status === true) {
-                    ipcRenderer.send("connect-viewer-db");
-                } else {
-                    ipcRenderer.send("disconnect-viewer-db");
-                }
-            };
-
-            service.getAutoFlagBots = function () {
-                let autoFlagBots = getDataFromFile("/settings/autoFlagBots");
-
-                // If viewerDB setting is not set, default to true to avoid future "cant find datapath" errors.
-                if (autoFlagBots == null) {
-                    logger.debug('Auto Flag Bots setting not found. Defaulting to true.');
-                    service.setAutoFlagBots(true);
-                    autoFlagBots = getDataFromFile("/settings/viewerDB");
-                }
-                return autoFlagBots != null ? autoFlagBots : true;
-            };
-
-            service.setAutoFlagBots = function (status) {
-                pushDataToFile("/settings/autoFlagBots", status);
-            };
-
-            // Used for settings menu.
-            service.getChatFeed = function () {
-                const chatFeed = getDataFromFile("/settings/chatFeed", false, false);
-                if (chatFeed === true) {
-                    return "On";
-                }
-                return "Off";
-            };
-
-            // Used for the app itself.
-            service.getRealChatFeed = function () {
-                return true;
-            };
-
-            service.chatFeedEnabled = function () {
-                return true;
-            };
-
-            service.setChatFeed = function () { };
-
-            // Used for settings menu.
-            service.getChatViewCount = function () {
-                const chatViewCount = getDataFromFile("/settings/chatViewCount", false, "Off");
-                if (chatViewCount === true) {
-                    return "On";
-                }
-                return "Off";
-            };
-
-            service.setChatViewCount = function (chatViewCount) {
-                pushDataToFile("/settings/chatViewCount", chatViewCount === true);
-            };
-
-            service.getViewerCount = function () {
-                return getDataFromFile("/settings/chatViewCount");
-            };
-
-            service.getQuickActionSettings = () => {
-                return getDataFromFile("/settings/quickActions");
-            };
-
-            service.setQuickActionSettings = (quickActions) => {
-                pushDataToFile("/settings/quickActions", quickActions);
-            };
-
-            service.setDashboardLayoutSettings = (layoutSettings) => {
-                pushDataToFile("/settings/dashboard/layout", layoutSettings);
-            };
-
-            service.getDashboardLayoutSettings = () => {
-                return getDataFromFile("/settings/dashboard/layout");
-            };
-
-            service.getShowChatViewerList = function () {
-                const value = getDataFromFile("/settings/chatUsersList", false, true);
-                return value == null ? true : value;
-            };
-
-            service.setShowChatViewerList = function (chatViewerList) {
-                pushDataToFile("/settings/chatUsersList", chatViewerList === true);
-            };
-
-            service.showActivityFeed = function () {
-                const show = getDataFromFile("/settings/activityFeed", false, true);
-                return show == null ? true : show;
-            };
-
-            service.setShowActivityFeed = function (showActivityFeed) {
-                pushDataToFile("/settings/activityFeed", showActivityFeed === true);
-            };
-
-            service.getAllowedActivityEvents = function () {
-                const events = getDataFromFile("/settings/allowedActivityEvents");
-                return events == null ? [
-                    "twitch:raid",
-                    "twitch:raid-sent-off",
-                    "twitch:follow",
-                    "twitch:sub",
-                    "twitch:subs-gifted",
-                    "twitch:community-subs-gifted",
-                    "twitch:cheer",
-                    "streamlabs:donation",
-                    "streamlabs:eldonation",
-                    'extralife:donation',
-                    "tipeeestream:donation",
-                    "streamelements:donation",
-                    "twitch:channel-reward-redemption"
-                ] : events;
-            };
-
-            service.setAllowedActivityEvents = function (events) {
-                if (events == null || !Array.isArray(events)) {
+            backendCommunicator.on("settings:setting-updated", ({ settingPath, data }) => {
+                if (settingPath == null || settingPath === "") {
                     return;
                 }
-                pushDataToFile("/settings/allowedActivityEvents", events);
-            };
-
-            service.ignoreSubsequentSubEventsAfterCommunitySub = function () {
-                const ignoreSubEvents = getDataFromFile("/settings/ignoreSubsequentSubEventsAfterCommunitySub", false, true);
-                return ignoreSubEvents != null ? ignoreSubEvents : true;
-            };
-
-            service.setIgnoreSubsequentSubEventsAfterCommunitySub = function (ignoreSubEvents) {
-                pushDataToFile("/settings/ignoreSubsequentSubEventsAfterCommunitySub", ignoreSubEvents === true);
-            };
-
-            service.getWysiwygBackground = function () {
-                const bg = getDataFromFile("/settings/wysiwygBackground", false, 'white');
-                return bg != null ? bg : 'white';
-            };
-
-            service.setWysiwygBackground = function (bg) {
-                pushDataToFile("/settings/wysiwygBackground", bg);
-            };
-
-            service.getClearChatFeedMode = function () {
-                const mode = getDataFromFile("/settings/clearChatFeedMode", false, 'onlyStreamer');
-                return mode != null ? mode : 'onlyStreamer';
-            };
-
-            service.setClearChatFeedMode = function (mode) {
-                pushDataToFile("/settings/clearChatFeedMode", mode);
-            };
-
-            service.isChatCompactMode = function () {
-                const compact = getDataFromFile("/settings/chatCompactMode", false, false);
-                return compact != null ? compact : false;
-            };
-
-            service.setChatCompactMode = function (compact) {
-                pushDataToFile("/settings/chatCompactMode", compact === true);
-            };
-
-            service.getShowAvatars = function () {
-                const value = getDataFromFile("/settings/chatAvatars", false, true);
-                return value != null ? value : true;
-            };
-            service.setShowAvatars = function (value) {
-                pushDataToFile("/settings/chatAvatars", value === true);
-            };
-
-            service.getShowTimestamps = function () {
-                const value = getDataFromFile("/settings/chatTimestamps", false, true);
-                return value != null ? value : true;
-            };
-            service.setShowTimestamps = function (value) {
-                pushDataToFile("/settings/chatTimestamps", value === true);
-            };
-
-            service.getShowThirdPartyEmotes = function () {
-                const value = getDataFromFile("/settings/chatThirdPartyEmotes", false, true);
-                return value != null ? value : true;
-            };
-
-            service.getShowBttvEmotes = function () {
-                const value = getDataFromFile("/settings/chat/emotes/bttv", false, service.getShowThirdPartyEmotes());
-                return value != null ? value : service.getShowThirdPartyEmotes();
-            };
-            service.setShowBttvEmotes = function (value) {
-                pushDataToFile("/settings/chat/emotes/bttv", value === true);
-            };
-
-            service.getShowFfzEmotes = function () {
-                const value = getDataFromFile("/settings/chat/emotes/ffz", false, service.getShowThirdPartyEmotes());
-                return value != null ? value : service.getShowThirdPartyEmotes();
-            };
-            service.setShowFfzEmotes = function (value) {
-                pushDataToFile("/settings/chat/emotes/ffz", value === true);
-            };
-
-            service.getShowSevenTvEmotes = function () {
-                const value = getDataFromFile("/settings/chat/emotes/seventv", false, service.getShowThirdPartyEmotes());
-                return value != null ? value : service.getShowThirdPartyEmotes();
-            };
-            service.setShowSevenTvEmotes = function (value) {
-                pushDataToFile("/settings/chat/emotes/seventv", value === true);
-            };
-
-            service.getShowPronouns = function () {
-                const value = getDataFromFile("/settings/chatPronouns", false, true);
-                return value != null ? value : true;
-            };
-            service.setShowPronouns = function (value) {
-                pushDataToFile("/settings/chatPronouns", value === true);
-            };
-
-            service.getChatCustomFontSizeEnabled = function () {
-                const value = getDataFromFile("/settings/chatCustomFontSizeEnabled", false, false);
-                return value != null ? value : false;
-            };
-            service.setChatCustomFontSizeEnabled = function (value) {
-                pushDataToFile("/settings/chatCustomFontSizeEnabled", value === true);
-            };
-
-            service.getChatCustomFontSize = function () {
-                const value = getDataFromFile("/settings/chatCustomFontSize", false, 17);
-                return value != null ? value : 17;
-            };
-            service.setChatCustomFontSize = function (value) {
-                pushDataToFile("/settings/chatCustomFontSize", value);
-            };
-
-            service.chatAlternateBackgrounds = function () {
-                const alternate = getDataFromFile('/settings/chatAlternateBackgrounds', false, true);
-                return alternate != null ? alternate : true;
-            };
-
-            service.setChatAlternateBackgrounds = function (alternate) {
-                pushDataToFile('/settings/chatAlternateBackgrounds', alternate === true);
-            };
-
-            service.chatHideBotAccountMessages = function () {
-                const shouldHide = getDataFromFile('/settings/chatHideBotAccountMessages', false, false);
-                return shouldHide != null ? shouldHide : false;
-            };
-
-            service.setChatHideBotAccountMessages = function (shouldHide) {
-                pushDataToFile('/settings/chatHideBotAccountMessages', shouldHide === true);
-            };
-
-            service.getChatHideWhispers = function () {
-                const shouldHide = getDataFromFile('/settings/chatHideWhispers', false, false);
-                return shouldHide === true;
-            };
-
-            service.setChatHideWhispers = function (shouldHide) {
-                pushDataToFile('/settings/chatHideWhispers', shouldHide === true);
-            };
-
-            service.getShowUptimeStat = function () {
-                const value = getDataFromFile("/settings/showUptimeStat", false, true);
-                return value != null ? value : true;
-            };
-            service.setShowUptimeStat = function (value) {
-                pushDataToFile("/settings/showUptimeStat", value === true);
-            };
-            service.getShowViewerCountStat = function () {
-                const value = getDataFromFile("/settings/showViewerCountStat", false, true);
-                return value != null ? value : true;
-            };
-            service.setShowViewerCountStat = function (value) {
-                pushDataToFile("/settings/showViewerCountStat", value === true);
-            };
-            service.getShowHypeTrainIndicator = function () {
-                const value = getDataFromFile("/settings/showHypeTrainIndicator", false, true);
-                return value != null ? value : true;
-            };
-            service.setShowHypeTrainIndicator = function (value) {
-                pushDataToFile("/settings/showHypeTrainIndicator", value === true);
-            };
-
-            service.getShowAdBreakIndicator = function () {
-                const value = getDataFromFile("/settings/showAdBreakIndicator", false, true);
-                return value != null ? value : true;
-            };
-
-            service.setShowAdBreakIndicator = function (value) {
-                pushDataToFile("/settings/showAdBreakIndicator", value === true);
-            };
-
-            service.getTriggerUpcomingAdBreakMinutes = function () {
-                const value = getDataFromFile("/settings/triggerUpcomingAdBreakMinutes", false, 0);
-                return value ?? 0;
-            };
-
-            service.setTriggerUpcomingAdBreakMinutes = function (value) {
-                pushDataToFile("/settings/triggerUpcomingAdBreakMinutes", value);
-            };
-
-            service.chatHideDeletedMessages = function () {
-                const hide = getDataFromFile('/settings/chatHideDeletedMessages', false, false);
-                return hide != null ? hide : false;
-            };
-
-            service.setChatHideDeletedMessages = function (hide) {
-                pushDataToFile('/settings/chatHideDeletedMessages', hide === true);
-            };
-
-            service.getOverlayCompatibility = function () {
-                const overlay = getDataFromFile("/settings/overlayImages", false, "Other");
-                return overlay != null ? overlay : "Other";
-            };
-
-            service.setOverlayCompatibility = function (overlay) {
-                const overlaySetting = overlay === "OBS" ? overlay : "Other";
-                pushDataToFile("/settings/overlayImages", overlaySetting);
-            };
-
-            service.getTheme = function () {
-                const theme = getDataFromFile("/settings/theme", false, "Obsidian");
-                return theme != null ? theme : "Obsidian";
-            };
-
-            service.setTheme = function (theme) {
-                pushDataToFile("/settings/theme", theme);
-            };
-
-            service.soundsEnabled = function () {
-                const sounds = getDataFromFile("/settings/sounds", false, "On");
-                return sounds != null ? sounds : "On";
-            };
-
-            service.setSoundsEnabled = function (enabled) {
-                pushDataToFile("/settings/sounds", enabled);
-            };
-
-            service.getOpenStreamPreviewOnLaunch = () => {
-                const openStreamPreviewOnLaunch = getDataFromFile("/settings/openStreamPreviewOnLaunch", false, false);
-                return openStreamPreviewOnLaunch === true;
-            };
-
-            service.setOpenStreamPreviewOnLaunch = (enabled) => {
-                pushDataToFile("/settings/openStreamPreviewOnLaunch", enabled === true);
-            };
-
-            service.getActiveChatUserListTimeout = function () {
-                const inactiveTimer = getDataFromFile("/settings/activeChatUsers/inactiveTimer", false, 5);
-                return inactiveTimer != null ? parseInt(inactiveTimer) : 5;
-            };
-
-            service.setActiveChatUserListTimeout = function (inactiveTimer) {
-                pushDataToFile("/settings/activeChatUsers/inactiveTimer", inactiveTimer);
-            };
-
-            /*
-            * 0 = off,
-            * 1 = bugfix,
-            * 2 = feature,
-            * 3 = major release,
-            * 4 = betas
-            */
-            service.getAutoUpdateLevel = function () {
-                const updateLevel = getDataFromFile("/settings/autoUpdateLevel", false, 2);
-                return updateLevel != null ? updateLevel : 2;
-            };
-
-            service.setAutoUpdateLevel = function (updateLevel) {
-                pushDataToFile("/settings/autoUpdateLevel", updateLevel);
-            };
-
-            service.notifyOnBeta = function () {
-                const beta = getDataFromFile("/settings/notifyOnBeta", false, false);
-                return beta != null ? beta : false;
-            };
-
-            service.setNotifyOnBeta = function (beta) {
-                pushDataToFile("/settings/notifyOnBeta", beta === true);
-            };
 
-            service.isFirstTimeUse = function () {
-                const ftu = getDataFromFile("/settings/firstTimeUse", false, true);
-                return ftu != null ? ftu : true;
-            };
-
-            service.setFirstTimeUse = function (ftu) {
-                pushDataToFile("/settings/firstTimeUse", ftu === true);
-            };
-
-            service.hasJustUpdated = function () {
-                const updated = getDataFromFile("/settings/justUpdated", false, false);
-                return updated != null ? updated : false;
-            };
-
-            service.setJustUpdated = function (justUpdated) {
-                pushDataToFile("/settings/justUpdated", justUpdated === true);
-            };
+                settingsCache[settingPath] = data;
+            });
 
-            service.getOverlayVersion = function () {
-                const version = getDataFromFile("/settings/copiedOverlayVersion", false, "");
-                return version != null ? version : "";
-            };
+            backendCommunicator.on("settings:setting-deleted", (settingPath) => {
+                delete settingsCache[settingPath];
+            });
 
-            service.setOverlayVersion = function (newVersion) {
-                pushDataToFile("/settings/copiedOverlayVersion", newVersion.toString());
-            };
+            backendCommunicator.on("settings:settings-cache-flushed", () => {
+                settingPathCache = {};
+                settingsCache = {};
+            });
 
-            service.getWebServerPort = function () {
-                const serverPort = getDataFromFile("/settings/webServerPort", false, 7472);
-                return serverPort != null ? serverPort : 7472;
-            };
+            service.getSetting = function (settingName, forceCacheUpdate = false) {
+                const settingPath = getSettingPath(settingName);
 
-            service.setWebServerPort = function (port) {
-                // Ensure port is a number.
-                if (!Number.isInteger(port)) {
-                    return;
+                if (settingsCache[settingPath] == null || forceCacheUpdate === true) {
+                    settingsCache[settingPath] = backendCommunicator.fireEventSync("settings:get-setting", settingName);
                 }
 
-                // Save to settings file for app front end
-                pushDataToFile("/settings/webServerPort", port);
-
-                const path = dataAccess.getPathInWorkingDir(
-                    "/resources/overlay/js/port.js"
-                );
-
-                // Overwrite the 'port.js' file in the overlay settings folder with the new port
-                fs.writeFile(path, `window.WEBSERVER_PORT = ${port}`, { encoding: "utf8" }, () => {
-                    logger.info(`Set overlay port to: ${port}`);
-                });
+                return settingsCache[settingPath];
             };
 
-            service.getWebSocketPort = function () {
-                return service.getWebServerPort();
+            service.saveSetting = function (settingName, data) {
+                backendCommunicator.fireEvent("settings:save-setting", {
+                    settingName,
+                    data
+                });
             };
 
-            service.setWebSocketPort = function (port) {
-                return service.setWebServerPort(port);
+            service.deleteSetting = function (settingName) {
+                backendCommunicator.fireEventAsync("settings:delete-setting", settingName);
             };
 
-            service.setInactiveTimer = function (inactiveTimer) {
-                console.log(inactiveTimer);
+            service.flushSettingsCache = function () {
+                backendCommunicator.fireEvent("settings:flush-settings-cache");
             };
 
             service.showOverlayInfoModal = function (instanceName) {
                 utilityService.showOverlayInfoModal(instanceName);
             };
 
-            service.showOverlayEventsModal = function () {
-                utilityService.showOverlayEventsModal();
-            };
-
-            service.getOverlayEventsSettings = function () {
-                const settings = getDataFromFile("/settings/eventSettings", false, {});
-                return settings != null ? settings : {};
-            };
-
-            service.saveOverlayEventsSettings = function (eventSettings) {
-                pushDataToFile("/settings/eventSettings", eventSettings);
-            };
-
-            service.getClearCustomScriptCache = function () {
-                const clear = getDataFromFile("/settings/clearCustomScriptCache", false, false);
-                return clear != null ? clear : false;
-            };
-
-            service.setClearCustomScriptCache = function (clear) {
-                pushDataToFile("/settings/clearCustomScriptCache", clear === true);
-            };
-
-            service.useOverlayInstances = function () {
-                const oi = getDataFromFile("/settings/useOverlayInstances", false, false);
-                return oi != null ? oi : false;
-            };
-
-            service.setUseOverlayInstances = function (oi) {
-                pushDataToFile("/settings/useOverlayInstances", oi === true);
-            };
-
-            service.getOverlayInstances = function () {
-                const ois = getDataFromFile("/settings/overlayInstances", false, []);
-                return ois != null ? ois : [];
-            };
-
-            service.setOverlayInstances = function (ois) {
-                pushDataToFile("/settings/overlayInstances", ois);
-            };
-
-            service.getForceOverlayEffectsToContinueOnRefresh = function () {
-                const forceOverlayEffectsToContinueOnRefresh = getDataFromFile("/settings/forceOverlayEffectsToContinueOnRefresh", false, true);
-                return forceOverlayEffectsToContinueOnRefresh === true;
-            };
-
-            service.setForceOverlayEffectsToContinueOnRefresh = function (value) {
-                pushDataToFile("/settings/forceOverlayEffectsToContinueOnRefresh", value);
-            };
-
-            service.backupKeepAll = function () {
-                const backupKeepAll = getDataFromFile("/settings/backupKeepAll", false, false);
-                return backupKeepAll != null ? backupKeepAll : false;
-            };
-
-            service.setBackupKeepAll = function (backupKeepAll) {
-                pushDataToFile("/settings/backupKeepAll", backupKeepAll === true);
-            };
-
-            service.backupOnExit = function () {
-                const save = getDataFromFile("/settings/backupOnExit", false, true);
-                return save != null ? save : true;
-            };
-
-            service.setBackupOnExit = function (backupOnExit) {
-                pushDataToFile("/settings/backupOnExit", backupOnExit === true);
-            };
-
-            service.backupIgnoreResources = function () {
-                const save = getDataFromFile("/settings/backupIgnoreResources", false, true);
-                return save != null ? save : true;
-            };
-
-            service.setBackupIgnoreResources = function (backupIgnoreResources) {
-                pushDataToFile("/settings/backupIgnoreResources", backupIgnoreResources === true);
-            };
-
-            service.backupBeforeUpdates = function () {
-                const backupBeforeUpdates = getDataFromFile(
-                    "/settings/backupBeforeUpdates", false, true
-                );
-                return backupBeforeUpdates != null ? backupBeforeUpdates : true;
-            };
-
-            service.setBackupBeforeUpdates = function (backupBeforeUpdates) {
-                pushDataToFile(
-                    "/settings/backupBeforeUpdates",
-                    backupBeforeUpdates === true
-                );
-            };
-
-            service.backupOnceADay = function () {
-                const backupOnceADay = getDataFromFile("/settings/backupOnceADay", false, true);
-                return backupOnceADay != null ? backupOnceADay : true;
-            };
-
-            service.setBackupOnceADay = function (backupOnceADay) {
-                pushDataToFile("/settings/backupOnceADay", backupOnceADay === true);
-            };
-
-            service.maxBackupCount = function () {
-                const maxBackupCount = getDataFromFile("/settings/maxBackupCount", false, 25);
-                return maxBackupCount != null ? maxBackupCount : 25;
-            };
-
-            service.setMaxBackupCount = function (maxBackupCount) {
-                pushDataToFile("/settings/maxBackupCount", maxBackupCount);
-            };
-
-            service.getAudioOutputDevice = function () {
-                const defaultVal = { label: "System Default", deviceId: "default" };
-                const device = getDataFromFile("/settings/audioOutputDevice", false, defaultVal);
-                return device != null
-                    ? device
-                    : defaultVal;
-            };
-
-            service.setAudioOutputDevice = function (device) {
-                pushDataToFile("/settings/audioOutputDevice", device);
-            };
-
-            service.getSidebarControlledServices = function () {
-                const services = getDataFromFile("/settings/sidebarControlledServices", false, ["chat"]);
-                return services != null
-                    ? services
-                    : ["chat"];
-            };
-
-            service.setSidebarControlledServices = function (services) {
-                pushDataToFile("/settings/sidebarControlledServices", services);
-            };
-
-            service.getTaggedNotificationSound = function () {
-                const sound = getDataFromFile("/settings/chat/tagged/sound");
-                return sound != null ? sound : { name: "None" };
-            };
-
-            service.setTaggedNotificationSound = function (sound) {
-                pushDataToFile("/settings/chat/tagged/sound", sound);
-            };
-
-            service.getTaggedNotificationVolume = function () {
-                const volume = getDataFromFile("/settings/chat/tagged/volume");
-                return volume != null ? volume : 5;
-            };
-
-            service.setTaggedNotificationVolume = function (volume) {
-                pushDataToFile("/settings/chat/tagged/volume", volume);
-            };
-
-            service.debugModeEnabled = function () {
-                const globalSettings = dataAccess.getJsonDbInUserData("/global-settings");
-                let enabled;
-                try {
-                    enabled = globalSettings.getData("/settings/debugMode");
-                } catch (err) { } //eslint-disable-line no-empty
-                return enabled != null ? enabled : false;
-            };
-
-            service.setDebugModeEnabled = function (enabled) {
-                const globalSettings = dataAccess.getJsonDbInUserData("/global-settings");
-                try {
-                    globalSettings.push("/settings/debugMode", enabled === true);
-                } catch (err) { } //eslint-disable-line no-empty
-            };
-
-            service.getViewerColumnPreferences = function () {
-                const prefs = getDataFromFile("/settings/viewerColumnPreferences", false, { lastSeen: true });
-                return prefs != null ? prefs : { lastSeen: true };
-            };
-
-            service.setViewerColumnPreferences = function (prefs) {
-                pushDataToFile("/settings/viewerColumnPreferences", prefs);
-            };
-
-            service.deleteFromViewerColumnPreferences = function (columnName) {
-                deleteDataAtPath(`/settings/viewerColumnPreferences/${columnName}`);
-            };
-
-            service.getDefaultTtsVoiceId = function () {
-                const id = getDataFromFile('/settings/defaultTtsVoiceId');
-                return id;
-            };
-
-            service.setDefaultTtsVoiceId = function (id) {
-                pushDataToFile('/settings/defaultTtsVoiceId', id);
-            };
-
-            service.getTtsVoiceVolume = function () {
-                const volume = getDataFromFile('/settings/ttsVoiceVolume', false, 0.5);
-                return volume !== undefined ? volume : 0.5;
-            };
-
-            service.setTtsVoiceVolume = function (volume) {
-                pushDataToFile('/settings/ttsVoiceVolume', volume);
-            };
-
-            service.getTtsVoiceRate = function () {
-                const rate = getDataFromFile('/settings/ttsVoiceRate', false, 1);
-                return rate !== undefined ? rate : 1;
-            };
-
-            service.setTtsVoiceRate = function (rate) {
-                pushDataToFile('/settings/ttsVoiceRate', rate);
-            };
-
-
-            service.getWhileLoopEnabled = function () {
-                const enabled = getDataFromFile('/settings/whileLoopEnabled', false, false);
-                return enabled !== undefined ? enabled : false;
-            };
-
-            service.setWhileLoopEnabled = function (enabled) {
-                pushDataToFile('/settings/whileLoopEnabled', enabled === true);
-            };
-
-            service.getMinimizeToTray = function () {
-                return getDataFromFile('/settings/minimizeToTray', false, false) === true;
-            };
-            service.setMinimizeToTray = function (minimizeToTray) {
-                pushDataToFile('/settings/minimizeToTray', minimizeToTray === true);
-            };
-
-            service.getWebOnlineCheckin = () => {
-                const webOnlineCheckin = getDataFromFile("/settings/webOnlineCheckin");
-                return webOnlineCheckin === true;
-            };
-
-            service.setWebOnlineCheckin = (value) => {
-                pushDataToFile("/settings/webOnlineCheckin", value);
-            };
-
-            service.getAllowCommandsInSharedChat = function () {
-                return getDataFromFile("/settings/allowCommandsInSharedChat", false, false); // default OFF
-            };
-
-            service.setAllowCommandsInSharedChat = function (value) {
-                pushDataToFile("/settings/allowCommandsInSharedChat", value);
-            };
-
             return service;
         });
-}());
+}());
\ No newline at end of file
diff --git a/src/gui/app/services/sidebar-manager.service.js b/src/gui/app/services/sidebar-manager.service.js
index a62fa358c..51a61127a 100644
--- a/src/gui/app/services/sidebar-manager.service.js
+++ b/src/gui/app/services/sidebar-manager.service.js
@@ -6,12 +6,12 @@
         .factory("sidebarManager", function($timeout, $rootScope, $location, $translate, settingsService, uiExtensionsService, backendCommunicator) {
             const service = {};
 
-            service.navExpanded = settingsService.getSidebarExpanded();
+            service.navExpanded = settingsService.getSetting("SidebarExpanded");
 
             service.toggleNav = function() {
                 service.navExpanded = !service.navExpanded;
                 $rootScope.$broadcast("navToggled");
-                settingsService.setSidebarExpanded(service.navExpanded);
+                settingsService.saveSetting("SidebarExpanded", service.navExpanded);
             };
 
             service.currentTab = "chat feed";
diff --git a/src/gui/app/services/sort-tags.service.js b/src/gui/app/services/sort-tags.service.js
index 197b045e6..1f1c9f664 100644
--- a/src/gui/app/services/sort-tags.service.js
+++ b/src/gui/app/services/sort-tags.service.js
@@ -96,7 +96,7 @@
                     resolveObj: {
                         tags: () => sortTagsForContext
                     },
-                    closeCallback: tags => {
+                    closeCallback: (tags) => {
                         sortTags[context] = tags;
                         saveAllSortTags();
                     }
@@ -105,11 +105,11 @@
             };
 
             /** @param {SortTag} context */
-            service.getSelectedSortTag = (context) => selectedSortTags[context];
+            service.getSelectedSortTag = context => selectedSortTags[context];
 
             /** @param {string} context */
             // eslint-disable-next-line no-confusing-arrow
-            service.getSelectedSortTagDisplay = (context) => (selectedSortTags[context] != null ? selectedSortTags[context].name : `All ${context}`);
+            service.getSelectedSortTagDisplay = context => (selectedSortTags[context] != null ? selectedSortTags[context].name : `All ${context}`);
 
             /**
              * @param {string} context
@@ -125,9 +125,9 @@
              */
             service.getLegacyEventAndCommandTags = () => {
 
-                if (!settingsService.legacySortTagsImported()) {
+                if (!settingsService.getSetting("LegacySortTagsImported")) {
 
-                    settingsService.setLegacySortTagsImported(true);
+                    settingsService.saveSetting("LegacySortTagsImported", true);
 
                     /**@type {Object.<string, SortTag[]>} */
                     const legacySortTags = {
@@ -155,7 +155,7 @@
                         // silently fail
                     }
 
-                    Object.keys(legacySortTags).forEach(context => {
+                    Object.keys(legacySortTags).forEach((context) => {
 
                         if (sortTags[context] == null) {
                             sortTags[context] = [];
diff --git a/src/gui/app/services/sound.service.js b/src/gui/app/services/sound.service.js
index 2796c0bd1..d129b9619 100644
--- a/src/gui/app/services/sound.service.js
+++ b/src/gui/app/services/sound.service.js
@@ -13,8 +13,8 @@
 
             // Connection Sounds
             service.connectSound = function(type) {
-                if (settingsService.soundsEnabled() === "On") {
-                    const outputDevice = settingsService.getAudioOutputDevice();
+                if (settingsService.getSetting("SoundsEnabled") === "On") {
+                    const outputDevice = settingsService.getSetting("AudioOutputDevice");
                     if (type === "Online") {
                         service.playSound("../sounds/connect_new_b.mp3", 0.2, outputDevice);
                     } else {
@@ -25,8 +25,8 @@
 
             let popCounter = 0;
             service.popSound = function() {
-                if (settingsService.soundsEnabled() === "On") {
-                    const outputDevice = settingsService.getAudioOutputDevice();
+                if (settingsService.getSetting("SoundsEnabled") === "On") {
+                    const outputDevice = settingsService.getSetting("AudioOutputDevice");
                     popCounter++;
                     if (popCounter > 4) {
                         popCounter = 1;
@@ -79,7 +79,7 @@
             ];
 
             service.playChatNotification = function() {
-                let selectedSound = settingsService.getTaggedNotificationSound();
+                let selectedSound = settingsService.getSetting("ChatTaggedNotificationSound");
 
                 if (selectedSound.name === "None") {
                     return;
@@ -91,7 +91,7 @@
                     );
                 }
 
-                const volume = settingsService.getTaggedNotificationVolume() / 100 * 10;
+                const volume = settingsService.getSetting("ChatTaggedNotificationVolume") / 100 * 10;
                 if (selectedSound.path != null && selectedSound.path !== "") {
                     service.playSound(selectedSound.path, volume);
                 }
@@ -101,11 +101,11 @@
             service.playSound = function(path, volume, outputDevice, fileType = null, maxSoundLength = null) {
 
                 if (outputDevice == null) {
-                    outputDevice = settingsService.getAudioOutputDevice();
+                    outputDevice = settingsService.getSetting("AudioOutputDevice");
                 }
 
                 $q.when(service.getHowlSound(path, volume, outputDevice, fileType))
-                    .then(sound => {
+                    .then((sound) => {
 
                         let maxSoundLengthTimeout;
                         // Clear listener after first call.
@@ -131,9 +131,9 @@
                     });
             };
 
-            service.getHowlSound = function(path, volume, outputDevice = settingsService.getAudioOutputDevice(), fileType = null) {
+            service.getHowlSound = function(path, volume, outputDevice = settingsService.getSetting("AudioOutputDevice"), fileType = null) {
                 return navigator.mediaDevices.enumerateDevices()
-                    .then(deviceList => {
+                    .then((deviceList) => {
                         const filteredDevice = deviceList.filter(d => d.label === outputDevice.label
                             || d.deviceId === outputDevice.deviceId);
 
@@ -153,7 +153,7 @@
             };
 
             service.getSoundDuration = function(path, format = undefined) {
-                return new Promise(resolve => {
+                return new Promise((resolve) => {
 
                     console.log("duration for", path, format);
 
@@ -178,7 +178,7 @@
             // Watches for an event from main process
             listenerService.registerListener(
                 { type: listenerService.ListenerType.PLAY_SOUND },
-                data => {
+                (data) => {
                     const filepath = data.filepath;
                     const volume = data.volume / 100 * 10;
 
@@ -187,7 +187,7 @@
                         selectedOutputDevice == null ||
                         selectedOutputDevice.label === "App Default"
                     ) {
-                        selectedOutputDevice = settingsService.getAudioOutputDevice();
+                        selectedOutputDevice = settingsService.getSetting("AudioOutputDevice");
                     }
 
                     if (selectedOutputDevice.deviceId === 'overlay') {
diff --git a/src/gui/app/services/tts.service.js b/src/gui/app/services/tts.service.js
index db4c9b11a..e829c7962 100644
--- a/src/gui/app/services/tts.service.js
+++ b/src/gui/app/services/tts.service.js
@@ -26,8 +26,8 @@
                 });
             };
             service.obtainVoices = () => {
-                return new Promise(resolve => {
-                    $q.when(obtainVoices()).then(foundVoices => {
+                return new Promise((resolve) => {
+                    $q.when(obtainVoices()).then((foundVoices) => {
                         voices = foundVoices;
                         resolve();
                     });
@@ -35,7 +35,7 @@
             };
 
             service.getVoices = () => {
-                return voices.map(v => {
+                return voices.map((v) => {
                     return {
                         id: v.voiceURI,
                         name: v.name
@@ -52,7 +52,7 @@
             };
 
             service.getFirebotDefaultVoiceId = () => {
-                const savedDefaultVoiceId = settingsService.getDefaultTtsVoiceId();
+                const savedDefaultVoiceId = settingsService.getSetting("DefaultTtsVoiceId");
                 if (savedDefaultVoiceId) {
                     return savedDefaultVoiceId;
                 }
@@ -86,8 +86,8 @@
 
                 const msg = new SpeechSynthesisUtterance();
                 msg.voice = speechSynthesisVoice;
-                msg.volume = settingsService.getTtsVoiceVolume();
-                msg.rate = settingsService.getTtsVoiceRate();
+                msg.volume = settingsService.getSetting("TtsVoiceVolume");
+                msg.rate = settingsService.getSetting("TtsVoiceRate");
                 msg.text = text;
                 msg.lang = 'en-US';
 
diff --git a/src/gui/app/services/updates.service.js b/src/gui/app/services/updates.service.js
index 2a491be68..31dbcfec3 100644
--- a/src/gui/app/services/updates.service.js
+++ b/src/gui/app/services/updates.service.js
@@ -84,7 +84,7 @@
 
                             if (!foundMajorRelease && (updateType === UpdateType.MAJOR || updateType === UpdateType.MAJOR_PRERELEASE)) {
                                 foundMajorRelease = true;
-                                if (settingsService.notifyOnBeta()) {
+                                if (settingsService.getSetting("NotifyOnBeta")) {
                                     service.majorUpdate = {
                                         gitName: release.name,
                                         gitVersion: release.tag_name,
@@ -95,7 +95,7 @@
                                 updateType === UpdateType.PATCH ||
                                 updateType === UpdateType.MINOR ||
                                 updateType === UpdateType.NONE ||
-                                (updateType === UpdateType.PRERELEASE && settingsService.notifyOnBeta())) {
+                                (updateType === UpdateType.PRERELEASE && settingsService.getSetting("NotifyOnBeta"))) {
                                 latestRelease = release;
                                 latestUpdateType = updateType;
                                 break;
@@ -117,7 +117,7 @@
                             let updateIsAvailable = false;
                             if (latestUpdateType !== UpdateType.NONE) {
                                 updateIsAvailable = true;
-                                const autoUpdateLevel = settingsService.getAutoUpdateLevel();
+                                const autoUpdateLevel = settingsService.getSetting("AutoUpdateLevel");
 
                                 // Check if we should auto update based on the users setting
                                 if (shouldAutoUpdate(autoUpdateLevel, latestUpdateType)) {
diff --git a/src/gui/app/services/utility.service.js b/src/gui/app/services/utility.service.js
index 5c69578ed..8380d5365 100644
--- a/src/gui/app/services/utility.service.js
+++ b/src/gui/app/services/utility.service.js
@@ -321,7 +321,7 @@
                         instanceName
                     ) => {
 
-                        $scope.usingOverlayInstances = settingsService.useOverlayInstances();
+                        $scope.usingOverlayInstances = settingsService.getSetting("UseOverlayInstances");
 
                         $scope.broadcastingSoftwares = [
                             "Local", "Direct Link/2 PC Setup"
@@ -338,7 +338,7 @@
                         $scope.buildOverlayPath = () => {
                             let overlayPath = dataAccess.getPathInUserData("overlay.html");
 
-                            const port = settingsService.getWebServerPort();
+                            const port = settingsService.getSetting("WebServerPort");
 
                             const params = {};
                             if ($scope.selectedBroadcastingSoftware === "Direct Link/2 PC Setup") {
@@ -346,7 +346,7 @@
 
                             } else {
                                 if (port !== 7472 && !isNaN(port)) {
-                                    params["port"] = settingsService.getWebServerPort();
+                                    params["port"] = settingsService.getSetting("WebServerPort");
                                 }
                                 overlayPath = `file:///${overlayPath.replace(/^\//g, "")}`;
                             }
@@ -408,10 +408,10 @@
                         $uibModalInstance,
                         settingsService
                     ) => {
-                        $scope.textSettings = settingsService.getOverlayEventsSettings();
+                        $scope.textSettings = settingsService.getSetting("EventSettings");
 
                         $scope.save = function() {
-                            settingsService.saveOverlayEventsSettings($scope.textSettings);
+                            settingsService.saveSetting("EventsSettings", $scope.textSettings);
                             $uibModalInstance.dismiss();
                         };
 
diff --git a/src/gui/app/services/viewers.service.js b/src/gui/app/services/viewers.service.js
index e20d6af4e..905ad9809 100644
--- a/src/gui/app/services/viewers.service.js
+++ b/src/gui/app/services/viewers.service.js
@@ -9,7 +9,7 @@
 
             // Check to see if the DB is turned on or not.
             service.isViewerDbOn = function() {
-                return settingsService.getViewerDB();
+                return settingsService.getSetting("ViewerDB");
             };
 
             service.viewers = [];
diff --git a/src/gui/app/templates/chat/_chat-messages.html b/src/gui/app/templates/chat/_chat-messages.html
index d48667bf0..8d71a9109 100644
--- a/src/gui/app/templates/chat/_chat-messages.html
+++ b/src/gui/app/templates/chat/_chat-messages.html
@@ -172,13 +172,13 @@ <h4><i class="fas" ng-class="currentThreadMessages().length < 2 ? 'fa-reply' : '
 
   <column-resizer
     on-update="updateLayoutSettings(updatedSettings)"
-    ng-show="settings.showActivityFeed()"
+    ng-show="settings.getSetting('ShowActivityFeed')"
   ></column-resizer>
 
   <div
     id="dashboardActivityFeed"
     class="activity-feed-column"
-    ng-show="settings.showActivityFeed()"
+    ng-show="settings.getSetting('ShowActivityFeed')"
     ng-style="{'width': layout.dashboardActivityFeed }"
   >
     <div class="activity-feed-header">
diff --git a/src/server/http-server-manager.ts b/src/server/http-server-manager.ts
index bd40b2a22..c72bf5fc2 100644
--- a/src/server/http-server-manager.ts
+++ b/src/server/http-server-manager.ts
@@ -6,7 +6,7 @@ import bodyParser from "body-parser";
 import cors from 'cors';
 import path from 'path';
 import logger from "../backend/logwrapper";
-import { settings } from "../backend/common/settings-access";
+import { SettingsManager } from "../backend/common/settings-manager";
 import effectManager from "../backend/effects/effectManager";
 import resourceTokenManager from "../backend/resourceTokenManager";
 import websocketServerManager from "./websocket-server-manager";
@@ -200,7 +200,7 @@ class HttpServerManager extends EventEmitter {
     }
 
     startDefaultHttpServer() {
-        const port: number = settings.getWebServerPort();
+        const port: number = SettingsManager.getSetting("WebServerPort");
 
         websocketServerManager.createServer(this.defaultHttpServer);
 
diff --git a/src/types/settings.d.ts b/src/types/settings.d.ts
new file mode 100644
index 000000000..cb098aff3
--- /dev/null
+++ b/src/types/settings.d.ts
@@ -0,0 +1,193 @@
+export enum FirebotAutoUpdateLevel {
+    Off = 0,
+    Bugfix = 1,
+    Feature = 2,
+    MajorRelease = 3,
+    Betas = 4,
+}
+
+export type FirebotAudioDevice = {
+    label: string;
+    deviceId: string;
+}
+
+export type FirebotSettingsTypes = {
+    ActiveChatUserListTimeout: number;
+    AllowCommandsInSharedChat: boolean;
+    AllowQuoteCSVDownloads: boolean;
+    AllowedActivityEvents: string[];
+    AudioOutputDevice: FirebotAudioDevice;
+    AutoFlagBots: boolean;
+    AutoUpdateLevel: FirebotAutoUpdateLevel;
+    BackupBeforeUpdates: boolean;
+    BackupIgnoreResources: boolean;
+    BackupKeepAll: boolean;
+    BackupLocation: string;
+    BackupOnceADay: boolean;
+    BackupOnExit: boolean;
+    ChatAlternateBackgrounds: boolean;
+    ChatAvatars: boolean;
+    ChatCompactMode: boolean;
+    ChatCustomFontSize: number;
+    ChatCustomFontSizeEnabled: boolean;
+    ChatHideBotAccountMessages: boolean;
+    ChatHideDeletedMessages: boolean;
+    ChatHideWhispers: boolean;
+    ChatPronouns: boolean;
+    ChatShowBttvEmotes: boolean;
+    ChatShowFfzEmotes: boolean;
+    ChatShowSevenTvEmotes: boolean;
+    ChatTaggedNotificationSound: { name: string, path?: string | undefined };
+    ChatTaggedNotificationVolume: number;
+    ChatTimestamps: boolean;
+    ClearChatFeedMode: "never" | "onlyStreamer" | "always";
+    ClearCustomScriptCache: boolean;
+    CopiedOverlayVersion: string;
+    DashboardLayout: object; //TODO
+    DebugMode: boolean;
+    DefaultToAdvancedCommandMode: boolean;
+    DefaultTtsVoiceId: string;
+    EventSettings: object; //TODO
+    FirstTimeUse: boolean;
+    ForceOverlayEffectsToContinueOnRefresh: boolean;
+    IgnoreSubsequentSubEventsAfterCommunitySub: boolean;
+    JustUpdated: boolean;
+    LastBackupDate: Date;
+    LegacySortTagsImported: boolean;
+    MaxBackupCount: number | "All";
+    MinimizeToTray: boolean;
+    NotifyOnBeta: boolean;
+    OpenStreamPreviewOnLaunch: boolean;
+    OverlayInstances: string[];
+    PersistCustomVariables: boolean;
+    QuickActions: object; //TODO
+    RunCustomScripts: boolean;
+    SeenAdvancedCommandModePopup: boolean;
+    ShowAdBreakIndicator: boolean;
+    ShowActivityFeed: boolean;
+    ShowChatViewerList: boolean;
+    ShowHypeTrainIndicator: boolean;
+    ShowUptimeStat: boolean;
+    ShowViewerCountStat: boolean;
+    SidebarControlledServices: string[];
+    SidebarExpanded: boolean;
+    SoundsEnabled: "On" | "Off";
+    Theme: string;
+    TriggerUpcomingAdBreakMinutes: number;
+    TtsVoiceRate: number;
+    TtsVoiceVolume: number;
+    UseOverlayInstances: boolean;
+    ViewerDB: boolean;
+    ViewerListPageSize: number;
+    WebOnlineCheckin: boolean;
+    WebServerPort: number;
+    WhileLoopEnabled: boolean;
+    WysiwygBackground: "black" | "white";
+}
+
+export const FirebotGlobalSettings: Partial<Record<keyof FirebotSettingsTypes, boolean>> = {
+    DebugMode: true
+};
+
+export const FirebotSettingsDefaults: FirebotSettingsTypes = {
+    ActiveChatUserListTimeout: 5,
+    AllowCommandsInSharedChat: false,
+    AllowQuoteCSVDownloads: true,
+    AllowedActivityEvents: [
+        "twitch:raid",
+        "twitch:raid-sent-off",
+        "twitch:follow",
+        "twitch:sub",
+        "twitch:subs-gifted",
+        "twitch:community-subs-gifted",
+        "twitch:cheer",
+        "streamlabs:donation",
+        "streamlabs:eldonation",
+        'extralife:donation',
+        "tipeeestream:donation",
+        "streamelements:donation",
+        "twitch:channel-reward-redemption"
+    ],
+    AudioOutputDevice: { label: "System Default", deviceId: "default" },
+    AutoFlagBots: true,
+    AutoUpdateLevel: FirebotAutoUpdateLevel.Feature,
+    BackupBeforeUpdates: true,
+    BackupIgnoreResources: true,
+    BackupKeepAll: false,
+    BackupLocation: undefined,
+    BackupOnceADay: true,
+    BackupOnExit: true,
+    ChatAlternateBackgrounds: true,
+    ChatAvatars: true,
+    ChatCompactMode: false,
+    ChatCustomFontSize: 17,
+    ChatCustomFontSizeEnabled: false,
+    ChatHideBotAccountMessages: false,
+    ChatHideDeletedMessages: false,
+    ChatHideWhispers: false,
+    ChatPronouns: true,
+    ChatShowBttvEmotes: true,
+    ChatShowFfzEmotes: true,
+    ChatShowSevenTvEmotes: true,
+    ChatTaggedNotificationSound: { name: "None" },
+    ChatTaggedNotificationVolume: 5,
+    ChatTimestamps: true,
+    ClearChatFeedMode: "onlyStreamer",
+    ClearCustomScriptCache: false,
+    CopiedOverlayVersion: "",
+    DashboardLayout: {},
+    DebugMode: false,
+    DefaultToAdvancedCommandMode: false,
+    DefaultTtsVoiceId: undefined,
+    EventSettings: {},
+    FirstTimeUse: true,
+    ForceOverlayEffectsToContinueOnRefresh: true,
+    IgnoreSubsequentSubEventsAfterCommunitySub: true,
+    JustUpdated: false,
+    LegacySortTagsImported: false,
+    LastBackupDate: null,
+    MaxBackupCount: 25,
+    MinimizeToTray: false,
+    NotifyOnBeta: false,
+    OpenStreamPreviewOnLaunch: false,
+    OverlayInstances: [],
+    PersistCustomVariables: false,
+    QuickActions: {},
+    RunCustomScripts: false,
+    SeenAdvancedCommandModePopup: false,
+    ShowActivityFeed: true,
+    ShowAdBreakIndicator: true,
+    ShowChatViewerList: true,
+    ShowHypeTrainIndicator: true,
+    ShowUptimeStat: true,
+    ShowViewerCountStat: true,
+    SidebarControlledServices: ["chat"],
+    SidebarExpanded: true,
+    SoundsEnabled: "On",
+    Theme: "Obsidian",
+    TriggerUpcomingAdBreakMinutes: 0,
+    TtsVoiceRate: 1,
+    TtsVoiceVolume: 0.5,
+    UseOverlayInstances: false,
+    ViewerDB: true,
+    ViewerListPageSize: 10,
+    WebOnlineCheckin: false,
+    WebServerPort: 7472,
+    WhileLoopEnabled: false,
+    WysiwygBackground: "white"
+};
+
+/** Anything in `SettingsTypes` not listed here will resolve to "/settings/settingName" (e.g. "/settings/autoFlagBots") */
+export const FirebotSettingsPaths: Partial<Record<keyof FirebotSettingsTypes, string>> = {
+    ActiveChatUserListTimeout: "/settings/activeChatUsers/inactiveTimer",
+    ChatShowBttvEmotes: "/settings/chat/emotes/bttv",
+    ChatShowFfzEmotes: "/settings/chat/emotes/ffz",
+    ChatShowSevenTvEmotes: "/settings/chat/emotes/seventv",
+    ChatTaggedNotificationSound: "/settings/chat/tagged/sound",
+    ChatTaggedNotificationVolume: "/settings/chat/tagged/volume",
+    DashboardLayout: "/settings/dashboard/layout",
+    ShowActivityFeed: "/settings/activityFeed",
+    ShowChatViewerList: "/settings/chatUsersList",
+    SoundsEnabled: "/settings/sounds",
+    ViewerListPageSize: "/settings/viewerListDatabase/pageSize"
+};
\ No newline at end of file

From 837fd53a7a53030c60214f7cd06da3d8caa1aa81 Mon Sep 17 00:00:00 2001
From: CKY <xx_cky_xx@hotmail.com>
Date: Fri, 20 Dec 2024 18:53:45 -0700
Subject: [PATCH 32/54] fix: chatMessageTextOnly aliases (#2866) (#2927)

---
 .../builtin/twitch/chat/message/chat-message-text-only.ts     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/variables/builtin/twitch/chat/message/chat-message-text-only.ts b/src/backend/variables/builtin/twitch/chat/message/chat-message-text-only.ts
index 019c1fffe..fc366b6a1 100644
--- a/src/backend/variables/builtin/twitch/chat/message/chat-message-text-only.ts
+++ b/src/backend/variables/builtin/twitch/chat/message/chat-message-text-only.ts
@@ -52,10 +52,10 @@ const model: ReplaceVariable = {
             .filter(tp => tp !== "");
 
         // Trim the command trigger if this was a command, unless an optional argument of false was provided.
-        if (trigger?.type === EffectTrigger.COMMAND && trigger?.metadata?.command?.trigger !== null &&
+        if (trigger?.type === EffectTrigger.COMMAND && trigger?.metadata?.userCommand?.trigger !== null &&
             (args.length < 1 || !(args[0] === false || `${args[0]}`.toLowerCase() === "false"))) {
 
-            const triggerRegex = new RegExp(trigger.metadata.command.trigger, "i");
+            const triggerRegex = new RegExp(trigger.metadata.userCommand.trigger, "i");
             const triggerIndex = textParts.findIndex(tp => triggerRegex.test(tp));
 
             if (triggerIndex >= 0) {

From 9b566f6cb3db7a2a1555792464bada8ad60d8cfa Mon Sep 17 00:00:00 2001
From: CKY <xx_cky_xx@hotmail.com>
Date: Fri, 20 Dec 2024 18:56:55 -0700
Subject: [PATCH 33/54] fix: quote searchdate (#2931) (#2932)

---
 src/backend/chat/commands/builtin/quotes.ts | 23 +++++++++++----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/backend/chat/commands/builtin/quotes.ts b/src/backend/chat/commands/builtin/quotes.ts
index 65d0af3af..948f99bfd 100644
--- a/src/backend/chat/commands/builtin/quotes.ts
+++ b/src/backend/chat/commands/builtin/quotes.ts
@@ -277,23 +277,24 @@ export const QuotesManagementSystemCommand: SystemCommand<{
 
             switch (triggeredArg) {
                 case "add": {
-                    const shouldInsertStreamerUsername = (commandOptions.defaultStreamerAttribution && args.length === 1) 
-                                                      || (commandOptions.defaultStreamerAttribution && !args[1].includes("@"));
+                    const shouldInsertStreamerUsername =
+                        (commandOptions.defaultStreamerAttribution && args.length === 1) ||
+                        (commandOptions.defaultStreamerAttribution && !args[1].includes("@"));
                     const expectedArgs = shouldInsertStreamerUsername
-                      ? 2
-                      : 3;
-                    
+                        ? 2
+                        : 3;
+
                     if (args.length < expectedArgs) {
-                    await twitchChat.sendChatMessage(`Please provide some quote text!`);
-                    return resolve();
+                        await twitchChat.sendChatMessage(`Please provide some quote text!`);
+                        return resolve();
                     }
                     // Once we've evaluated that the syntax is correct we make our API calls
                     const channelData = await TwitchApi.channels.getChannelInformation();
                     const currentGameName = channelData && channelData.gameName ? channelData.gameName : "Unknown game";
-                    
+
                     // If shouldInsertStreamerUsername and no @ is included in the originator arg, set originator @streamerName and treat the rest as the quote
                     if (shouldInsertStreamerUsername) {
-                            args.splice(1,0,`@${channelData.displayName}`)
+                        args.splice(1, 0, `@${channelData.displayName}`);
                     }
 
                     const newQuote = {
@@ -404,8 +405,8 @@ export const QuotesManagementSystemCommand: SystemCommand<{
                 }
                 case "searchdate": {
                     const rawDay = parseInt(args[1]);
-                    const rawMonth = parseInt(args[1]);
-                    const rawYear = parseInt(args[1]);
+                    const rawMonth = parseInt(args[2]);
+                    const rawYear = parseInt(args[3]);
 
                     const day = !isNaN(rawDay) ? rawDay : null;
                     const month = !isNaN(rawMonth) ? rawMonth : null;

From 3267f18b4f940bc8c5231f907258d75ddc448ee4 Mon Sep 17 00:00:00 2001
From: CKY <xx_cky_xx@hotmail.com>
Date: Fri, 20 Dec 2024 19:04:27 -0700
Subject: [PATCH 34/54] feat: add more verbose error to http request log
 (#2935)

---
 src/backend/effects/builtin/http-request.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/backend/effects/builtin/http-request.js b/src/backend/effects/builtin/http-request.js
index ea53ddc7c..3fefa3814 100644
--- a/src/backend/effects/builtin/http-request.js
+++ b/src/backend/effects/builtin/http-request.js
@@ -9,12 +9,12 @@ const axios = axiosDefault.create({
     }
 });
 
-axios.interceptors.request.use(request => {
+axios.interceptors.request.use((request) => {
     //logger.debug('HTTP Request Effect [Request]: ', JSON.parse(JSON.stringify(request)));
     return request;
 });
 
-axios.interceptors.response.use(response => {
+axios.interceptors.response.use((response) => {
     //logger.debug('HTTP Request Effect [Response]: ', JSON.parse(JSON.stringify(response)));
     return response;
 });
@@ -159,7 +159,7 @@ const effect = {
                 resolveObj: {
                     header: () => header
                 },
-                closeCallback: newHeader => {
+                closeCallback: (newHeader) => {
                     console.log(newHeader);
                     $scope.effect.headers = $scope.effect.headers.filter(h => h.key !== newHeader.key);
                     $scope.effect.headers.push(newHeader);
@@ -222,7 +222,7 @@ const effect = {
         }
         return errors;
     },
-    onTriggerEvent: async event => {
+    onTriggerEvent: async (event) => {
 
         const logger = require("../../logwrapper");
         const twitchAuth = require("../../auth/twitch-auth");
@@ -284,7 +284,12 @@ const effect = {
                 );
             }
         } catch (error) {
-            logger.error("Error running http request", error.message);
+            const message = {
+                errorMessage: error.message,
+                responseData: error.response?.data
+            };
+
+            logger.error("Error running http request", message);
 
             if (effect.options.runEffectsOnError && !abortSignal?.aborted) {
                 const processEffectsRequest = {

From 3f66a882eea07b47778b9704d60d79e24ffe4641 Mon Sep 17 00:00:00 2001
From: CKY <xx_cky_xx@hotmail.com>
Date: Fri, 20 Dec 2024 19:07:17 -0700
Subject: [PATCH 35/54] feat: add role filter to currency update event (#2873)
 (#2926)

---
 src/backend/events/filters/builtin/firebot/viewer-roles.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backend/events/filters/builtin/firebot/viewer-roles.ts b/src/backend/events/filters/builtin/firebot/viewer-roles.ts
index 3b84caecd..11419c725 100644
--- a/src/backend/events/filters/builtin/firebot/viewer-roles.ts
+++ b/src/backend/events/filters/builtin/firebot/viewer-roles.ts
@@ -24,7 +24,8 @@ const filter: EventFilter = {
         { eventSourceId: "streamloots", eventId: "purchase" },
         { eventSourceId: "streamloots", eventId: "redemption" },
         { eventSourceId: "firebot", eventId: "view-time-update" },
-        { eventSourceId: "firebot", eventId: "viewer-rank-updated" }
+        { eventSourceId: "firebot", eventId: "viewer-rank-updated" },
+        { eventSourceId: "firebot", eventId: "currency-update" }
     ],
     comparisonTypes: ["include", "doesn't include"],
     valueType: "preset",

From 44e92a36ba9d5504f45aad0f1511f40b9aafbdf9 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Fri, 20 Dec 2024 21:31:22 -0500
Subject: [PATCH 36/54] fix: fix settings type/const exports

---
 src/types/{settings.d.ts => settings.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/types/{settings.d.ts => settings.ts} (100%)

diff --git a/src/types/settings.d.ts b/src/types/settings.ts
similarity index 100%
rename from src/types/settings.d.ts
rename to src/types/settings.ts

From 66092cb933b7fa7a97e5b3a68b39dd0e9cefe8c7 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Sat, 21 Dec 2024 22:56:52 -0500
Subject: [PATCH 37/54] fix: stop using Howler (#2938)

---
 .../{soundPlayer.js => sound-player.js}       |  39 ++++---
 src/gui/app/index.html                        |   2 +-
 src/gui/app/services/sound.service.js         | 100 ++++++++++--------
 3 files changed, 77 insertions(+), 64 deletions(-)
 rename src/gui/app/directives/controls/{soundPlayer.js => sound-player.js} (83%)

diff --git a/src/gui/app/directives/controls/soundPlayer.js b/src/gui/app/directives/controls/sound-player.js
similarity index 83%
rename from src/gui/app/directives/controls/soundPlayer.js
rename to src/gui/app/directives/controls/sound-player.js
index 90e80f9a0..44a5a8646 100644
--- a/src/gui/app/directives/controls/soundPlayer.js
+++ b/src/gui/app/directives/controls/sound-player.js
@@ -30,6 +30,7 @@
                 $scope.durationDisplay = "-:--";
                 $scope.controlsEnabled = false;
 
+                /** @type {HTMLAudioElement} sound */
                 let sound = null;
 
                 function pad(num) {
@@ -62,7 +63,7 @@
                 let previousSeek = 0;
                 const seekPositionTimer = $interval(() => {
                     if (sound != null) {
-                        const currentSeek = sound.seek();
+                        const currentSeek = sound.currentTime;
                         if (currentSeek !== previousSeek) {
                             $scope.seekPositionDisplay = getDurationDisplay(currentSeek);
                             previousSeek = currentSeek;
@@ -70,11 +71,15 @@
                     }
                 }, 250);
 
+                function unloadSound() {
+                    sound.pause();
+                    sound.srcObject = null;
+                    sound = null;
+                }
 
                 function loadSound() {
                     if (sound != null) {
-                        sound.unload();
-                        sound = null;
+                        unloadSound();
                     }
                     if ($ctrl.path == null || $ctrl.path.length === 0) {
                         $scope.seekPositionDisplay = "-:--";
@@ -95,14 +100,17 @@
                         }
                     }
 
-                    soundService.getHowlSound($ctrl.path, volume, $ctrl.outputDevice)
-                        .then(s => {
+                    soundService.getSound($ctrl.path, volume, $ctrl.outputDevice)
+                        .then((s) => {
                             sound = s;
 
-                            sound.on('load', function() {
+                            const soundLoadEventHandler = function() {
+                                sound.removeEventListener("load", soundLoadEventHandler);
                                 $scope.controlsEnabled = true;
-                                $scope.durationDisplay = getDurationDisplay(sound.duration());
-                            });
+                                $scope.durationDisplay = getDurationDisplay(sound.duration);
+                            };
+
+                            sound.addEventListener("canplay", soundLoadEventHandler);
 
                             sound.load();
                         });
@@ -113,7 +121,7 @@
                         return false;
                     }
 
-                    return sound.playing();
+                    return !sound.paused;
                 };
 
                 $scope.playOrPause = () => {
@@ -121,7 +129,7 @@
                         return;
                     }
 
-                    if (sound.playing()) {
+                    if (!sound.paused) {
                         sound.pause();
                     } else {
                         sound.play();
@@ -134,11 +142,12 @@
                         return;
                     }
 
-                    sound.stop();
+                    sound.pause();
+                    sound.currentTime = 0;
                 };
 
 
-                $ctrl.$onChanges = function (changes) {
+                $ctrl.$onChanges = function(changes) {
                     if (changes.path || changes.outputDevice) {
                         loadSound();
                     }
@@ -152,7 +161,7 @@
                                 } else if (newVolume > 0) {
                                     newVolume = newVolume / 10;
                                 }
-                                sound.volume(newVolume);
+                                sound.volume = newVolume;
                             }
                         }
                     }
@@ -161,12 +170,10 @@
                 $ctrl.$onDestroy = function() {
                     $interval.cancel(seekPositionTimer);
                     if (sound != null) {
-                        sound.unload();
+                        unloadSound();
                     }
                 };
 
-
-
                 $ctrl.$onInit = function() {
                     loadSound();
                 };
diff --git a/src/gui/app/index.html b/src/gui/app/index.html
index 5a9668067..a5a34e990 100644
--- a/src/gui/app/index.html
+++ b/src/gui/app/index.html
@@ -199,7 +199,7 @@
     <script type="text/javascript" src="./directives/controls/sort-tag-dropdown.component.js"></script>
     <script type="text/javascript" src="./directives/controls/sort-tag-list.js"></script>
     <script type="text/javascript" src="./directives/controls/sort-tags-row.js"></script>
-    <script type="text/javascript" src="./directives/controls/soundPlayer.js"></script>
+    <script type="text/javascript" src="./directives/controls/sound-player.js"></script>
     <script type="text/javascript" src="./directives/controls/specialized/discord-channel-webhooks.js"></script>
     <script type="text/javascript" src="./directives/controls/specialized/discord-file-upload-list.js"></script>
     <script type="text/javascript" src="./directives/controls/specialized/gift-receivers-list.js"></script>
diff --git a/src/gui/app/services/sound.service.js b/src/gui/app/services/sound.service.js
index d129b9619..ae718b74b 100644
--- a/src/gui/app/services/sound.service.js
+++ b/src/gui/app/services/sound.service.js
@@ -1,15 +1,14 @@
 "use strict";
 
 (function() {
-
-    const { Howl, Howler } = require("howler");
-
     // This provides methods for playing sounds
 
     angular
         .module("firebotApp")
         .factory("soundService", function(logger, settingsService, listenerService, $q, websocketService, backendCommunicator) {
             const service = {};
+            /** @type {HTMLAudioElement[]} */
+            const sounds = [];
 
             // Connection Sounds
             service.connectSound = function(type) {
@@ -99,74 +98,74 @@
 
 
             service.playSound = function(path, volume, outputDevice, fileType = null, maxSoundLength = null) {
-
                 if (outputDevice == null) {
                     outputDevice = settingsService.getSetting("AudioOutputDevice");
                 }
 
-                $q.when(service.getHowlSound(path, volume, outputDevice, fileType))
-                    .then((sound) => {
-
+                $q.when(service.getSound(path, volume, outputDevice, fileType))
+                    .then(/** @param {HTMLAudioElement} sound */ (sound) => {
                         let maxSoundLengthTimeout;
-                        // Clear listener after first call.
-                        sound.once('load', function() {
+                        sounds.push(sound);
+
+                        const soundEndEventHandler = function() {
+                            // Clear listener after first call.
+                            sound.removeEventListener("ended", soundEndEventHandler);
+                            sound.srcObject = null;
+                            sounds.splice(sounds.indexOf(sound), 1);
+                            clearInterval(maxSoundLengthTimeout);
+                        };
+
+                        const soundLoadEventHandler = function() {
+                            // Clear listener after first call.
+                            sound.removeEventListener("canplay", soundLoadEventHandler);
                             sound.play();
 
                             const intMaxSoundLength = parseInt(maxSoundLength);
                             if (intMaxSoundLength > 0) {
                                 maxSoundLengthTimeout = setTimeout(function() {
-                                    sound.stop();
-                                    sound.unload();
+                                    sound.pause();
+                                    soundEndEventHandler();
                                 }, maxSoundLength * 1000);
                             }
-                        });
+                        };
+
+                        sound.addEventListener("canplay", soundLoadEventHandler);
 
                         // Fires when the sound finishes playing.
-                        sound.once('end', function() {
-                            sound.unload();
-                            clearInterval(maxSoundLengthTimeout);
-                        });
+                        sound.addEventListener("ended", soundEndEventHandler);
 
                         sound.load();
                     });
             };
 
-            service.getHowlSound = function(path, volume, outputDevice = settingsService.getSetting("AudioOutputDevice"), fileType = null) {
-                return navigator.mediaDevices.enumerateDevices()
-                    .then((deviceList) => {
-                        const filteredDevice = deviceList.filter(d => d.label === outputDevice.label
-                            || d.deviceId === outputDevice.deviceId);
+            service.getSound = async function(path, volume, outputDevice = settingsService.getSetting("AudioOutputDevice")) {
+                const deviceList = await navigator.mediaDevices.enumerateDevices();
 
-                        const sinkId = filteredDevice.length > 0 ? filteredDevice[0].deviceId : 'default';
+                const filteredDevice = deviceList.find(d => d.label === outputDevice.label
+                    || d.deviceId === outputDevice.deviceId);
 
-                        const sound = new Howl({
-                            src: [path],
-                            volume: volume,
-                            format: fileType,
-                            html5: true,
-                            sinkId: sinkId,
-                            preload: false
-                        });
+                const sound = new Audio(path);
+                sound.volume = volume;
+                await sound.setSinkId(filteredDevice?.deviceId ?? 'default');
 
-                        return sound;
-                    });
+                return sound;
             };
 
-            service.getSoundDuration = function(path, format = undefined) {
+            /**
+             * Combination of fix from:
+             * https://github.com/nmori/Firebot/blob/f53d12fe774059327dadedf4fa8268f4e53cad7f/src/gui/app/services/sound.service.js#L174-L182
+             *
+             * While maintaining duration precision from Howler:
+             * https://github.com/ebiggz/howler.js/blob/0bbfe6623e13bef8e58c789f5f67bfc87d50000b/src/howler.core.js#L2052
+             */
+            service.getSoundDuration = function(path) {
                 return new Promise((resolve) => {
-
-                    console.log("duration for", path, format);
-
-                    const sound = new Howl({
-                        src: [path],
-                        format: format || [],
-                        onload: () => {
-                            resolve(sound.duration());
-                            sound.unload();
-                        },
-                        onloaderror: () => {
-                            resolve(0);
-                        }
+                    const audio = new Audio(path);
+                    audio.addEventListener("loadedmetadata", () => {
+                        resolve(Math.ceil(audio.duration * 10) / 10);
+                    });
+                    audio.addEventListener("error", () => {
+                        resolve(0);
                     });
                 });
             };
@@ -212,7 +211,14 @@
 
             service.stopAllSounds = function() {
                 logger.info("Stopping all sounds...");
-                Howler.unload();
+                while (sounds.length > 0) {
+                    let sound = sounds.pop();
+                    if (sound) {
+                        sound.pause();
+                        sound.srcObject = null;
+                        sound = null;
+                    }
+                }
             };
 
             backendCommunicator.on("stop-all-sounds", () => {

From ee03e64df8d0a7c9d81c2a3794703e09ae793339 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Sun, 22 Dec 2024 11:09:02 -0500
Subject: [PATCH 38/54] chore: remove Howler

---
 package-lock.json                                          | 7 -------
 package.json                                               | 1 -
 .../handlers/custom-scripts/custom-script-helpers.js       | 1 -
 src/gui/.eslintrc.js                                       | 1 -
 4 files changed, 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 80644d2d4..43b0e1092 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,6 @@
                 "fuse.js": "^7.0.0",
                 "glob": "^10.3.10",
                 "he": "^1.2.0",
-                "howler": "https://github.com/ebiggz/howler.js/tarball/master",
                 "list.js": "^1.5.0",
                 "luxon": "^3.1.1",
                 "marked": "^13.0.3",
@@ -8583,12 +8582,6 @@
             "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
             "dev": true
         },
-        "node_modules/howler": {
-            "version": "2.0.5",
-            "resolved": "https://github.com/ebiggz/howler.js/tarball/master",
-            "integrity": "sha512-N+i6l4kDueHaQxtOpJdMJBmupzkUpGZGOgPoagssFBTgtq4krBV1ko6Fw75m0LT9S5FGN/eno4AO4X04dF5Adw==",
-            "license": "MIT"
-        },
         "node_modules/http-cache-semantics": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
diff --git a/package.json b/package.json
index db2a4ee40..dcc233027 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,6 @@
         "fuse.js": "^7.0.0",
         "glob": "^10.3.10",
         "he": "^1.2.0",
-        "howler": "https://github.com/ebiggz/howler.js/tarball/master",
         "list.js": "^1.5.0",
         "luxon": "^3.1.1",
         "marked": "^13.0.3",
diff --git a/src/backend/common/handlers/custom-scripts/custom-script-helpers.js b/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
index 15262cc1d..ec85b62f0 100644
--- a/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
+++ b/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
@@ -84,7 +84,6 @@ function buildModules(scriptManifest) {
         path: require('path'),
         JsonDb: require('node-json-db').JsonDB,
         moment: require('moment'),
-        howler: require("howler"),
         logger: logger,
         // thin chat shim for basic backwards compatibility
         chat: {
diff --git a/src/gui/.eslintrc.js b/src/gui/.eslintrc.js
index a53916259..5280b173b 100644
--- a/src/gui/.eslintrc.js
+++ b/src/gui/.eslintrc.js
@@ -11,7 +11,6 @@ module.exports = {
         "fs": true,
         "request": true,
         "List": true,
-        "howler": true,
         "compareVersions": true,
         "marked": true,
         "path": true,

From 7399e504959c64d7fe94559917d7583c51f2ea90 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Sun, 22 Dec 2024 21:17:51 -0500
Subject: [PATCH 39/54] feat/chore: add backup location, more settings cleanup
 (#2398) (#2939)

---
 .../electron/events/when-ready.js             |   4 +-
 .../electron/events/windows-all-closed.js     |   4 +-
 .../electron/window-management.js             |   7 +-
 src/backend/backup-manager.ts                 | 157 ++++++-
 src/backend/common/common-listeners.js        |  35 +-
 src/backend/common/settings-manager.ts        |  66 ++-
 src/backend/viewers/viewer-database.ts        |   4 +-
 src/gui/app/app-main.js                       |   4 +-
 .../app/controllers/settings.controller.js    | 389 +-----------------
 .../settings/categories/backups-settings.js   | 180 +++-----
 src/gui/app/services/backup.service.js        | 140 ++++++-
 src/gui/app/services/listener.service.js      |   5 -
 src/gui/app/templates/_settings.html          |  23 --
 src/types/settings.ts                         |  10 +-
 14 files changed, 413 insertions(+), 615 deletions(-)

diff --git a/src/backend/app-management/electron/events/when-ready.js b/src/backend/app-management/electron/events/when-ready.js
index 0d4e1a5b7..fa19e4598 100644
--- a/src/backend/app-management/electron/events/when-ready.js
+++ b/src/backend/app-management/electron/events/when-ready.js
@@ -233,8 +233,8 @@ exports.whenReady = async () => {
     global.SCRIPTS_DIR = profileManager.getPathInProfile("/scripts/");
 
     windowManagement.updateSplashScreenStatus("Running daily backup...");
-    const backupManager = require("../../../backup-manager");
-    await backupManager.onceADayBackUpCheck();
+    const { BackupManager } = require("../../../backup-manager");
+    await BackupManager.onceADayBackUpCheck();
 
     // start the REST api server
     windowManagement.updateSplashScreenStatus("Starting internal web server...");
diff --git a/src/backend/app-management/electron/events/windows-all-closed.js b/src/backend/app-management/electron/events/windows-all-closed.js
index 1a962024e..505ebe1be 100644
--- a/src/backend/app-management/electron/events/windows-all-closed.js
+++ b/src/backend/app-management/electron/events/windows-all-closed.js
@@ -8,7 +8,7 @@ exports.windowsAllClosed = async () => {
     logger.debug("All windows closed triggered");
 
     const { SettingsManager } = require("../../../common/settings-manager");
-    const backupManager = require("../../../backup-manager");
+    const { BackupManager } = require("../../../backup-manager");
 
     // Stop all scheduled tasks
     const scheduledTaskManager = require("../../../timers/scheduled-task-manager");
@@ -38,7 +38,7 @@ exports.windowsAllClosed = async () => {
 
     if (SettingsManager.getSetting("BackupOnExit")) {
         // Make a backup
-        await backupManager.startBackup(false, app.quit);
+        await BackupManager.startBackup(false, app.quit);
     } else {
         app.quit();
     }
diff --git a/src/backend/app-management/electron/window-management.js b/src/backend/app-management/electron/window-management.js
index 17df2f822..1282651d3 100644
--- a/src/backend/app-management/electron/window-management.js
+++ b/src/backend/app-management/electron/window-management.js
@@ -12,6 +12,7 @@ const { setupTitlebar, attachTitlebarToWindow } = require("custom-electron-title
 const screenHelpers = require("./screen-helpers");
 const frontendCommunicator = require("../../common/frontend-communicator");
 const { SettingsManager } = require("../../common/settings-manager");
+const { BackupManager } = require("../../backup-manager");
 
 const argv = require('../../common/argv-parser');
 
@@ -253,9 +254,7 @@ async function createMainWindow() {
                     toolTip: "Open the folder where backups are stored",
                     sublabel: "Open the folder where backups are stored",
                     click: () => {
-                        const backupFolder = path.resolve(
-                            dataAccess.getPathInUserData("/backups/")
-                        );
+                        const backupFolder = BackupManager.backupFolderPath;
                         shell.openPath(backupFolder);
                     },
                     icon: await createIconImage("../../../gui/images/icons/mdi/folder-refresh-outline.png")
@@ -330,7 +329,7 @@ async function createMainWindow() {
                     toolTip: "Restores Firebot from a backup",
                     sublabel: "Restores Firebot from a backup",
                     click: async () => {
-                        frontendCommunicator.send("restore-backup");
+                        frontendCommunicator.send("backups:start-restore-backup");
                     },
                     icon: await createIconImage("../../../gui/images/icons/mdi/backup-restore.png")
                 },
diff --git a/src/backend/backup-manager.ts b/src/backend/backup-manager.ts
index 0c664c6cd..1419bd2da 100644
--- a/src/backend/backup-manager.ts
+++ b/src/backend/backup-manager.ts
@@ -14,20 +14,130 @@ const RESTORE_FOLDER_PATH = dataAccess.getPathInTmpDir("/restore");
 const PROFILES_FOLDER_PATH = dataAccess.getPathInUserData("/profiles");
 const USER_DATA_FOLDER_PATH = dataAccess.getPathInUserData("/");
 
+export type FirebotBackup = {
+    name: string;
+    path: string;
+    backupDate: Date;
+    version: string;
+    size: number;
+    isManual: boolean;
+    neverDelete: boolean;
+};
+
 class BackupManager {
-    private readonly _backupFolderPath = path.join(dataAccess.getPathInUserData("/"), "backups");
+    private _backupFolderPath: string = undefined;
 
     constructor() {
-        frontendCommunicator.on("start-backup", (manualActivation: boolean) => {
+        this.updateBackupFolderPath();
+
+        SettingsManager.on("settings:setting-updated:BackupLocation", () => {
+            this.updateBackupFolderPath();
+        });
+
+        frontendCommunicator.on("backups:get-backup-folder-path", () => {
+            return this._backupFolderPath;
+        });
+
+        frontendCommunicator.onAsync("backups:get-backup-list", async () => {
+            return await this.getBackupList();
+        });
+
+        frontendCommunicator.on("backups:start-backup", (manualActivation: boolean) => {
             this.startBackup(manualActivation, () => {
                 logger.info("backup complete");
-                frontendCommunicator.send("backup-complete", manualActivation);
+                frontendCommunicator.send("backups:backup-complete", manualActivation);
             });
         });
 
-        frontendCommunicator.onAsync("restore-backup", async (backupFilePath: string): Promise<{ success: boolean; reason?: string; }> => {
+        frontendCommunicator.onAsync("backups:restore-backup", async (backupFilePath: string): Promise<{ success: boolean; reason?: string; }> => {
             return await this.restoreBackup(backupFilePath);
         });
+
+        frontendCommunicator.onAsync("backups:delete-backup", async (backupFilePath: string): Promise<boolean> => {
+            try {
+                await fsp.unlink(backupFilePath);
+                return true;
+            } catch (error) {
+                logger.error("Error deleting backup", error);
+                return false;
+            }
+        });
+
+        frontendCommunicator.onAsync("backups:toggle-backup-prevent-deletion", async (backupFilePath: string) => {
+            await this.toggleBackupPreventDeletion(backupFilePath);
+        });
+
+        frontendCommunicator.onAsync("backups:move-backup-folder", async (newPath: string) => {
+            return await this.moveBackupFolder(newPath);
+        });
+    }
+
+    get backupFolderPath() {
+        return this._backupFolderPath;
+    }
+
+    async getBackupList(): Promise<FirebotBackup[]> {
+        const files = await fsp.readdir(this._backupFolderPath);
+
+        const backups = await Promise.all(files
+            .filter(f => f.endsWith(".zip"))
+            .map(async v => await this.getBackupInfo(path.join(this._backupFolderPath, v))));
+
+        backups.sort((a, b) => {
+            return b.backupDate.getTime() - a.backupDate.getTime();
+        });
+
+        return backups;
+    }
+
+    private async getBackupInfo(backupFilePath: string): Promise<FirebotBackup> {
+        const fileName = path.basename(backupFilePath);
+        try {
+            const fileStats = await fsp.stat(backupFilePath);
+            const backupDate = fileStats.birthtime;
+
+            let version = "Unknown Version";
+            const versionRegEx = /_(v?\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.\d+)?)?)(?:_|\b)/;
+            const match = fileName.match(versionRegEx);
+            if (match != null) {
+                version = match[1];
+            }
+
+            return {
+                name: fileName.replace(".zip", ""),
+                path: backupFilePath,
+                backupDate: backupDate,
+                version: version,
+                size: fileStats.size,
+                isManual: fileName.includes("manual"),
+                neverDelete: fileName.includes("NODELETE")
+            };
+        } catch (error) {
+            logger.error(`Error reading backup file ${fileName}`, error);
+            return undefined;
+        }
+    }
+
+    private updateBackupFolderPath() {
+        const backupLocation = SettingsManager.getSetting("BackupLocation");
+        this._backupFolderPath = backupLocation?.length > 0
+            ? backupLocation
+            : path.join(dataAccess.getPathInUserData("/"), "backups");
+    }
+
+    async toggleBackupPreventDeletion(backupFilePath: string) {
+        const backup = await this.getBackupInfo(backupFilePath);
+
+        backup.neverDelete = !backup.neverDelete;
+        const oldName = `${backup.name}.zip`;
+        const newName = backup.neverDelete
+            ? `${backup.name}_NODELETE.zip`
+            : `${backup.name.replace("_NODELETE", "")}.zip`;
+
+        await fsp.rename(
+            path.join(this._backupFolderPath, oldName),
+            path.join(this._backupFolderPath, newName)
+        );
     }
 
     private async cleanUpOldBackups(callback: () => void) {
@@ -106,12 +216,12 @@ class BackupManager {
         const folderPath = path.resolve(dataAccess.getPathInUserData("/"));
         //archive.directory(folderPath, "profiles");
 
-        const varIgnoreInArchive = ['backups/**', 'clips/**', 'logs/**', 'overlay.html'];
+        const varIgnoreInArchive = ["backups/**", "clips/**", "logs/**", "overlay.html"];
         const ignoreResources = SettingsManager.getSetting("BackupIgnoreResources");
 
         if (ignoreResources && !manualActivation) {
             logger.info("Ignoring overlay-resources folder");
-            varIgnoreInArchive.push('overlay-resources/**');
+            varIgnoreInArchive.push("overlay-resources/**");
         }
 
         const fileList = await glob("**/*", {
@@ -225,12 +335,12 @@ class BackupManager {
         const unzippedData = unzipSync(await fsp.readFile(backupFilePath));
 
         for (const [filepath] of Object.entries(unzippedData)) {
-            if (filepath.includes('profiles')) {
+            if (filepath.includes("profiles")) {
                 if (hasGlobalSettings) {
                     return true;
                 }
                 hasProfilesDir = true;
-            } else if (path.basename(filepath).toLowerCase() === 'global-settings.json') {
+            } else if (path.basename(filepath).toLowerCase() === "global-settings.json") {
                 if (hasProfilesDir) {
                     return true;
                 }
@@ -245,7 +355,7 @@ class BackupManager {
 
         const unzippedData = unzipSync(await fsp.readFile(backupFilePath));
         for (const [filepath, bytes] of Object.entries(unzippedData)) {
-            if (filepath.endsWith('/')) {
+            if (filepath.endsWith("/")) {
                 continue;
             }
 
@@ -257,10 +367,35 @@ class BackupManager {
 
     private async copyRestoreFilesToUserData() {
         await fsp.cp(RESTORE_FOLDER_PATH, USER_DATA_FOLDER_PATH, { recursive: true, force: true });
-        logger.info('Copied backup data');
+        logger.info("Copied backup data");
+    }
+
+    private async moveBackupFolder(newPath: string): Promise<boolean> {
+        let success = false;
+
+        try {
+            logger.info(`Moving backup files to ${newPath}`);
+
+            // Test that we can access the new path
+            await fsp.access(newPath);
+
+            logger.info("Copying old backup files to new location");
+            await fsp.cp(this._backupFolderPath, newPath, { force: true, recursive: true });
+
+            logger.info("Saving new backup location setting");
+            SettingsManager.saveSetting("BackupLocation", newPath);
+
+            logger.info("Backup folder moved successfully");
+            success = true;
+        } catch (error) {
+            logger.error(`Error moving backup folder to ${newPath}`, error);
+        }
+
+        frontendCommunicator.send("backups:move-backup-folder-completed", success);
+        return success;
     }
 }
 
 const backupManager = new BackupManager();
 
-export = backupManager;
\ No newline at end of file
+export { backupManager as BackupManager };
\ No newline at end of file
diff --git a/src/backend/common/common-listeners.js b/src/backend/common/common-listeners.js
index 6b669a66c..a93de3bb3 100644
--- a/src/backend/common/common-listeners.js
+++ b/src/backend/common/common-listeners.js
@@ -12,7 +12,7 @@ exports.setupCommonListeners = () => {
     const dataAccess = require("./data-access");
     const profileManager = require("./profile-manager");
     const { SettingsManager } = require("./settings-manager");
-    const backupManager = require("../backup-manager");
+    const { BackupManager } = require("../backup-manager");
     const webServer = require("../../server/http-server-manager");
 
     frontendCommunicator.on("show-twitch-preview", () => {
@@ -113,36 +113,9 @@ exports.setupCommonListeners = () => {
         event.sender.send("gotImportFolderPath", { path: path, id: uniqueid });
     });
 
-    // Get Get Backup Zip Path
-    // This listens for an event from the render media.js file to open a dialog to get a filepath.
-    ipcMain.on("getBackupZipPath", (event, uniqueid) => {
-        const backupsFolderPath = path.resolve(
-            `${dataAccess.getUserDataPath() + path.sep}backups${path.sep}`
-        );
-
-        const fs = require("fs");
-        let backupsFolderExists = false;
-        try {
-            backupsFolderExists = fs.existsSync(backupsFolderPath);
-        } catch (err) {
-            logger.warn("cannot check if backup folder exists", err);
-        }
-
-        const zipPath = dialog.showOpenDialogSync({
-            title: "Select backup zp",
-            buttonLabel: "Select Backup",
-            defaultPath: backupsFolderExists ? backupsFolderPath : undefined,
-            filters: [{ name: "Zip", extensions: ["zip"] }]
-        });
-        event.sender.send("gotBackupZipPath", { path: zipPath, id: uniqueid });
-    });
-
     // Opens the firebot backup folder
     ipcMain.on("open-backup-folder", () => {
-        // We include "fakefile.txt" as a workaround to make it open into the 'root' folder instead
-        // of opening to the poarent folder with 'Firebot'folder selected.
-        const backupFolder = path.resolve(`${dataAccess.getUserDataPath() + path.sep}backups${path.sep}`);
-        shell.openPath(backupFolder);
+        shell.openPath(BackupManager.backupFolderPath);
     });
 
     // When we get an event from the renderer to create a new profile.
@@ -199,7 +172,7 @@ exports.setupCommonListeners = () => {
 
         //back up first
         if (SettingsManager.getSetting("BackupBeforeUpdates")) {
-            await backupManager.startBackup();
+            await BackupManager.startBackup();
         }
 
         // Download Update
@@ -240,4 +213,4 @@ exports.setupCommonListeners = () => {
         // eslint-disable-next-line no-unused-expressions
         updater.autoUpdater;
     });
-};
+};
\ No newline at end of file
diff --git a/src/backend/common/settings-manager.ts b/src/backend/common/settings-manager.ts
index fe6c6c68e..4b71ff525 100644
--- a/src/backend/common/settings-manager.ts
+++ b/src/backend/common/settings-manager.ts
@@ -16,6 +16,12 @@ import {
 class SettingsManager extends EventEmitter {
     settingsCache = {};
 
+    constructor() {
+        super();
+
+        this.migrateUserSettingsToGlobal();
+    }
+
     private getSettingsFile(): JsonDB {
         return profileManager.getJsonDbInProfile("/settings");
     }
@@ -35,6 +41,42 @@ class SettingsManager extends EventEmitter {
         }));
     }
 
+    private migrateUserSettingsToGlobal() {
+        // Iterate through all the global settings
+        Object.keys(FirebotGlobalSettings).forEach((setting: keyof FirebotSettingsTypes) => {
+            const settingPath = this.getSettingPath(setting);
+            const userSettingExists = this.userSettingExists(settingPath);
+            const globalSettingExists = this.globalSettingExists(settingPath);
+
+            // If there IS a user value but NOT a global value,
+            // save the user value to the global file and delete the user value
+            if (userSettingExists && !globalSettingExists) {
+                this.saveSetting(setting, this.getDataFromFile(settingPath, true));
+                this.deleteUserDataAtPath(settingPath);
+            }
+        });
+    }
+
+    private userSettingExists(settingPath: string) {
+        let success = false;
+
+        try {
+            success = this.getSettingsFile().getData(settingPath) != null;
+        } catch { }
+
+        return success;
+    }
+
+    private globalSettingExists(settingPath: string) {
+        let success = false;
+
+        try {
+            success = this.getGlobalSettingsFile().getData(settingPath) != null;
+        } catch { }
+
+        return success;
+    }
+
     private getDataFromFile(settingPath: string, forceCacheUpdate = false, defaultValue = undefined) {
         try {
             if (this.settingsCache[settingPath] == null || forceCacheUpdate) {
@@ -96,7 +138,7 @@ class SettingsManager extends EventEmitter {
         }
     }
 
-    private deleteDataAtPath(settingPath: string) {
+    private deleteUserDataAtPath(settingPath: string) {
         try {
             this.getSettingsFile().delete(settingPath);
             delete this.settingsCache[settingPath];
@@ -104,6 +146,14 @@ class SettingsManager extends EventEmitter {
         } catch { }
     }
 
+    private deleteGlobalDataAtPath(settingPath: string) {
+        try {
+            this.getGlobalSettingsFile().delete(settingPath);
+            delete this.settingsCache[settingPath];
+            frontendCommunicator.send("settings:setting-deleted", settingPath);
+        } catch { }
+    }
+
     /**
      * Get the JSON data path for a specific Firebot setting in the settings file
      *
@@ -151,7 +201,9 @@ class SettingsManager extends EventEmitter {
         } else {
             this.pushDataToFile(this.getSettingPath(settingName), data);
         }
-        this.emit(`settings:setting-saved:${settingName}`, data);
+
+        frontendCommunicator.send(`settings:setting-updated:${settingName}`, data);
+        this.emit(`settings:setting-updated:${settingName}`, data);
     }
 
     /**
@@ -160,7 +212,13 @@ class SettingsManager extends EventEmitter {
      * @param settingName Name of the setting to delete
      */
     deleteSetting<SettingName extends keyof FirebotSettingsTypes>(settingName: SettingName) {
-        this.deleteDataAtPath(this.getSettingPath(settingName));
+        if (FirebotGlobalSettings[settingName] === true) {
+            this.deleteGlobalDataAtPath(this.getSettingPath(settingName));
+        } else {
+            this.deleteUserDataAtPath(this.getSettingPath(settingName));
+        }
+
+        frontendCommunicator.send(`settings:setting-updated:${settingName}`, null);
         this.emit(`settings:setting-deleted:${settingName}`);
     }
 
@@ -329,4 +387,4 @@ frontendCommunicator.on("settings:flush-settings-cache", () => {
     settings.flushSettingsCache();
 });
 
-export { settings as SettingsManager };
+export { settings as SettingsManager };
\ No newline at end of file
diff --git a/src/backend/viewers/viewer-database.ts b/src/backend/viewers/viewer-database.ts
index 819da270a..c1054ac58 100644
--- a/src/backend/viewers/viewer-database.ts
+++ b/src/backend/viewers/viewer-database.ts
@@ -10,7 +10,7 @@ import accountAccess from "../common/account-access";
 import userAccess from "../common/user-access";
 import currencyAccess from "../currency/currency-access";
 import eventManager from "../events/EventManager";
-import backupManager from "../backup-manager";
+import { BackupManager } from "../backup-manager";
 import frontendCommunicator from "../common/frontend-communicator";
 import rankManager from "../ranks/rank-manager";
 import util, { wait } from "../utility";
@@ -449,7 +449,7 @@ class ViewerDatabase extends EventEmitter {
     }
 
     async purgeViewers(options: ViewerPurgeOptions): Promise<void> {
-        await backupManager.startBackup(false, async () => {
+        await BackupManager.startBackup(false, async () => {
             try {
                 const numRemoved = await this._db
                     .removeAsync({ $where: this.getPurgeWherePredicate(options)}, {multi: true});
diff --git a/src/gui/app/app-main.js b/src/gui/app/app-main.js
index 7c9bbcd24..a65c74283 100644
--- a/src/gui/app/app-main.js
+++ b/src/gui/app/app-main.js
@@ -442,7 +442,7 @@
             });
         });
 
-        backendCommunicator.on("restore-backup", () => {
+        backendCommunicator.on("backups:start-restore-backup", () => {
             backupService.openBackupZipFilePicker()
                 .then((backupFilePath) => {
                     if (backupFilePath != null) {
@@ -666,4 +666,4 @@
         };
     });
 
-}(angular));
+}(angular));
\ No newline at end of file
diff --git a/src/gui/app/controllers/settings.controller.js b/src/gui/app/controllers/settings.controller.js
index 10f8991ae..855b2cf69 100644
--- a/src/gui/app/controllers/settings.controller.js
+++ b/src/gui/app/controllers/settings.controller.js
@@ -1,32 +1,11 @@
 "use strict";
 (function() {
     //This handles the Settings tab
-
-    const fs = require("fs");
-    const path = require("path");
-    const dataAccess = require("../../backend/common/data-access");
-    const moment = require("moment");
-
     angular
         .module("firebotApp")
-        .controller("settingsController", function(
-            $scope,
-            $timeout,
-            $q,
-            settingsService,
-            utilityService,
-            listenerService,
-            integrationService,
-            connectionService,
-            $http,
-            backendCommunicator,
-            ttsService,
-            accountAccess,
-            backupService
-        ) {
+        .controller("settingsController", function($scope, settingsService) {
             $scope.settings = settingsService;
 
-
             $scope.categories = [
                 {
                     name: "General",
@@ -95,372 +74,8 @@
                 $scope.selectedCategory = category;
             };
 
-            $scope.getSelectedVoiceName = () => {
-                const selectedVoiceId = settingsService.getSetting("DefaultTtsVoiceId");
-                const voice = ttsService.getVoiceById(selectedVoiceId);
-                return voice ? voice.name : "Unknown Voice";
-            };
-
-            $scope.ttsVoiceOptions = ttsService.getVoices().reduce((acc, v) => {
-                acc[v.id] = v.name;
-                return acc;
-            }, {});
-
-            $scope.ttsVolumeSlider = {
-                value: settingsService.getSetting("TtsVoiceVolume"),
-                options: {
-                    floor: 0,
-                    ceil: 1,
-                    step: 0.1,
-                    precision: 1,
-                    translate: function(value) {
-                        return Math.floor(value * 10);
-                    },
-                    onChange: (_, value) => {
-                        settingsService.saveSetting("TtsVoiceVolume", value);
-                    }
-                }
-            };
-
-            $scope.ttsRateSlider = {
-                value: settingsService.getSetting("TtsVoiceRate"),
-                options: {
-                    floor: 0.1,
-                    ceil: 10,
-                    step: 0.1,
-                    precision: 1,
-                    onChange: (_, value) => {
-                        settingsService.saveSetting("TtsVoiceRate", value);
-                    }
-                }
-            };
-
-            const streamerName = accountAccess.accounts.streamer.username;
-
-            const testTTSMessages = [
-                "I hope you are having a nice day.",
-                "It sure is nice to be able to talk.",
-                "I think you are awesome.",
-                "When do you go to the dentist? Tooth hurty. Ha ha.",
-                "This is a test message. Beep boop.",
-                `I'm sorry, ${streamerName}. I'm afraid I can't do that.`
-            ];
-
-            $scope.testTTS = () => {
-                ttsService.readText(testTTSMessages[Math.floor(Math.random() * testTTSMessages.length)], "default");
-            };
-
-            $scope.refreshSliders = function() {
-                $timeout(function() {
-                    $scope.$broadcast('rzSliderForceRender');
-                });
-            };
-
-            // $scope.showSetupWizard = utilityService.showSetupWizard;
-            $scope.showSetupWizard = () => {
-                utilityService.showModal({
-                    component: "setupWizardModal"
-                });
-            };
-
-            $scope.integrations = integrationService;
-
-            $scope.openRootFolder = function() {
-                listenerService.fireEvent(listenerService.EventType.OPEN_ROOT);
-            };
-
-            $scope.openLogsFolder = function() {
-                backendCommunicator.fireEvent("openLogsFolder");
-            };
-
-            $scope.openVariableInspector = function() {
-                backendCommunicator.fireEvent("show-variable-inspector");
-            };
-
-            $scope.startBackup = function() {
-                $scope.isBackingUp = true;
-                $scope.backupCompleted = false;
-                backupService.startBackup();
-            };
-
-            $scope.currentMaxBackups = settingsService.getSetting("MaxBackupCount");
-
-            $scope.updateMaxBackups = function(option) {
-                settingsService.saveSetting("MaxBackupCount", option);
-            };
-
-            $scope.openDevTools = () => {
-                firebotAppDetails.openDevTools();
-            };
-
-            $scope.recalculateQuoteIds = () => {
-                utilityService
-                    .showConfirmationModal({
-                        title: "Recalculate Quote IDs",
-                        question: `Are you sure you want to recalculate your quote IDs?`,
-                        confirmLabel: "Recalculate",
-                        confirmBtnType: "btn-danger"
-                    })
-                    .then((confirmed) => {
-                        if (confirmed) {
-                            backendCommunicator.fireEvent("recalc-quote-ids");
-                        }
-                    });
-            };
-
-            $scope.toggleWhileLoops = () => {
-                const whileLoopsEnabled = settingsService.getSetting("WhileLoopEnabled");
-
-                if (whileLoopsEnabled) {
-                    settingsService.saveSetting("WhileLoopEnabled", false);
-                } else {
-                    utilityService
-                        .showConfirmationModal({
-                            title: "Enable While Loops",
-                            question: "By enabling this feature, you understand that using While Loops incorrectly can potentially cause performance issues or even freeze Firebot.",
-                            confirmLabel: "I understand, enable.",
-                            confirmBtnType: "btn-primary"
-                        })
-                        .then((confirmed) => {
-                            if (confirmed) {
-                                settingsService.saveSetting("WhileLoopEnabled", true);
-                            }
-                        });
-                }
-            };
-
-            $scope.audioOutputDevices = [{
-                label: "System Default",
-                deviceId: "default"
-            }];
-
-            $q.when(navigator.mediaDevices.enumerateDevices()).then((deviceList) => {
-                deviceList = deviceList
-                    .filter(
-                        d =>
-                            d.kind === "audiooutput" &&
-                            d.deviceId !== "communications" &&
-                            d.deviceId !== "default"
-                    )
-                    .map((d) => {
-                        return { label: d.label, deviceId: d.deviceId };
-                    });
-
-                $scope.audioOutputDevices = $scope.audioOutputDevices.concat(
-                    deviceList
-                );
-            });
-
-            backendCommunicator.on("backup-complete", (manualActivation) => {
-                $scope.isBackingUp = false;
-
-                if (manualActivation) {
-                    // we only want to act if the backup was manually triggered
-                    $scope.backupCompleted = true;
-                    // after 5 seconds, hide the completed message
-                    $timeout(() => {
-                        if ($scope.backupCompleted) {
-                            $scope.backupCompleted = false;
-                        }
-                    }, 5000);
-                }
-            }
-            );
-
             if (settingsService.getSetting("AutoUpdateLevel") > 3) {
                 settingsService.saveSetting("AutoUpdateLevel", 3);
             }
-
-            $scope.autoUpdateSlider = {
-                value: settingsService.getSetting("AutoUpdateLevel"),
-                options: {
-                    showSelectionBar: true,
-                    showTicks: true,
-                    showTicksValues: true,
-                    stepsArray: [{ value: 2 }, { value: 3 }],
-                    translate: function(value) {
-                        return $scope.getAutoUpdateLevelString(value);
-                    },
-                    ticksTooltip: function(index) {
-                        switch (index) {
-                            case 0:
-                                return "Updates that fix bugs or add features. (Example: v1.0 to v1.1.1)";
-                            case 1:
-                                return "Updates that are major new versions. Could contain breaking changes. (Example: v1.0 to v2.0)";
-                            default:
-                                return "";
-                        }
-                    },
-                    getSelectionBarColor: function() {
-                        return "orange";
-                    },
-                    getPointerColor: function() {
-                        return "orange";
-                    },
-                    onChange: function() {
-                        settingsService.saveSetting("AutoUpdateLevel", $scope.autoUpdateSlider.value);
-                    }
-                }
-            };
-
-            $scope.getAutoUpdateLevelString = function(level) {
-                switch (level) {
-                    case 0:
-                        return "Off";
-                    case 2:
-                        return "Default";
-                    case 3:
-                        return "Major Versions";
-                    case 4:
-                        return "Betas";
-                    default:
-                        return "";
-                }
-            };
-
-            $scope.currentPort = settingsService.getSetting("WebServerPort");
-
-            /**
-            * Modals
-            */
-
-            $scope.openStartupScriptsModal = function() {
-                utilityService.showModal({
-                    component: "startupScriptsListModal",
-                    size: "sm",
-                    backdrop: true,
-                    keyboard: true
-                });
-            };
-
-            $scope.showFontManagementModal = function() {
-                utilityService.showModal({
-                    component: "fontManagementModal",
-                    size: "sm"
-                });
-            };
-
-            $scope.showBackupListModal = function() {
-                const showBackupListModalContext = {
-                    templateUrl: "backupListModal.html",
-                    size: "sm",
-                    controllerFunc: (
-                        $scope,
-                        $uibModalInstance,
-                        $q,
-                        utilityService
-                    ) => {
-                        $scope.backups = [];
-
-                        const backupFolderPath = path.resolve(`${dataAccess.getUserDataPath() + path.sep}backups`) + path.sep;
-
-                        $scope.loadingBackups = true;
-                        $q
-                            .when(
-                                new Promise((resolve) => {
-                                    fs.readdir(backupFolderPath, (err, files) => {
-                                        const backups = files
-                                            .filter(f => f.endsWith(".zip"))
-                                            .map(function(v) {
-                                                const fileStats = fs.statSync(backupFolderPath + v);
-                                                const backupDate = moment(fileStats.birthtime);
-
-                                                let version = "Unknown Version";
-                                                const versionRe = /_(v?\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.\d+)?)?)(?:_|\b)/;
-                                                const match = v.match(versionRe);
-                                                if (match != null) {
-                                                    version = match[1];
-                                                }
-
-                                                return {
-                                                    name: v.replace(".zip", ""),
-                                                    backupTime: backupDate.toDate().getTime(),
-                                                    backupDateDisplay: backupDate.format(
-                                                        "MMM Do, h:mm A"
-                                                    ),
-                                                    backupDateFull: backupDate.format(
-                                                        "ddd, MMM Do YYYY, h:mm:ss A"
-                                                    ),
-                                                    fromNowDisplay: utilityService.capitalize(
-                                                        backupDate.fromNow()
-                                                    ),
-                                                    dayDifference: moment().diff(backupDate, "days"),
-                                                    version: version,
-                                                    size: Math.round(fileStats.size / 1000),
-                                                    isManual: v.includes("manual"),
-                                                    neverDelete: v.includes("NODELETE")
-                                                };
-                                            })
-                                            .sort(function(a, b) {
-                                                return b.backupTime - a.backupTime;
-                                            });
-
-                                        resolve(backups);
-                                    });
-                                })
-                            )
-                            .then((backups) => {
-                                $scope.loadingBackups = false;
-                                $scope.backups = backups;
-                            });
-
-                        $scope.togglePreventDeletion = function(backup) {
-                            backup.neverDelete = !backup.neverDelete;
-                            const oldName = `${backup.name}.zip`;
-                            backup.name = backup.neverDelete
-                                ? (backup.name += "_NODELETE")
-                                : backup.name.replace("_NODELETE", "");
-
-                            fs.renameSync(
-                                backupFolderPath + oldName,
-                                `${backupFolderPath + backup.name}.zip`
-                            );
-                        };
-
-                        $scope.deleteBackup = function(index, backup) {
-                            utilityService
-                                .showConfirmationModal({
-                                    title: "Delete Backup",
-                                    question: "Are you sure you'd like to delete this backup?",
-                                    confirmLabel: "Delete"
-                                })
-                                .then((confirmed) => {
-                                    if (confirmed) {
-                                        $scope.backups.splice(index, 1);
-                                        fs.unlinkSync(`${backupFolderPath + backup.name}.zip`);
-                                    }
-                                });
-                        };
-
-                        $scope.restoreBackup = function(backup) {
-                            utilityService
-                                .showConfirmationModal({
-                                    title: "Restore From Backup",
-                                    question: "Are you sure you'd like to restore from this backup?",
-                                    confirmLabel: "Restore"
-                                })
-                                .then((confirmed) => {
-                                    if (confirmed) {
-                                        $uibModalInstance.dismiss("cancel");
-
-                                        const backupFilePath =
-                                            path.join(backupService.BACKUPS_FOLDER_PATH, `${backup.name}.zip`);
-
-                                        backupService.initiateBackupRestore(backupFilePath);
-                                    }
-                                });
-                        };
-
-                        $scope.openBackupFolder = function() {
-                            backendCommunicator.fireEvent("open-backup-folder");
-                        };
-
-                        $scope.dismiss = function() {
-                            $uibModalInstance.dismiss("cancel");
-                        };
-                    }
-                };
-                utilityService.showModal(showBackupListModalContext);
-            };
         });
-}());
+}());
\ No newline at end of file
diff --git a/src/gui/app/directives/settings/categories/backups-settings.js b/src/gui/app/directives/settings/categories/backups-settings.js
index 0a9efa513..08180e945 100644
--- a/src/gui/app/directives/settings/categories/backups-settings.js
+++ b/src/gui/app/directives/settings/categories/backups-settings.js
@@ -1,16 +1,12 @@
 "use strict";
 
 (function() {
-
-    const moment = require("moment");
-    const path = require("path");
-    const fs = require("fs");
-
     angular
         .module("firebotApp")
         .component("backupsSettings", {
             template: `
                 <div>
+                    <div><strong>NOTE: These settings affect ALL user profiles.</strong></div>
 
                     <firebot-setting
                         name="Max Backups"
@@ -130,15 +126,46 @@
                         <div>
                             <firebot-button
                                 text="Manage Backups"
-                                ng-click="showBackupListModal()"
+                                ng-click="backupService.showBackupListModal()"
+                            />
+                        </div>
+                    </firebot-setting>
+
+                    <firebot-setting
+                        name="Move Backup Folder"
+                        description="Choose where Firebot stores backups.">
+
+                        <setting-description-addon>
+                            <div style="margin-top: 10px;"><strong>NOTE</strong>: Changing this setting will copy any existing backups from the current location to the new location. This will overwrite any files with the same name in the new location.</div>
+                            <div style="margin-top: 10px;">Current backup location: <a ng-click="backupService.openBackupFolder()" ng-bind="backupService.backupFolderPath" href></a></div>
+                        </setting-description-addon>
+
+                        <div>
+                            <span
+                                ng-if="isMovingBackupFolder || backupFolderMoveCompleted"
+                                style="padding-left: 10px"
+                            >
+                                <span ng-if="isMovingBackupFolder"> Moving backups to new folder... </span>
+                                <span ng-if="backupFolderMoveCompleted && backupFolderMoveSuccess" style="color: green">
+                                    <i class="fal fa-check-circle"></i> Move successful!
+                                </span>
+                                <span ng-if="backupFolderMoveCompleted && !backupFolderMoveSuccess" style="color: red">
+                                    <i class="fal fa-check-circle"></i> Move failed.
+                                </span>
+                            </span>
+                            <firebot-button
+                                text="Move Backup Folder"
+                                ng-click="backupService.initiateBackupFolderMove()"
+                                ng-disabled="isMovingBackupFolder"
                             />
                         </div>
                     </firebot-setting>
 
                 </div>
           `,
-            controller: function($scope, settingsService, backupService, backendCommunicator, $timeout, utilityService) {
+            controller: function($scope, settingsService, backupService, backendCommunicator, $timeout) {
                 $scope.settings = settingsService;
+                $scope.backupService = backupService;
 
                 $scope.startBackup = function() {
                     $scope.isBackingUp = true;
@@ -146,7 +173,7 @@
                     backupService.startBackup();
                 };
 
-                backendCommunicator.on("backup-complete", (manualActivation) => {
+                backendCommunicator.on("backups:backup-complete", (manualActivation) => {
                     $scope.isBackingUp = false;
 
                     if (manualActivation) {
@@ -161,130 +188,23 @@
                     }
                 });
 
-                $scope.showBackupListModal = function() {
-                    const showBackupListModalContext = {
-                        templateUrl: "backupListModal.html",
-                        size: "sm",
-                        controllerFunc: (
-                            $scope,
-                            $uibModalInstance,
-                            $q,
-                            utilityService,
-                            dataAccess
-                        ) => {
-                            $scope.backups = [];
-
-                            const backupFolderPath = path.resolve(`${dataAccess.getUserDataPath() + path.sep}backups`) + path.sep;
-
-                            $scope.loadingBackups = true;
-                            $q
-                                .when(
-                                    new Promise((resolve) => {
-                                        fs.readdir(backupFolderPath, (err, files) => {
-                                            const backups = files
-                                                .filter(f => f.endsWith(".zip"))
-                                                .map(function(v) {
-                                                    const fileStats = fs.statSync(backupFolderPath + v);
-                                                    const backupDate = moment(fileStats.birthtime);
-
-                                                    let version = "Unknown Version";
-                                                    const versionRe = /_(v?\d+\.\d+\.\d+(?:-[a-zA-Z0-9]+(?:\.\d+)?)?)(?:_|\b)/;
-                                                    const match = v.match(versionRe);
-                                                    if (match != null) {
-                                                        version = match[1];
-                                                    }
-
-                                                    return {
-                                                        name: v.replace(".zip", ""),
-                                                        backupTime: backupDate.toDate().getTime(),
-                                                        backupDateDisplay: backupDate.format(
-                                                            "MMM Do, h:mm A"
-                                                        ),
-                                                        backupDateFull: backupDate.format(
-                                                            "ddd, MMM Do YYYY, h:mm:ss A"
-                                                        ),
-                                                        fromNowDisplay: utilityService.capitalize(
-                                                            backupDate.fromNow()
-                                                        ),
-                                                        dayDifference: moment().diff(backupDate, "days"),
-                                                        version: version,
-                                                        size: Math.round(fileStats.size / 1000),
-                                                        isManual: v.includes("manual"),
-                                                        neverDelete: v.includes("NODELETE")
-                                                    };
-                                                })
-                                                .sort(function(a, b) {
-                                                    return b.backupTime - a.backupTime;
-                                                });
-
-                                            resolve(backups);
-                                        });
-                                    })
-                                )
-                                .then((backups) => {
-                                    $scope.loadingBackups = false;
-                                    $scope.backups = backups;
-                                });
-
-                            $scope.togglePreventDeletion = function(backup) {
-                                backup.neverDelete = !backup.neverDelete;
-                                const oldName = `${backup.name}.zip`;
-                                backup.name = backup.neverDelete
-                                    ? (backup.name += "_NODELETE")
-                                    : backup.name.replace("_NODELETE", "");
-
-                                fs.renameSync(
-                                    backupFolderPath + oldName,
-                                    `${backupFolderPath + backup.name}.zip`
-                                );
-                            };
-
-                            $scope.deleteBackup = function(index, backup) {
-                                utilityService
-                                    .showConfirmationModal({
-                                        title: "Delete Backup",
-                                        question: "Are you sure you'd like to delete this backup?",
-                                        confirmLabel: "Delete"
-                                    })
-                                    .then((confirmed) => {
-                                        if (confirmed) {
-                                            $scope.backups.splice(index, 1);
-                                            fs.unlinkSync(`${backupFolderPath + backup.name}.zip`);
-                                        }
-                                    });
-                            };
-
-                            $scope.restoreBackup = function(backup) {
-                                utilityService
-                                    .showConfirmationModal({
-                                        title: "Restore From Backup",
-                                        question: "Are you sure you'd like to restore from this backup?",
-                                        confirmLabel: "Restore"
-                                    })
-                                    .then((confirmed) => {
-                                        if (confirmed) {
-                                            $uibModalInstance.dismiss("cancel");
-
-                                            const backupFilePath =
-                                                path.join(backupService.BACKUPS_FOLDER_PATH, `${backup.name}.zip`);
-
-                                            backupService.initiateBackupRestore(backupFilePath);
-                                        }
-                                    });
-                            };
+                $scope.moveBackupFolder = () => {
+                    $scope.isMovingBackupFolder = true;
+                    $scope.backupFolderMoveCompleted = false;
+                };
 
-                            $scope.openBackupFolder = function() {
-                                backendCommunicator.fireEvent("open-backup-folder");
-                            };
+                backendCommunicator.on("backups:move-backup-folder-completed", (success) => {
+                    $scope.isMovingBackupFolder = false;
+                    $scope.backupFolderMoveCompleted = true;
+                    $scope.backupFolderMoveSuccess = success;
 
-                            $scope.dismiss = function() {
-                                $uibModalInstance.dismiss("cancel");
-                            };
+                    // after 5 seconds, hide the completed message
+                    $timeout(() => {
+                        if ($scope.backupFolderMoveCompleted) {
+                            $scope.backupFolderMoveCompleted = false;
                         }
-                    };
-                    utilityService.showModal(showBackupListModalContext);
-                };
-
+                    }, 5000);
+                });
             }
         });
-}());
+}());
\ No newline at end of file
diff --git a/src/gui/app/services/backup.service.js b/src/gui/app/services/backup.service.js
index 07a803c26..e0056109d 100644
--- a/src/gui/app/services/backup.service.js
+++ b/src/gui/app/services/backup.service.js
@@ -1,30 +1,35 @@
 "use strict";
 
 (function() {
-    const { resolve } = require('path');
+    const moment = require("moment");
 
     angular
         .module("firebotApp")
-        .factory("backupService", function($q, backendCommunicator,
-            dataAccess, utilityService) {
+        .factory("backupService", function($q, backendCommunicator, utilityService) {
             const service = {};
 
-            const BACKUPS_FOLDER_PATH = resolve(dataAccess.getUserDataPath(), "backups");
+            service.backupFolderPath = backendCommunicator.fireEventSync("backups:get-backup-folder-path");
 
-            service.BACKUPS_FOLDER_PATH = BACKUPS_FOLDER_PATH;
+            backendCommunicator.on("settings:setting-updated:BackupLocation", (newPath) => {
+                service.backupFolderPath = newPath;
+            });
 
             service.startBackup = function() {
-                backendCommunicator.fireEvent("start-backup", true);
+                backendCommunicator.fireEvent("backups:start-backup", true);
+            };
+
+            service.openBackupFolder = function() {
+                backendCommunicator.fireEvent("open-backup-folder");
             };
 
             service.openBackupZipFilePicker = function() {
                 return $q.when(backendCommunicator.fireEventAsync("open-file-browser", {
                     options: {
-                        title: "Select backup zip",
+                        title: "Select Firebot backup",
                         buttonLabel: "Select Backup",
                         filters: [{ name: "Zip", extensions: ["zip"] }]
                     },
-                    currentPath: BACKUPS_FOLDER_PATH
+                    currentPath: service.backupFolderPath
                 }))
                     .then((response) => {
                         if (response == null || response.path == null) {
@@ -47,11 +52,124 @@
                 });
             };
 
-
             service.restoreBackup = async (backupFilePath) => {
-                return await backendCommunicator.fireEventAsync("restore-backup", backupFilePath);
+                return await backendCommunicator.fireEventAsync("backups:restore-backup", backupFilePath);
+            };
+
+            service.showBackupListModal = function() {
+                const showBackupListModalContext = {
+                    templateUrl: "backupListModal.html",
+                    size: "sm",
+                    controllerFunc: (
+                        $scope,
+                        $uibModalInstance,
+                        $q,
+                        utilityService
+                    ) => {
+                        $scope.backups = [];
+
+                        $scope.loadingBackups = true;
+                        $q
+                            .when(backendCommunicator.fireEventAsync("backups:get-backup-list"))
+                            .then((backups) => {
+                                const formattedBackups = backups.map((b) => {
+                                    const backupMoment = moment(b.backupDate);
+                                    return {
+                                        name: b.name,
+                                        path: b.path,
+                                        backupTime: b.backupDate,
+                                        backupDateDisplay: backupMoment.format(
+                                            "MMM Do, h:mm A"
+                                        ),
+                                        backupDateFull: backupMoment.format(
+                                            "ddd, MMM Do YYYY, h:mm:ss A"
+                                        ),
+                                        fromNowDisplay: utilityService.capitalize(
+                                            backupMoment.fromNow()
+                                        ),
+                                        dayDifference: moment().diff(backupMoment, "days"),
+                                        version: b.version,
+                                        size: Math.round(b.size / 1000),
+                                        isManual: b.isManual,
+                                        neverDelete: b.neverDelete
+                                    };
+                                });
+
+                                $scope.loadingBackups = false;
+                                $scope.backups = formattedBackups;
+                            });
+
+                        $scope.togglePreventDeletion = (backup) => {
+                            backendCommunicator.send("backups:toggle-backup-prevent-deletion", backup.path);
+                        };
+
+                        $scope.deleteBackup = function(index, backup) {
+                            utilityService
+                                .showConfirmationModal({
+                                    title: "Delete Backup",
+                                    question: "Are you sure you want to delete this backup?",
+                                    confirmLabel: "Delete"
+                                })
+                                .then((confirmed) => {
+                                    if (confirmed) {
+                                        backendCommunicator.fireEventAsync("backups:delete-backup", backup.path)
+                                            .then((success) => {
+                                                if (success) {
+                                                    $scope.backups.splice(index, 1);
+                                                }
+                                            });
+                                    }
+                                });
+                        };
+
+                        $scope.restoreBackup = function(backup) {
+                            utilityService
+                                .showConfirmationModal({
+                                    title: "Restore From Backup",
+                                    question: "Are you sure you'd like to restore from this backup?",
+                                    confirmLabel: "Restore"
+                                })
+                                .then((confirmed) => {
+                                    if (confirmed) {
+                                        $uibModalInstance.dismiss("cancel");
+                                        service.initiateBackupRestore(backup.path);
+                                    }
+                                });
+                        };
+
+                        $scope.openBackupFolder = function() {
+                            service.openBackupFolder();
+                        };
+
+                        $scope.dismiss = function() {
+                            $uibModalInstance.dismiss("cancel");
+                        };
+                    }
+                };
+                utilityService.showModal(showBackupListModalContext);
+            };
+
+            service.initiateBackupFolderMove = () => {
+                $q
+                    .when(backendCommunicator.fireEventAsync("open-file-browser", {
+                        options: {
+                            title: "Select new Firebot backup location",
+                            button: "Select Folder",
+                            directoryOnly: true
+                        },
+                        currentPath: service.backupFolderPath
+                    }))
+                    .then((response) => {
+                        if (response?.path != null) {
+                            service.moveBackupFolder(response.path);
+                        }
+                    });
+            };
+
+            service.moveBackupFolder = async (newPath) => {
+                return await backendCommunicator.fireEventAsync("backups:move-backup-folder", newPath);
             };
 
             return service;
         });
-}());
+}());
\ No newline at end of file
diff --git a/src/gui/app/services/listener.service.js b/src/gui/app/services/listener.service.js
index 7ceaa8843..7bde6d71e 100644
--- a/src/gui/app/services/listener.service.js
+++ b/src/gui/app/services/listener.service.js
@@ -45,7 +45,6 @@
             VIDEO_FILE: "videoFile",
             ANY_FILE: "anyFile",
             IMPORT_FOLDER: "importFolder",
-            IMPORT_BACKUP_ZIP: "importBackup",
             CONNECTION_STATUS: "connectionStatus",
             CONNECTION_CHANGE_REQUEST: "connectionChangeRequest",
             CHAT_CONNECTION_STATUS: "chatConnectionStatus",
@@ -130,7 +129,6 @@
                 case ListenerType.IMAGE_FILE:
                 case ListenerType.SOUND_FILE:
                 case ListenerType.IMPORT_FOLDER:
-                case ListenerType.IMPORT_BACKUP_ZIP:
                 case ListenerType.ANY_FILE:
                     registeredListeners.filePath[uuid] = listener;
                     if (publishEvent) {
@@ -142,8 +140,6 @@
                             ipcRenderer.send("getVideoPath", uuid);
                         } else if (listener.type === ListenerType.IMPORT_FOLDER) {
                             ipcRenderer.send("getImportFolderPath", uuid);
-                        } else if (listener.type === ListenerType.IMPORT_BACKUP_ZIP) {
-                            ipcRenderer.send("getBackupZipPath", uuid);
                         } else if (listener.type === ListenerType.ANY_FILE) {
                             ipcRenderer.send("getAnyFilePath", request.data);
                         }
@@ -163,7 +159,6 @@
                 case ListenerType.SOUND_FILE:
                 case ListenerType.IMPORT_FOLDER:
                 case ListenerType.ANY_FILE:
-                case ListenerType.IMPORT_BACKUP_ZIP:
                     delete registeredListeners.filePath[uuid];
                     break;
                 default:
diff --git a/src/gui/app/templates/_settings.html b/src/gui/app/templates/_settings.html
index ed9fde071..2fb0c324d 100644
--- a/src/gui/app/templates/_settings.html
+++ b/src/gui/app/templates/_settings.html
@@ -59,29 +59,6 @@ <h1 class="settings-category-title">{{selectedCategory.name}}</h1>
   </div>
 </div>
 
-<!-- Modal For Editing Overlay Port -->
-<script type="text/ng-template" id="changePortModal.html">
-  <div class="modal-header">
-    <button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    <h4 class="modal-title">Edit Web Server Port</h4>
-  </div>
-  <div class="modal-body">
-    <div class="mt-6" style="display: flex;flex-direction: column;justify-content: center;align-items: center;">
-      <div style="width: 55%; position: relative;">
-        <div class="form-group" ng-class="{'has-error': newPortError}">
-          <label class="control-label" for="newPort">New Port</label>
-          <input type="number" class="form-control" id="newPort" ng-model="newPort" aria-describedby="helpBlock">
-          <span id="helpBlock" class="help-block" ng-show="newPortError">This is not a valid port number.</span>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="modal-footer">
-    <button type="button" class="btn btn-link" ng-click="dismiss()">Cancel</button>
-    <button type="button" class="btn btn-primary" ng-click="changePort()">Change Port</button>
-  </div>
-</script>
-
 <!-- View Backups Modal -->
 <script type="text/ng-template" id="backupListModal.html">
   <div class="modal-header flex-row-center jspacebetween">
diff --git a/src/types/settings.ts b/src/types/settings.ts
index cb098aff3..eded51a01 100644
--- a/src/types/settings.ts
+++ b/src/types/settings.ts
@@ -86,7 +86,15 @@ export type FirebotSettingsTypes = {
 }
 
 export const FirebotGlobalSettings: Partial<Record<keyof FirebotSettingsTypes, boolean>> = {
-    DebugMode: true
+    BackupBeforeUpdates: true,
+    BackupIgnoreResources: true,
+    BackupKeepAll: true,
+    BackupLocation: true,
+    BackupOnceADay: true,
+    BackupOnExit: true,
+    DebugMode: true,
+    LastBackupDate: true,
+    MaxBackupCount: true
 };
 
 export const FirebotSettingsDefaults: FirebotSettingsTypes = {

From e957ee99328bf104f523f8106a827f73c6650927 Mon Sep 17 00:00:00 2001
From: phroggster <phroggster@users.noreply.github.com>
Date: Sun, 22 Dec 2024 21:41:44 -0600
Subject: [PATCH 40/54] chore: Bump Twurple 7.1.0->7.2.1

- Changelog: https://github.com/twurple/twurple/compare/68146191075...c35088735a2eeb6
---
 package-lock.json | 148 ++++++++++++++++++++++++++--------------------
 package.json      |  10 ++--
 2 files changed, 88 insertions(+), 70 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 43b0e1092..89b86c18e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,11 +12,11 @@
                 "@aws-sdk/client-polly": "^3.26.0",
                 "@crowbartools/firebot-custom-scripts-types": "^5.53.2-6",
                 "@seald-io/nedb": "^4.0.4",
-                "@twurple/api": "^7.1.0",
-                "@twurple/auth": "^7.1.0",
-                "@twurple/chat": "^7.1.0",
-                "@twurple/eventsub-ws": "^7.1.0",
-                "@twurple/pubsub": "^7.1.0",
+                "@twurple/api": "^7.2.1",
+                "@twurple/auth": "^7.2.1",
+                "@twurple/chat": "^7.2.1",
+                "@twurple/eventsub-ws": "^7.2.1",
+                "@twurple/pubsub": "^7.2.1",
                 "@types/tinycolor2": "^1.4.6",
                 "@zunderscore/elgato-light-control": "^1.1.2",
                 "angular": "^1.8.0",
@@ -2854,9 +2854,10 @@
             }
         },
         "node_modules/@twurple/api": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/api/-/api-7.1.0.tgz",
-            "integrity": "sha512-cDVVY+vecMFNEOyp7UobQn4ARydIDf04NZy1YCKIKpJHBuOV/pkTjNGluRZ0nR9/t9hBFfOyHAH4JswRZpZbnw==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/api/-/api-7.2.1.tgz",
+            "integrity": "sha512-fqoX87GyHRL4pSmgloF5Mfj2XDJMx8fWBbcl4JGG7bgF2jvH5X9p3nzH169zqwSU/etfUdfytyoQ7/r2R+G3cg==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/cache-decorators": "^4.0.0",
                 "@d-fischer/cross-fetch": "^5.0.1",
@@ -2865,8 +2866,8 @@
                 "@d-fischer/rate-limiter": "^1.0.0",
                 "@d-fischer/shared-utils": "^3.6.1",
                 "@d-fischer/typed-event-emitter": "^3.3.1",
-                "@twurple/api-call": "7.1.0",
-                "@twurple/common": "7.1.0",
+                "@twurple/api-call": "7.2.1",
+                "@twurple/common": "7.2.1",
                 "retry": "^0.13.1",
                 "tslib": "^2.0.3"
             },
@@ -2874,7 +2875,7 @@
                 "url": "https://github.com/sponsors/d-fischer"
             },
             "peerDependencies": {
-                "@twurple/auth": "7.1.0"
+                "@twurple/auth": "7.2.1"
             }
         },
         "node_modules/@twurple/api-call": {
@@ -2906,19 +2907,21 @@
             "version": "5.0.5",
             "resolved": "https://registry.npmjs.org/@d-fischer/cross-fetch/-/cross-fetch-5.0.5.tgz",
             "integrity": "sha512-symjDUPInTrkfIsZc2n2mo9hiAJLcTJsZkNICjZajEWnWpJ3s3zn50/FY8xpNUAf5w3eFuQii2wxztTGpvG1Xg==",
+            "license": "MIT",
             "dependencies": {
                 "node-fetch": "^2.6.12"
             }
         },
         "node_modules/@twurple/api/node_modules/@twurple/api-call": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/api-call/-/api-call-7.1.0.tgz",
-            "integrity": "sha512-aiyV492StnILyFzU/Eqgn+BA8fz125sB/0QJVlCJotMolrZxBkA4NsFEGDOcR3rOJLL7zOKPYMhWI8zY0gfzPA==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/api-call/-/api-call-7.2.1.tgz",
+            "integrity": "sha512-x+p6fMleFA/pJHVu8tFpkDkARGGt30EAUA+cLc+dEtU1EpH1mv7nv5LLHh9NW9vdZpYp0jk5TyY/TSbHdj7Ggw==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/cross-fetch": "^5.0.1",
                 "@d-fischer/qs": "^7.0.2",
                 "@d-fischer/shared-utils": "^3.6.1",
-                "@twurple/common": "7.1.0",
+                "@twurple/common": "7.2.1",
                 "tslib": "^2.0.3"
             },
             "funding": {
@@ -2926,9 +2929,10 @@
             }
         },
         "node_modules/@twurple/api/node_modules/@twurple/common": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.1.0.tgz",
-            "integrity": "sha512-kz3J9J116+aOdyhCzRQwaxFC5eAewwQ9Iv2UmPHXYqRfbgKay6TsL27vk+Q2HygBCvx/8OWpX3pdSo3V/VPmoA==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.2.1.tgz",
+            "integrity": "sha512-veLY5laA00dPuekAcpHN6GDvnr6s1uH7yBDebLC1NhpcLkQgiAlGA50RdNS5YeA3xz7kfE2MOcYSi2S6Qoc7EA==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/shared-utils": "^3.6.1",
                 "klona": "^2.0.4",
@@ -2942,6 +2946,7 @@
             "version": "2.7.0",
             "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
             "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+            "license": "MIT",
             "dependencies": {
                 "whatwg-url": "^5.0.0"
             },
@@ -2966,15 +2971,16 @@
             }
         },
         "node_modules/@twurple/auth": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/auth/-/auth-7.1.0.tgz",
-            "integrity": "sha512-OT7XtoXeYA8yLvCKdIZ76x71D/RfxPZQqufpimy5ZSL4+TpxY1CJNFp8YWstC1KEfyGVwyr7ZoV49u95k0JJmw==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/auth/-/auth-7.2.1.tgz",
+            "integrity": "sha512-IGHsJ/g0RblRSBC59XKA9277rE5w1dAKdhCPQz1QwkWnt6fsUyVoD1ut+qZvjuh7ssX1SBtNzFqohydfmWZytg==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/logger": "^4.2.1",
                 "@d-fischer/shared-utils": "^3.6.1",
                 "@d-fischer/typed-event-emitter": "^3.3.1",
-                "@twurple/api-call": "7.1.0",
-                "@twurple/common": "7.1.0",
+                "@twurple/api-call": "7.2.1",
+                "@twurple/common": "7.2.1",
                 "tslib": "^2.0.3"
             },
             "funding": {
@@ -2985,19 +2991,21 @@
             "version": "5.0.5",
             "resolved": "https://registry.npmjs.org/@d-fischer/cross-fetch/-/cross-fetch-5.0.5.tgz",
             "integrity": "sha512-symjDUPInTrkfIsZc2n2mo9hiAJLcTJsZkNICjZajEWnWpJ3s3zn50/FY8xpNUAf5w3eFuQii2wxztTGpvG1Xg==",
+            "license": "MIT",
             "dependencies": {
                 "node-fetch": "^2.6.12"
             }
         },
         "node_modules/@twurple/auth/node_modules/@twurple/api-call": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/api-call/-/api-call-7.1.0.tgz",
-            "integrity": "sha512-aiyV492StnILyFzU/Eqgn+BA8fz125sB/0QJVlCJotMolrZxBkA4NsFEGDOcR3rOJLL7zOKPYMhWI8zY0gfzPA==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/api-call/-/api-call-7.2.1.tgz",
+            "integrity": "sha512-x+p6fMleFA/pJHVu8tFpkDkARGGt30EAUA+cLc+dEtU1EpH1mv7nv5LLHh9NW9vdZpYp0jk5TyY/TSbHdj7Ggw==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/cross-fetch": "^5.0.1",
                 "@d-fischer/qs": "^7.0.2",
                 "@d-fischer/shared-utils": "^3.6.1",
-                "@twurple/common": "7.1.0",
+                "@twurple/common": "7.2.1",
                 "tslib": "^2.0.3"
             },
             "funding": {
@@ -3005,9 +3013,10 @@
             }
         },
         "node_modules/@twurple/auth/node_modules/@twurple/common": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.1.0.tgz",
-            "integrity": "sha512-kz3J9J116+aOdyhCzRQwaxFC5eAewwQ9Iv2UmPHXYqRfbgKay6TsL27vk+Q2HygBCvx/8OWpX3pdSo3V/VPmoA==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.2.1.tgz",
+            "integrity": "sha512-veLY5laA00dPuekAcpHN6GDvnr6s1uH7yBDebLC1NhpcLkQgiAlGA50RdNS5YeA3xz7kfE2MOcYSi2S6Qoc7EA==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/shared-utils": "^3.6.1",
                 "klona": "^2.0.4",
@@ -3021,6 +3030,7 @@
             "version": "2.7.0",
             "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
             "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+            "license": "MIT",
             "dependencies": {
                 "whatwg-url": "^5.0.0"
             },
@@ -3037,9 +3047,10 @@
             }
         },
         "node_modules/@twurple/chat": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/chat/-/chat-7.1.0.tgz",
-            "integrity": "sha512-AzLtq+xqbyYpqPZau5jvX3Dov+C7MW1YTunYZZ5TqyQlEb/leUD6LdwdhXhsVxQUfpVD1FhU1NSlNd7VEhv0Rg==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/chat/-/chat-7.2.1.tgz",
+            "integrity": "sha512-crhU7WcE/9xiLfYjh371SFsqvx2fIVp+af1BcmbwmowOOF3BG311op8EOOAXUfblIcKRuqVqAoMlq4pquYYQ7Q==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/cache-decorators": "^4.0.0",
                 "@d-fischer/deprecate": "^2.0.2",
@@ -3047,7 +3058,7 @@
                 "@d-fischer/rate-limiter": "^1.0.0",
                 "@d-fischer/shared-utils": "^3.6.1",
                 "@d-fischer/typed-event-emitter": "^3.3.0",
-                "@twurple/common": "7.1.0",
+                "@twurple/common": "7.2.1",
                 "ircv3": "^0.33.0",
                 "tslib": "^2.0.3"
             },
@@ -3055,7 +3066,7 @@
                 "url": "https://github.com/sponsors/d-fischer"
             },
             "peerDependencies": {
-                "@twurple/auth": "7.1.0"
+                "@twurple/auth": "7.2.1"
             }
         },
         "node_modules/@twurple/chat/node_modules/@d-fischer/cache-decorators": {
@@ -3068,9 +3079,10 @@
             }
         },
         "node_modules/@twurple/chat/node_modules/@twurple/common": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.1.0.tgz",
-            "integrity": "sha512-kz3J9J116+aOdyhCzRQwaxFC5eAewwQ9Iv2UmPHXYqRfbgKay6TsL27vk+Q2HygBCvx/8OWpX3pdSo3V/VPmoA==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.2.1.tgz",
+            "integrity": "sha512-veLY5laA00dPuekAcpHN6GDvnr6s1uH7yBDebLC1NhpcLkQgiAlGA50RdNS5YeA3xz7kfE2MOcYSi2S6Qoc7EA==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/shared-utils": "^3.6.1",
                 "klona": "^2.0.4",
@@ -3094,16 +3106,17 @@
             }
         },
         "node_modules/@twurple/eventsub-base": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/eventsub-base/-/eventsub-base-7.1.0.tgz",
-            "integrity": "sha512-3FNmSwhf09yWYQwhkc+EjmEngbMLbmMPJvJ4m30X9duuhFqvZcd0XnnRvHWSd4qpiolJb0BPerqP2EGXlGjElA==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/eventsub-base/-/eventsub-base-7.2.1.tgz",
+            "integrity": "sha512-QDhYFetOXCaX2HGOe6GpVBKtddSZ7uLwo+N8r08gc33TAz+xUwLQY5MhixA2v+KNyEoWih4xMemOKRDo6lIm5Q==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/logger": "^4.2.1",
                 "@d-fischer/shared-utils": "^3.6.1",
                 "@d-fischer/typed-event-emitter": "^3.3.0",
-                "@twurple/api": "7.1.0",
-                "@twurple/auth": "7.1.0",
-                "@twurple/common": "7.1.0",
+                "@twurple/api": "7.2.1",
+                "@twurple/auth": "7.2.1",
+                "@twurple/common": "7.2.1",
                 "tslib": "^2.0.3"
             },
             "funding": {
@@ -3111,9 +3124,10 @@
             }
         },
         "node_modules/@twurple/eventsub-base/node_modules/@twurple/common": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.1.0.tgz",
-            "integrity": "sha512-kz3J9J116+aOdyhCzRQwaxFC5eAewwQ9Iv2UmPHXYqRfbgKay6TsL27vk+Q2HygBCvx/8OWpX3pdSo3V/VPmoA==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.2.1.tgz",
+            "integrity": "sha512-veLY5laA00dPuekAcpHN6GDvnr6s1uH7yBDebLC1NhpcLkQgiAlGA50RdNS5YeA3xz7kfE2MOcYSi2S6Qoc7EA==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/shared-utils": "^3.6.1",
                 "klona": "^2.0.4",
@@ -3124,30 +3138,32 @@
             }
         },
         "node_modules/@twurple/eventsub-ws": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/eventsub-ws/-/eventsub-ws-7.1.0.tgz",
-            "integrity": "sha512-0ZOPAGvStqjBTT2Vjtz6euxgtcb8U4cQ23TOaUssgUYJ6hy34ebmLxt6Ghj/5tJt11sduYAxHRvw+XKTSjGIoA==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/eventsub-ws/-/eventsub-ws-7.2.1.tgz",
+            "integrity": "sha512-hGOn0EWnO+x9/K0eC2nVYgtbbuWdIc9yedaucuNNf8qxGe7SaHj509nKiLJQ+8PKsD6sK6PTfuHhU4G2PpsUSw==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/connection": "^9.0.0",
                 "@d-fischer/logger": "^4.2.1",
                 "@d-fischer/shared-utils": "^3.6.1",
                 "@d-fischer/typed-event-emitter": "^3.3.0",
-                "@twurple/auth": "7.1.0",
-                "@twurple/common": "7.1.0",
-                "@twurple/eventsub-base": "7.1.0",
+                "@twurple/auth": "7.2.1",
+                "@twurple/common": "7.2.1",
+                "@twurple/eventsub-base": "7.2.1",
                 "tslib": "^2.0.3"
             },
             "funding": {
                 "url": "https://github.com/sponsors/d-fischer"
             },
             "peerDependencies": {
-                "@twurple/api": "7.1.0"
+                "@twurple/api": "7.2.1"
             }
         },
         "node_modules/@twurple/eventsub-ws/node_modules/@twurple/common": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.1.0.tgz",
-            "integrity": "sha512-kz3J9J116+aOdyhCzRQwaxFC5eAewwQ9Iv2UmPHXYqRfbgKay6TsL27vk+Q2HygBCvx/8OWpX3pdSo3V/VPmoA==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.2.1.tgz",
+            "integrity": "sha512-veLY5laA00dPuekAcpHN6GDvnr6s1uH7yBDebLC1NhpcLkQgiAlGA50RdNS5YeA3xz7kfE2MOcYSi2S6Qoc7EA==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/shared-utils": "^3.6.1",
                 "klona": "^2.0.4",
@@ -3158,28 +3174,30 @@
             }
         },
         "node_modules/@twurple/pubsub": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/pubsub/-/pubsub-7.1.0.tgz",
-            "integrity": "sha512-2YMiktQbHPiPqCNzdlQ2OOMLVHNiy5tjRImkVBHNjw0tqCsbrCUhmFwgKjiIiDQUTTzOcNdFhDNhlcgy5Mz65A==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/pubsub/-/pubsub-7.2.1.tgz",
+            "integrity": "sha512-w8PQgPZNmfp5bDmH2z6VPqMlvTQtQFmZJrTqK6eMHYr6Wy5JzNVaO2m/C6QZZ4zG+gTqWCc2x5AgI5AA59sdiQ==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/connection": "^9.0.0",
                 "@d-fischer/logger": "^4.2.1",
                 "@d-fischer/shared-utils": "^3.6.1",
                 "@d-fischer/typed-event-emitter": "^3.3.0",
-                "@twurple/common": "7.1.0",
+                "@twurple/common": "7.2.1",
                 "tslib": "^2.0.3"
             },
             "funding": {
                 "url": "https://github.com/sponsors/d-fischer"
             },
             "peerDependencies": {
-                "@twurple/auth": "7.1.0"
+                "@twurple/auth": "7.2.1"
             }
         },
         "node_modules/@twurple/pubsub/node_modules/@twurple/common": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.1.0.tgz",
-            "integrity": "sha512-kz3J9J116+aOdyhCzRQwaxFC5eAewwQ9Iv2UmPHXYqRfbgKay6TsL27vk+Q2HygBCvx/8OWpX3pdSo3V/VPmoA==",
+            "version": "7.2.1",
+            "resolved": "https://registry.npmjs.org/@twurple/common/-/common-7.2.1.tgz",
+            "integrity": "sha512-veLY5laA00dPuekAcpHN6GDvnr6s1uH7yBDebLC1NhpcLkQgiAlGA50RdNS5YeA3xz7kfE2MOcYSi2S6Qoc7EA==",
+            "license": "MIT",
             "dependencies": {
                 "@d-fischer/shared-utils": "^3.6.1",
                 "klona": "^2.0.4",
diff --git a/package.json b/package.json
index dcc233027..d6a117fa2 100644
--- a/package.json
+++ b/package.json
@@ -45,11 +45,11 @@
         "@aws-sdk/client-polly": "^3.26.0",
         "@crowbartools/firebot-custom-scripts-types": "^5.53.2-6",
         "@seald-io/nedb": "^4.0.4",
-        "@twurple/api": "^7.1.0",
-        "@twurple/auth": "^7.1.0",
-        "@twurple/chat": "^7.1.0",
-        "@twurple/eventsub-ws": "^7.1.0",
-        "@twurple/pubsub": "^7.1.0",
+        "@twurple/api": "^7.2.1",
+        "@twurple/auth": "^7.2.1",
+        "@twurple/chat": "^7.2.1",
+        "@twurple/eventsub-ws": "^7.2.1",
+        "@twurple/pubsub": "^7.2.1",
         "@types/tinycolor2": "^1.4.6",
         "@zunderscore/elgato-light-control": "^1.1.2",
         "angular": "^1.8.0",

From 6dd942ec3bbcc8b29a6566da1aac0bc086fad816 Mon Sep 17 00:00:00 2001
From: phroggster <phroggster@users.noreply.github.com>
Date: Mon, 23 Dec 2024 00:11:08 -0600
Subject: [PATCH 41/54] feat: Golden Kappa Hype Train Indicator

- Add an `$isGoldenKappaTrain` variable for hype train events.
- Add an indicator to the application header.
- Low-hanging fruit for justifying a twurple bump
- Although, the emote is not visibile from within Firebot.
- It *should* be available externally somehow without violating Twitch
  API TOS? ... TBD maybe, hopefully ...
---
 .../events/builtin/twitch-event-source.js     |  9 ++++--
 .../events/twitch-events/hype-train.ts        | 28 ++++++++++++-------
 .../twitch-api/eventsub/eventsub-client.ts    |  9 ++++--
 .../twitch/hype-train/golden-kappa-train.ts   | 22 +++++++++++++++
 .../builtin/twitch/hype-train/index.ts        |  2 ++
 .../misc/hype-train-indicator.component.js    |  6 ++++
 src/gui/app/services/hype-train.service.js    |  5 +++-
 src/gui/scss/core/_chat.scss                  |  4 +++
 8 files changed, 68 insertions(+), 17 deletions(-)
 create mode 100644 src/backend/variables/builtin/twitch/hype-train/golden-kappa-train.ts

diff --git a/src/backend/events/builtin/twitch-event-source.js b/src/backend/events/builtin/twitch-event-source.js
index e7f87da2e..13f150e55 100644
--- a/src/backend/events/builtin/twitch-event-source.js
+++ b/src/backend/events/builtin/twitch-event-source.js
@@ -867,7 +867,8 @@ module.exports = {
                 total: "150",
                 progress: "150",
                 goal: "500",
-                level: "1"
+                level: "1",
+                isGoldenKappa: false
             },
             activityFeed: {
                 icon: "fad fa-train",
@@ -886,7 +887,8 @@ module.exports = {
                 total: "150",
                 progress: "150",
                 goal: "500",
-                level: "1"
+                level: "1",
+                isGoldenKappa: false
             },
             activityFeed: {
                 icon: "fad fa-train",
@@ -905,7 +907,8 @@ module.exports = {
             queued: false,
             manualMetadata: {
                 total: "150",
-                level: "1"
+                level: "1",
+                isGoldenKappa: false
             },
             activityFeed: {
                 icon: "fad fa-train",
diff --git a/src/backend/events/twitch-events/hype-train.ts b/src/backend/events/twitch-events/hype-train.ts
index 4d554948a..ef90a62dc 100644
--- a/src/backend/events/twitch-events/hype-train.ts
+++ b/src/backend/events/twitch-events/hype-train.ts
@@ -7,12 +7,14 @@ function sendStartProgressEventToFrontend(
     level: number,
     goal: number,
     progress: number,
-    endsAt: Date
+    endsAt: Date,
+    isGoldenKappa: boolean
 ) {
     frontendCommunicator.send(`hype-train:${eventType}`, {
         level,
         progressPercentage: Math.floor(progress / goal * 100),
-        endsAt
+        endsAt,
+        isGoldenKappa
     });
 }
 
@@ -34,7 +36,8 @@ export function triggerHypeTrainStart(
     startDate: Date,
     expiryDate: Date,
     lastContribution: EventSubChannelHypeTrainContribution,
-    topContributors: EventSubChannelHypeTrainContribution[]
+    topContributors: EventSubChannelHypeTrainContribution[],
+    isGoldenKappa: boolean
 ) {
     eventManager.triggerEvent("twitch", "hype-train-start", {
         total,
@@ -44,10 +47,11 @@ export function triggerHypeTrainStart(
         startDate,
         expiryDate,
         lastContribution: mapContribution(lastContribution),
-        topContributors: topContributors.map(mapContribution)
+        topContributors: topContributors.map(mapContribution),
+        isGoldenKappa: isGoldenKappa
     });
 
-    sendStartProgressEventToFrontend("start", level, goal, progress, expiryDate);
+    sendStartProgressEventToFrontend("start", level, goal, progress, expiryDate, isGoldenKappa);
 }
 
 export function triggerHypeTrainProgress(
@@ -58,7 +62,8 @@ export function triggerHypeTrainProgress(
     startDate: Date,
     expiryDate: Date,
     lastContribution: EventSubChannelHypeTrainContribution,
-    topContributors: EventSubChannelHypeTrainContribution[]
+    topContributors: EventSubChannelHypeTrainContribution[],
+    isGoldenKappa: boolean
 ) {
     eventManager.triggerEvent("twitch", "hype-train-progress", {
         total,
@@ -68,10 +73,11 @@ export function triggerHypeTrainProgress(
         startDate,
         expiryDate,
         lastContribution: mapContribution(lastContribution),
-        topContributors: topContributors.map(mapContribution)
+        topContributors: topContributors.map(mapContribution),
+        isGoldenKappa: isGoldenKappa
     });
 
-    sendStartProgressEventToFrontend("progress", level, goal, progress, expiryDate);
+    sendStartProgressEventToFrontend("progress", level, goal, progress, expiryDate, isGoldenKappa);
 }
 
 export function triggerHypeTrainEnd(
@@ -80,7 +86,8 @@ export function triggerHypeTrainEnd(
     startDate: Date,
     endDate: Date,
     cooldownEndDate: Date,
-    topContributors: EventSubChannelHypeTrainContribution[]
+    topContributors: EventSubChannelHypeTrainContribution[],
+    isGoldenKappa: boolean
 ) {
     eventManager.triggerEvent("twitch", "hype-train-end", {
         total,
@@ -88,7 +95,8 @@ export function triggerHypeTrainEnd(
         startDate,
         endDate,
         cooldownEndDate,
-        topContributors: topContributors.map(mapContribution)
+        topContributors: topContributors.map(mapContribution),
+        isGoldenKappa: isGoldenKappa
     });
 
     frontendCommunicator.send("hype-train:end");
diff --git a/src/backend/twitch-api/eventsub/eventsub-client.ts b/src/backend/twitch-api/eventsub/eventsub-client.ts
index 5d6b332fb..250e8c5be 100644
--- a/src/backend/twitch-api/eventsub/eventsub-client.ts
+++ b/src/backend/twitch-api/eventsub/eventsub-client.ts
@@ -196,7 +196,8 @@ class TwitchEventSubClient {
                 event.startDate,
                 event.expiryDate,
                 event.lastContribution,
-                event.topContributors
+                event.topContributors,
+                event.isGoldenKappaTrain
             );
         });
         this._subscriptions.push(hypeTrainBeginSubscription);
@@ -211,7 +212,8 @@ class TwitchEventSubClient {
                 event.startDate,
                 event.expiryDate,
                 event.lastContribution,
-                event.topContributors
+                event.topContributors,
+                event.isGoldenKappaTrain
             );
         });
         this._subscriptions.push(hypeTrainProgressSubscription);
@@ -224,7 +226,8 @@ class TwitchEventSubClient {
                 event.startDate,
                 event.endDate,
                 event.cooldownEndDate,
-                event.topContributors
+                event.topContributors,
+                event.isGoldenKappaTrain
             );
         });
         this._subscriptions.push(hypeTrainEndSubscription);
diff --git a/src/backend/variables/builtin/twitch/hype-train/golden-kappa-train.ts b/src/backend/variables/builtin/twitch/hype-train/golden-kappa-train.ts
new file mode 100644
index 000000000..8f9c925bf
--- /dev/null
+++ b/src/backend/variables/builtin/twitch/hype-train/golden-kappa-train.ts
@@ -0,0 +1,22 @@
+import { ReplaceVariable } from "../../../../../types/variables";
+import { EffectTrigger } from "../../../../../shared/effect-constants";
+import { OutputDataType, VariableCategory } from "../../../../../shared/variable-constants";
+
+const triggers = {};
+triggers[EffectTrigger.EVENT] = ["twitch:hype-train-start", "twitch:hype-train-progress", "twitch:hype-train-end"];
+triggers[EffectTrigger.MANUAL] = true;
+
+const model: ReplaceVariable = {
+    definition: {
+        handle: "isGoldenKappaTrain",
+        description: "Whether or not a Twitch Hype Train is a Golden Kappa Train.",
+        triggers: triggers,
+        categories: [VariableCategory.TRIGGER],
+        possibleDataOutput: [OutputDataType.BOOLEAN]
+    },
+    evaluator: (trigger) => {
+        return trigger.metadata?.eventData?.isGoldenKappa ?? false;
+    }
+};
+
+export default model;
diff --git a/src/backend/variables/builtin/twitch/hype-train/index.ts b/src/backend/variables/builtin/twitch/hype-train/index.ts
index 3d1666a27..fedaf737f 100644
--- a/src/backend/variables/builtin/twitch/hype-train/index.ts
+++ b/src/backend/variables/builtin/twitch/hype-train/index.ts
@@ -1,7 +1,9 @@
+import goldenKappaTrain from "./golden-kappa-train";
 import hypeTrainLevel from './hype-train-level';
 import hypeTrainPercent from './hype-train-percent';
 
 export default [
+    goldenKappaTrain,
     hypeTrainLevel,
     hypeTrainPercent
 ];
\ No newline at end of file
diff --git a/src/gui/app/directives/misc/hype-train-indicator.component.js b/src/gui/app/directives/misc/hype-train-indicator.component.js
index ca28b242c..033bff589 100644
--- a/src/gui/app/directives/misc/hype-train-indicator.component.js
+++ b/src/gui/app/directives/misc/hype-train-indicator.component.js
@@ -17,6 +17,12 @@
                 >
                     <i class="fas fa-subway" style="margin-right: 5px; font-size: 12px;" />
                     <span class="level-pill">LVL {{hts.currentLevel}}</span>
+                    <span ng-if="hts.isGoldenKappa"
+                        class="level-pill golden"
+                        uib-tooltip="Congratulations, a Golden Kappa Train is a rare event! Anyone whom cheers 100 bits, subs, re-subs, or gifts a sub during it gains access to the Golden Kappa emote on Twitch for 24 hours."
+                        tooltip-append-to-body="true"
+                        tooltip-placement="bottom"
+                    >Golden Kappa</span>
                     <span ng-if="!hts.hypeTrainEnded" class="pl-2 font-bold">{{hts.currentProgressPercentage}}%</span>
                     <span class="pl-2 time-left">({{!hts.hypeTrainEnded ? timeLeftDisplay : 'Ended'}})</span>
                 </div>
diff --git a/src/gui/app/services/hype-train.service.js b/src/gui/app/services/hype-train.service.js
index 66c5a361d..ff36b11e1 100644
--- a/src/gui/app/services/hype-train.service.js
+++ b/src/gui/app/services/hype-train.service.js
@@ -11,13 +11,15 @@
             service.currentLevel = 0;
             service.currentProgressPercentage = 0;
             service.endsAt = new Date().toJSON();
+            service.isGoldenKappa = false;
 
-            function updateHypeTrainState({ level, progressPercentage, endsAt }) {
+            function updateHypeTrainState({ level, progressPercentage, endsAt, isGoldenKappa }) {
                 service.currentLevel = level;
                 service.currentProgressPercentage = progressPercentage;
                 service.endsAt = endsAt;
                 service.hypeTrainActive = true;
                 service.hypeTrainEnded = false;
+                service.isGoldenKappa = isGoldenKappa;
             }
 
             backendCommunicator.on("hype-train:start", updateHypeTrainState);
@@ -28,6 +30,7 @@
                 $timeout(() => {
                     service.hypeTrainActive = false;
                     service.hypeTrainEnded = false;
+                    service.isGoldenKappa = false;
                 }, 5000);
             });
 
diff --git a/src/gui/scss/core/_chat.scss b/src/gui/scss/core/_chat.scss
index 5fed14d75..1f6076003 100644
--- a/src/gui/scss/core/_chat.scss
+++ b/src/gui/scss/core/_chat.scss
@@ -381,6 +381,10 @@
         font-weight: bolder;
         text-wrap: nowrap;
     }
+    .golden {
+        color: gold;
+        margin-left: 6px;
+    }
     .time-left {
         opacity: 0.5;
         font-size: 12px;

From 8cf66b3ad472c858196b7d1b1a7059b9f51e4fbb Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Mon, 23 Dec 2024 11:54:11 -0500
Subject: [PATCH 42/54] chore: remove legacy frontend websocketService

---
 src/gui/app/directives/sidebar/sidebar.js  |   9 +-
 src/gui/app/index.html                     |   1 -
 src/gui/app/lang/locale-en.json            |   2 +-
 src/gui/app/services/connection.service.js |  37 ++-
 src/gui/app/services/sound.service.js      |  19 +-
 src/gui/app/services/websocket.service.js  | 284 ---------------------
 6 files changed, 24 insertions(+), 328 deletions(-)
 delete mode 100644 src/gui/app/services/websocket.service.js

diff --git a/src/gui/app/directives/sidebar/sidebar.js b/src/gui/app/directives/sidebar/sidebar.js
index fcf0d82cd..7c1b0794e 100644
--- a/src/gui/app/directives/sidebar/sidebar.js
+++ b/src/gui/app/directives/sidebar/sidebar.js
@@ -91,17 +91,17 @@
                       <span>
                         <span><b>Twitch Status:</b></span>
                         </br>
-                        <span>{{$ctrl.cs.connections['chat'] === 'connected' ? 'CONNECTED' : 'DISCONNECTED' | translate }}</span>
+                        <span>{{ $ctrl.cs.connections['chat'] === 'connected' ? 'CONNECTED' : 'DISCONNECTED' | translate }}</span>
                         </br></br>
                       </span>
                       <span>
                           <span><b>Overlay Status:</b></span>
                           </br>
-                          <span>{{$ctrl.wss.hasClientsConnected ? 'CONNECTED' : 'RUNNING_NOT_CONNECTED' | translate }}</span>
+                          <span>{{ $ctrl.cs.connections['overlay'] === 'connected' ? 'CONNECTED' : 'RUNNING_NOT_CONNECTED' | translate }}</span>
                           </br></br>
                         </span>
                   </div>
-                  <span>{{'SIDEBAR.CONNECTIONS.MIXER_TOGGLE' | translate }}</span>
+                  <span>{{'SIDEBAR.CONNECTIONS.TOGGLE' | translate }}</span>
                 </script>
             </div>
             `,
@@ -110,7 +110,6 @@
             updatesService,
             connectionService,
             integrationService,
-            websocketService,
             utilityService,
             settingsService,
             uiExtensionsService
@@ -121,8 +120,6 @@
 
             ctrl.cs = connectionService;
 
-            ctrl.wss = websocketService;
-
             ctrl.is = integrationService;
 
             ctrl.isViewerDBOn = () => settingsService.getSetting("ViewerDB");
diff --git a/src/gui/app/index.html b/src/gui/app/index.html
index a5a34e990..dedd5c39c 100644
--- a/src/gui/app/index.html
+++ b/src/gui/app/index.html
@@ -156,7 +156,6 @@
     <script type="text/javascript" src="./services/utility.service.js"></script>
     <script type="text/javascript" src="./services/viewer-roles.service.js"></script>
     <script type="text/javascript" src="./services/viewers.service.js"></script>
-    <script type="text/javascript" src="./services/websocket.service.js"></script>
     <!-- /include -->
 
     <!-- include: "type": "js", "files": "directives/**/*.js" -->
diff --git a/src/gui/app/lang/locale-en.json b/src/gui/app/lang/locale-en.json
index 8829b12a9..e617f943c 100644
--- a/src/gui/app/lang/locale-en.json
+++ b/src/gui/app/lang/locale-en.json
@@ -32,7 +32,7 @@
     },
     "CONNECTIONS": {
       "CONNECTIONS": "Connections",
-      "MIXER_TOGGLE": "Click to toggle connections",
+      "TOGGLE": "Click to toggle connections",
       "OPEN_CONNECTION_PANNEL": "Open Connection Panel"
     },
     "ABOUT": "About"
diff --git a/src/gui/app/services/connection.service.js b/src/gui/app/services/connection.service.js
index 236634b28..b5f6fc201 100644
--- a/src/gui/app/services/connection.service.js
+++ b/src/gui/app/services/connection.service.js
@@ -5,7 +5,7 @@
 
     angular
         .module("firebotApp")
-        .factory("connectionService", function(listenerService, soundService, $rootScope, backendCommunicator,
+        .factory("connectionService", function(soundService, $rootScope, backendCommunicator,
             logger, accountAccess, settingsService, utilityService, integrationService) {
             const service = {};
 
@@ -362,26 +362,25 @@
 
             // Connection Monitor for Overlay
             // Recieves event from main process that connection has been established or disconnected.
-            const ListenerType = listenerService.ListenerType;
-            listenerService.registerListener(
-                { type: ListenerType.OVERLAY_CONNECTION_STATUS },
-                (overlayStatusData) => {
-                    let status;
-                    if (!overlayStatusData.serverStarted) {
-                        status = "disconnected";
-                    } else if (overlayStatusData.clientsConnected) {
-                        status = "connected";
-                    } else {
-                        status = "warning";
-                    }
-
-                    $rootScope.$broadcast("connection:update", {
-                        type: "overlay",
-                        status: status
-                    });
+            backendCommunicator.on("overlayStatusUpdate", (overlayStatusData) => {
+                let status;
+                if (!overlayStatusData.serverStarted) {
+                    status = "disconnected";
+                } else if (overlayStatusData.clientsConnected) {
+                    status = "connected";
+                } else {
+                    status = "warning";
                 }
+
+                service.connections["overlay"] = status;
+
+                $rootScope.$broadcast("connection:update", {
+                    type: "overlay",
+                    status: status
+                });
+            }
             );
 
             return service;
         });
-}());
+}());
\ No newline at end of file
diff --git a/src/gui/app/services/sound.service.js b/src/gui/app/services/sound.service.js
index ae718b74b..675fcd30e 100644
--- a/src/gui/app/services/sound.service.js
+++ b/src/gui/app/services/sound.service.js
@@ -5,7 +5,7 @@
 
     angular
         .module("firebotApp")
-        .factory("soundService", function(logger, settingsService, listenerService, $q, websocketService, backendCommunicator) {
+        .factory("soundService", function(logger, settingsService, listenerService, $q, backendCommunicator) {
             const service = {};
             /** @type {HTMLAudioElement[]} */
             const sounds = [];
@@ -178,7 +178,6 @@
             listenerService.registerListener(
                 { type: listenerService.ListenerType.PLAY_SOUND },
                 (data) => {
-                    const filepath = data.filepath;
                     const volume = data.volume / 100 * 10;
 
                     let selectedOutputDevice = data.audioOutputDevice;
@@ -189,21 +188,7 @@
                         selectedOutputDevice = settingsService.getSetting("AudioOutputDevice");
                     }
 
-                    if (selectedOutputDevice.deviceId === 'overlay') {
-
-                        websocketService.broadcast({
-                            event: "sound",
-                            filepath: filepath,
-                            url: data.url,
-                            isUrl: data.isUrl,
-                            format: data.format,
-                            volume: volume,
-                            resourceToken: data.resourceToken,
-                            overlayInstance: data.overlayInstance,
-                            maxSoundLength: data.maxSoundLength
-                        });
-
-                    } else {
+                    if (selectedOutputDevice.deviceId !== 'overlay') {
                         service.playSound(data.isUrl ? data.url : data.filepath, volume, selectedOutputDevice, data.format, data.maxSoundLength);
                     }
                 }
diff --git a/src/gui/app/services/websocket.service.js b/src/gui/app/services/websocket.service.js
deleted file mode 100644
index 4ec544cba..000000000
--- a/src/gui/app/services/websocket.service.js
+++ /dev/null
@@ -1,284 +0,0 @@
-"use strict";
-
-(function() {
-    // This provides methods for sending stuff to the websocket
-
-    angular
-        .module("firebotApp")
-        .factory("websocketService", function(
-            logger,
-            listenerService
-        ) {
-            const service = {};
-
-            function showEvents(data) {
-                let showEventsPosition = data.showEventsPosition;
-                let showEventsHeight = data.showEventsHeight;
-                let showEventsWidth = data.showEventsWidth;
-                let showEventsDuration = parseFloat(data.showEventsDuration);
-                let showEventsColor = data.showEventsColor;
-                let showEventsBackgroundColor = data.showEventsBackgroundColor;
-                let showEventsFontSize = data.showEventsFontSize;
-                const showEventsType = data.showEventsType;
-                const showEventsAlignment = data.showEventsAlignment;
-
-                // Set defaults if they werent filled out.
-                if (showEventsPosition === "" || showEventsPosition == null) {
-                    showEventsPosition = "Top Middle";
-                }
-                if (showEventsHeight === "" || showEventsHeight == null) {
-                    showEventsHeight = false;
-                }
-                if (showEventsWidth === "" || showEventsWidth == null) {
-                    showEventsWidth = false;
-                }
-                if (showEventsDuration === "" || showEventsDuration == null) {
-                    showEventsDuration = 5;
-                }
-                if (showEventsColor === "" || showEventsColor == null) {
-                    showEventsColor = "#ffffff";
-                }
-                if (
-                    showEventsBackgroundColor === "" ||
-          showEventsBackgroundColor == null
-                ) {
-                    showEventsBackgroundColor = "transparent";
-                }
-                if (showEventsFontSize === "" || showEventsFontSize == null) {
-                    showEventsFontSize = "1em";
-                }
-
-                // Compile data and send to overlay.
-                const broadCastData = {
-                    event: "showEvents",
-                    showEventsType: showEventsType,
-                    resourceToken: data.resourceToken,
-                    showEventsText: data.showEventsText,
-                    showEventsAlignment: showEventsAlignment,
-                    showEventsColor: showEventsColor,
-                    showEventsBackgroundColor: showEventsBackgroundColor,
-                    showEventsFontSize: showEventsFontSize,
-                    showEventsPosition: showEventsPosition,
-                    showEventsHeight: showEventsHeight,
-                    showEventsWidth: showEventsWidth,
-                    showEventsDuration: showEventsDuration,
-                    enterAnimation: data.enterAnimation,
-                    exitAnimation: data.exitAnimation,
-                    customCoords: data.customCoords
-                };
-
-                service.broadcast(broadCastData);
-            }
-
-            function showImage(data) {
-                const filepath = data.filepath;
-                let imagePosition = data.imagePosition;
-                let imageHeight = data.imageHeight;
-                let imageWidth = data.imageWidth;
-                let imageDuration = parseFloat(data.imageDuration);
-
-                // Set defaults if they werent filled out.
-                if (imagePosition === "" || imagePosition == null) {
-                    imagePosition = "Top Middle";
-                }
-                if (imageHeight === "" || imageHeight == null) {
-                    imageHeight = false;
-                }
-                if (imageWidth === "" || imageWidth == null) {
-                    imageWidth = false;
-                }
-                if (imageDuration === "" || imageDuration == null) {
-                    imageDuration = 5;
-                }
-
-                // Compile data and send to overlay.
-                const broadCastData = {
-                    event: "image",
-                    filepath: filepath,
-                    url: data.url,
-                    imageType: data.imageType,
-                    resourceToken: data.resourceToken,
-                    imagePosition: imagePosition,
-                    imageHeight: imageHeight,
-                    imageWidth: imageWidth,
-                    imageDuration: imageDuration,
-                    enterAnimation: data.enterAnimation,
-                    exitAnimation: data.exitAnimation,
-                    overlayInstance: data.overlayInstance,
-                    customCoords: data.customCoords,
-                    inbetweenAnimation: data.inbetweenAnimation,
-                    inbetweenDelay: data.inbetweenDelay,
-                    inbetweenDuration: data.inbetweenDuration,
-                    inbetweenRepeat: data.inbetweenRepeat
-                };
-
-                service.broadcast(broadCastData);
-            }
-
-            function showVideo(data) {
-                const videoType = data.videoType;
-                const filepath = data.filepath;
-                const youtubeId = data.youtubeId;
-                let videoPosition = data.videoPosition;
-                let videoHeight = data.videoHeight;
-                let videoWidth = data.videoWidth;
-                let videoDuration = parseFloat(data.videoDuration);
-                const videoVolume = data.videoVolume;
-                const videoStarttime = data.videoStarttime;
-
-                // Set defaults if they werent filled out.
-                if (videoPosition === "" || videoPosition == null) {
-                    videoPosition = "Top Middle";
-                }
-                if (videoHeight === "" || videoHeight == null) {
-                    videoHeight = false;
-                }
-                if (videoWidth === "" || videoWidth == null) {
-                    videoWidth = false;
-                }
-                if (
-                    videoDuration === null ||
-                    videoDuration === undefined ||
-                    isNaN(videoDuration)
-                ) {
-                    videoDuration = 5;
-                }
-
-                // Compile data and send to overlay.
-                const broadcastdata = {
-                    event: "video",
-                    videoType: videoType,
-                    filepath: filepath,
-                    resourceToken: data.resourceToken,
-                    youtubeId: youtubeId,
-                    videoPosition: videoPosition,
-                    videoHeight: videoHeight,
-                    videoWidth: videoWidth,
-                    videoDuration: videoDuration,
-                    videoVolume: videoVolume,
-                    videoStarttime: videoStarttime,
-                    enterAnimation: data.enterAnimation,
-                    exitAnimation: data.exitAnimation,
-                    overlayInstance: data.overlayInstance,
-                    customCoords: data.customCoords,
-                    loop: data.loop,
-                    inbetweenAnimation: data.inbetweenAnimation,
-                    inbetweenDelay: data.inbetweenDelay,
-                    inbetweenDuration: data.inbetweenDuration,
-                    inbetweenRepeat: data.inbetweenRepeat
-                };
-
-                service.broadcast(broadcastdata);
-            }
-
-            // Shows Text
-            // This function takes info given from the main process and then sends a request to the overlay to render it.
-            function showText(data) {
-                data.event = "text";
-                logger.debug(
-                    "Recieved show text effect from backend, sending to overlay"
-                );
-                service.broadcast(data);
-            }
-
-            // Shows HTML
-            // This function takes info given from the main process and then sends a request to the overlay to render it.
-            function showHtml(data) {
-                data.event = "html";
-
-                service.broadcast(data);
-            }
-
-            // Websocket Server
-            // This allows for the guiBroadcast call to send out data via websocket.
-            service.broadcast = function() {
-                /*data = JSON.stringify(data);
-        wss.clients.forEach(function each(client) {
-          if (client.readyState === 1) {
-            client.send(data, err => {
-              if (err) {
-                logger.error(err);
-              }
-            });
-          }
-        });*/
-            };
-
-            service.hasClientsConnected = false;
-
-            /*wss.on("connection", function connection() {
-        service.hasClientsConnected = true;
-        $timeout(() => {
-          $rootScope.$broadcast("connection:update", {
-            type: "overlay",
-            status: "connected"
-          });
-        });
-      });
-
-      $interval(() => {
-        let prevValue = service.hasClientsConnected === true;
-        let hasConnectedClients = wss.clients.size > 0;
-        if (hasConnectedClients !== prevValue) {
-          service.hasClientsConnected = hasConnectedClients;
-          let status = service.hasClientsConnected ? "connected" : "warning";
-          $rootScope.$broadcast("connection:update", {
-            type: "overlay",
-            status: status
-          });
-        }
-      }, 1500);*/
-
-            // Watches for an event from main process
-            listenerService.registerListener(
-                { type: listenerService.ListenerType.SHOW_EVENTS },
-                data => {
-                    showEvents(data);
-                }
-            );
-
-            listenerService.registerListener(
-                { type: listenerService.ListenerType.SHOW_VIDEO },
-                data => {
-                    showVideo(data);
-                }
-            );
-
-            listenerService.registerListener(
-                { type: listenerService.ListenerType.SHOW_IMAGE },
-                data => {
-                    showImage(data);
-                }
-            );
-
-            listenerService.registerListener(
-                { type: listenerService.ListenerType.SHOW_HTML },
-                data => {
-                    showHtml(data);
-                }
-            );
-
-            listenerService.registerListener(
-                { type: listenerService.ListenerType.SHOW_TEXT },
-                data => {
-                    showText(data);
-                }
-            );
-
-            listenerService.registerListener(
-                { type: listenerService.ListenerType.CELEBRATE },
-                data => {
-                    service.broadcast(data);
-                }
-            );
-
-            listenerService.registerListener(
-                { type: listenerService.ListenerType.CLEAR_EFFECTS },
-                () => {
-                    logger.info("Refreshing overlay...");
-                    service.broadcast({ event: "firebot:reloadoverlay" });
-                });
-
-            return service;
-        });
-}());

From 1d24b8f566c337b2948966ee66bd643014f01e73 Mon Sep 17 00:00:00 2001
From: phroggster <phroggster@users.noreply.github.com>
Date: Mon, 23 Dec 2024 13:26:36 -0600
Subject: [PATCH 43/54] Adjust arg names, verbiage, add a filter

- Use isGoldenKappaTrain prop/arg names throughout per Zundy
- Add a Golden Kappa event filter per Dennis (untested!)
- Adjust variable description to better reflect its boolean nature
---
 .../events/builtin/twitch-event-source.js     |  6 +-
 .../builtin/twitch/golden-kappa-train.ts      | 19 ++++++
 .../events/filters/builtin/twitch/index.ts    |  2 +
 .../events/twitch-events/hype-train.ts        | 20 +++----
 .../twitch/hype-train/golden-kappa-train.ts   | 10 +++-
 .../misc/hype-train-indicator.component.js    |  2 +-
 src/gui/app/services/hype-train.service.js    | 58 +++++++++----------
 7 files changed, 71 insertions(+), 46 deletions(-)
 create mode 100644 src/backend/events/filters/builtin/twitch/golden-kappa-train.ts

diff --git a/src/backend/events/builtin/twitch-event-source.js b/src/backend/events/builtin/twitch-event-source.js
index 13f150e55..e4d9c48bf 100644
--- a/src/backend/events/builtin/twitch-event-source.js
+++ b/src/backend/events/builtin/twitch-event-source.js
@@ -868,7 +868,7 @@ module.exports = {
                 progress: "150",
                 goal: "500",
                 level: "1",
-                isGoldenKappa: false
+                isGoldenKappaTrain: false
             },
             activityFeed: {
                 icon: "fad fa-train",
@@ -888,7 +888,7 @@ module.exports = {
                 progress: "150",
                 goal: "500",
                 level: "1",
-                isGoldenKappa: false
+                isGoldenKappaTrain: false
             },
             activityFeed: {
                 icon: "fad fa-train",
@@ -908,7 +908,7 @@ module.exports = {
             manualMetadata: {
                 total: "150",
                 level: "1",
-                isGoldenKappa: false
+                isGoldenKappaTrain: false
             },
             activityFeed: {
                 icon: "fad fa-train",
diff --git a/src/backend/events/filters/builtin/twitch/golden-kappa-train.ts b/src/backend/events/filters/builtin/twitch/golden-kappa-train.ts
new file mode 100644
index 000000000..ee9a44445
--- /dev/null
+++ b/src/backend/events/filters/builtin/twitch/golden-kappa-train.ts
@@ -0,0 +1,19 @@
+import { createPresetFilter } from "../../filter-factory";
+
+const filter = createPresetFilter({
+    id: "firebot:golden-kappa-train",
+    name: "Golden Kappa Train",
+    description: "Filter by whether the hype train is a Golden Kappa Train.",
+    events: [
+        { eventSourceId: "twitch", eventId: "hype-train-end" },
+        { eventSourceId: "twitch", eventId: "hype-train-progress" },
+        { eventSourceId: "twitch", eventId: "hype-train-start" }
+    ],
+    eventMetaKey: "isGoldenKappaTrain",
+    presetValues: async () => [
+        { value: "true", display: "True" },
+        { value: "false", display: "False" }
+    ]
+});
+
+export default filter;
diff --git a/src/backend/events/filters/builtin/twitch/index.ts b/src/backend/events/filters/builtin/twitch/index.ts
index 543a436ba..754117714 100644
--- a/src/backend/events/filters/builtin/twitch/index.ts
+++ b/src/backend/events/filters/builtin/twitch/index.ts
@@ -5,6 +5,7 @@ import chatMode from "./chat-mode";
 import cheerBitsAmount from "./cheer-bits-amount";
 import giftCount from "./gift-count";
 import giftDuration from "./gift-duration";
+import goldenKappaTrain from "./golden-kappa-train";
 import isAnonymous from "./is-anonymous";
 import message from "./message";
 import raidViewerCount from "./raid-viewer-count";
@@ -24,6 +25,7 @@ export default [
     cheerBitsAmount,
     giftCount,
     giftDuration,
+    goldenKappaTrain,
     isAnonymous,
     message,
     raidViewerCount,
diff --git a/src/backend/events/twitch-events/hype-train.ts b/src/backend/events/twitch-events/hype-train.ts
index ef90a62dc..0e59c6b2b 100644
--- a/src/backend/events/twitch-events/hype-train.ts
+++ b/src/backend/events/twitch-events/hype-train.ts
@@ -8,13 +8,13 @@ function sendStartProgressEventToFrontend(
     goal: number,
     progress: number,
     endsAt: Date,
-    isGoldenKappa: boolean
+    isGoldenKappaTrain: boolean
 ) {
     frontendCommunicator.send(`hype-train:${eventType}`, {
         level,
         progressPercentage: Math.floor(progress / goal * 100),
         endsAt,
-        isGoldenKappa
+        isGoldenKappaTrain
     });
 }
 
@@ -37,7 +37,7 @@ export function triggerHypeTrainStart(
     expiryDate: Date,
     lastContribution: EventSubChannelHypeTrainContribution,
     topContributors: EventSubChannelHypeTrainContribution[],
-    isGoldenKappa: boolean
+    isGoldenKappaTrain: boolean
 ) {
     eventManager.triggerEvent("twitch", "hype-train-start", {
         total,
@@ -48,10 +48,10 @@ export function triggerHypeTrainStart(
         expiryDate,
         lastContribution: mapContribution(lastContribution),
         topContributors: topContributors.map(mapContribution),
-        isGoldenKappa: isGoldenKappa
+        isGoldenKappaTrain: isGoldenKappaTrain
     });
 
-    sendStartProgressEventToFrontend("start", level, goal, progress, expiryDate, isGoldenKappa);
+    sendStartProgressEventToFrontend("start", level, goal, progress, expiryDate, isGoldenKappaTrain);
 }
 
 export function triggerHypeTrainProgress(
@@ -63,7 +63,7 @@ export function triggerHypeTrainProgress(
     expiryDate: Date,
     lastContribution: EventSubChannelHypeTrainContribution,
     topContributors: EventSubChannelHypeTrainContribution[],
-    isGoldenKappa: boolean
+    isGoldenKappaTrain: boolean
 ) {
     eventManager.triggerEvent("twitch", "hype-train-progress", {
         total,
@@ -74,10 +74,10 @@ export function triggerHypeTrainProgress(
         expiryDate,
         lastContribution: mapContribution(lastContribution),
         topContributors: topContributors.map(mapContribution),
-        isGoldenKappa: isGoldenKappa
+        isGoldenKappaTrain: isGoldenKappaTrain
     });
 
-    sendStartProgressEventToFrontend("progress", level, goal, progress, expiryDate, isGoldenKappa);
+    sendStartProgressEventToFrontend("progress", level, goal, progress, expiryDate, isGoldenKappaTrain);
 }
 
 export function triggerHypeTrainEnd(
@@ -87,7 +87,7 @@ export function triggerHypeTrainEnd(
     endDate: Date,
     cooldownEndDate: Date,
     topContributors: EventSubChannelHypeTrainContribution[],
-    isGoldenKappa: boolean
+    isGoldenKappaTrain: boolean
 ) {
     eventManager.triggerEvent("twitch", "hype-train-end", {
         total,
@@ -96,7 +96,7 @@ export function triggerHypeTrainEnd(
         endDate,
         cooldownEndDate,
         topContributors: topContributors.map(mapContribution),
-        isGoldenKappa: isGoldenKappa
+        isGoldenKappaTrain: isGoldenKappaTrain
     });
 
     frontendCommunicator.send("hype-train:end");
diff --git a/src/backend/variables/builtin/twitch/hype-train/golden-kappa-train.ts b/src/backend/variables/builtin/twitch/hype-train/golden-kappa-train.ts
index 8f9c925bf..2c62a2c3b 100644
--- a/src/backend/variables/builtin/twitch/hype-train/golden-kappa-train.ts
+++ b/src/backend/variables/builtin/twitch/hype-train/golden-kappa-train.ts
@@ -3,19 +3,23 @@ import { EffectTrigger } from "../../../../../shared/effect-constants";
 import { OutputDataType, VariableCategory } from "../../../../../shared/variable-constants";
 
 const triggers = {};
-triggers[EffectTrigger.EVENT] = ["twitch:hype-train-start", "twitch:hype-train-progress", "twitch:hype-train-end"];
+triggers[EffectTrigger.EVENT] = [
+    "twitch:hype-train-end",
+    "twitch:hype-train-progress",
+    "twitch:hype-train-start"
+];
 triggers[EffectTrigger.MANUAL] = true;
 
 const model: ReplaceVariable = {
     definition: {
         handle: "isGoldenKappaTrain",
-        description: "Whether or not a Twitch Hype Train is a Golden Kappa Train.",
+        description: "`true` when the hype train is a Golden Kappa Train, `false` otherwise.",
         triggers: triggers,
         categories: [VariableCategory.TRIGGER],
         possibleDataOutput: [OutputDataType.BOOLEAN]
     },
     evaluator: (trigger) => {
-        return trigger.metadata?.eventData?.isGoldenKappa ?? false;
+        return trigger.metadata?.eventData?.isGoldenKappaTrain ?? false;
     }
 };
 
diff --git a/src/gui/app/directives/misc/hype-train-indicator.component.js b/src/gui/app/directives/misc/hype-train-indicator.component.js
index 033bff589..dd32b0944 100644
--- a/src/gui/app/directives/misc/hype-train-indicator.component.js
+++ b/src/gui/app/directives/misc/hype-train-indicator.component.js
@@ -17,7 +17,7 @@
                 >
                     <i class="fas fa-subway" style="margin-right: 5px; font-size: 12px;" />
                     <span class="level-pill">LVL {{hts.currentLevel}}</span>
-                    <span ng-if="hts.isGoldenKappa"
+                    <span ng-if="hts.isGoldenKappaTrain"
                         class="level-pill golden"
                         uib-tooltip="Congratulations, a Golden Kappa Train is a rare event! Anyone whom cheers 100 bits, subs, re-subs, or gifts a sub during it gains access to the Golden Kappa emote on Twitch for 24 hours."
                         tooltip-append-to-body="true"
diff --git a/src/gui/app/services/hype-train.service.js b/src/gui/app/services/hype-train.service.js
index ff36b11e1..6c67f256f 100644
--- a/src/gui/app/services/hype-train.service.js
+++ b/src/gui/app/services/hype-train.service.js
@@ -2,38 +2,38 @@
 
 (function() {
     angular
-        .module("firebotApp")
-        .factory("hypeTrainService", function($timeout, backendCommunicator) {
-            const service = {};
+      .module("firebotApp")
+      .factory("hypeTrainService", function($timeout, backendCommunicator) {
+          const service = {};
 
-            service.hypeTrainActive = false;
-            service.hypeTrainEnded = false;
-            service.currentLevel = 0;
-            service.currentProgressPercentage = 0;
-            service.endsAt = new Date().toJSON();
-            service.isGoldenKappa = false;
+          service.hypeTrainActive = false;
+          service.hypeTrainEnded = false;
+          service.currentLevel = 0;
+          service.currentProgressPercentage = 0;
+          service.endsAt = new Date().toJSON();
+          service.isGoldenKappaTrain = false;
 
-            function updateHypeTrainState({ level, progressPercentage, endsAt, isGoldenKappa }) {
-                service.currentLevel = level;
-                service.currentProgressPercentage = progressPercentage;
-                service.endsAt = endsAt;
-                service.hypeTrainActive = true;
-                service.hypeTrainEnded = false;
-                service.isGoldenKappa = isGoldenKappa;
-            }
+          function updateHypeTrainState({ level, progressPercentage, endsAt, isGoldenKappaTrain }) {
+              service.currentLevel = level;
+              service.currentProgressPercentage = progressPercentage;
+              service.endsAt = endsAt;
+              service.hypeTrainActive = true;
+              service.hypeTrainEnded = false;
+              service.isGoldenKappaTrain = isGoldenKappaTrain;
+          }
 
-            backendCommunicator.on("hype-train:start", updateHypeTrainState);
-            backendCommunicator.on("hype-train:progress", updateHypeTrainState);
-            backendCommunicator.on("hype-train:end", () => {
-                service.hypeTrainEnded = true;
+          backendCommunicator.on("hype-train:start", updateHypeTrainState);
+          backendCommunicator.on("hype-train:progress", updateHypeTrainState);
+          backendCommunicator.on("hype-train:end", () => {
+              service.hypeTrainEnded = true;
 
-                $timeout(() => {
-                    service.hypeTrainActive = false;
-                    service.hypeTrainEnded = false;
-                    service.isGoldenKappa = false;
-                }, 5000);
-            });
+              $timeout(() => {
+                  service.hypeTrainActive = false;
+                  service.hypeTrainEnded = false;
+                  service.isGoldenKappaTrain = false;
+              }, 5000);
+          });
 
-            return service;
-        });
+        return service;
+    });
 }());
\ No newline at end of file

From 50ee6dc7f28c8efb439f8de12486032cc963bd40 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Mon, 23 Dec 2024 19:56:57 -0500
Subject: [PATCH 44/54] chore: listenerService to backendCommunicator, frontend
 cleanup

---
 src/backend/common/common-listeners.js        |  31 --
 src/backend/common/handlers/mediaProcessor.js |  33 +--
 .../app/controllers/commands.controller.js    |  10 +-
 src/gui/app/controllers/events.controller.js  |  16 +-
 .../controls/searchableEventDropdown.js       |   8 +-
 src/gui/app/directives/effectOptions.js       |   4 +-
 .../modals/backups/restoreBackupModal.js      |   4 +-
 src/gui/app/services/chat-messages.service.js |  20 +-
 .../services/connection-manager.service.js    | 158 +---------
 src/gui/app/services/effect-helper.service.js |  10 +-
 src/gui/app/services/integration.service.js   |  12 +-
 src/gui/app/services/listener.service.js      | 273 +-----------------
 src/gui/app/services/sound.service.js         |  31 +-
 src/gui/app/services/updates.service.js       |   8 +-
 src/gui/app/services/utility.service.js       |  23 +-
 15 files changed, 63 insertions(+), 578 deletions(-)

diff --git a/src/backend/common/common-listeners.js b/src/backend/common/common-listeners.js
index a93de3bb3..487040bd2 100644
--- a/src/backend/common/common-listeners.js
+++ b/src/backend/common/common-listeners.js
@@ -1,15 +1,11 @@
 "use strict";
 const electron = require("electron");
 const { app, ipcMain, dialog, shell } = electron;
-
-const path = require("path");
-
 const logger = require("../logwrapper");
 
 exports.setupCommonListeners = () => {
 
     const frontendCommunicator = require("./frontend-communicator");
-    const dataAccess = require("./data-access");
     const profileManager = require("./profile-manager");
     const { SettingsManager } = require("./settings-manager");
     const { BackupManager } = require("../backup-manager");
@@ -86,33 +82,6 @@ exports.setupCommonListeners = () => {
         }, 100);
     });
 
-    // Opens the firebot root folder
-    ipcMain.on("openRootFolder", () => {
-        const rootFolder = path.resolve(
-            profileManager.getPathInProfile("/")
-        );
-        shell.openPath(rootFolder);
-    });
-
-    // Opens the firebot root folder
-    ipcMain.on("openLogsFolder", () => {
-        const rootFolder = path.resolve(
-            dataAccess.getPathInUserData("/logs/")
-        );
-        shell.openPath(rootFolder);
-    });
-
-    // Get Import Folder Path
-    // This listens for an event from the render media.js file to open a dialog to get a filepath.
-    ipcMain.on("getImportFolderPath", (event, uniqueid) => {
-        const path = dialog.showOpenDialogSync({
-            title: "Select 'user-settings' folder",
-            buttonLabel: "Import 'user-settings'",
-            properties: ["openDirectory"]
-        });
-        event.sender.send("gotImportFolderPath", { path: path, id: uniqueid });
-    });
-
     // Opens the firebot backup folder
     ipcMain.on("open-backup-folder", () => {
         shell.openPath(BackupManager.backupFolderPath);
diff --git a/src/backend/common/handlers/mediaProcessor.js b/src/backend/common/handlers/mediaProcessor.js
index 6911e4534..057053f06 100644
--- a/src/backend/common/handlers/mediaProcessor.js
+++ b/src/backend/common/handlers/mediaProcessor.js
@@ -1,42 +1,11 @@
 "use strict";
 
-const { ipcMain, dialog } = require("electron");
 const { SettingsManager } = require("../settings-manager");
 const resourceTokenManager = require("../../resourceTokenManager.js");
 const util = require("../../utility");
 const logger = require("../../logwrapper");
 const webServer = require("../../../server/http-server-manager");
 
-// Get Sound File Path
-// This listens for an event from the render media.js file to open a dialog to get a filepath.
-ipcMain.on("getSoundPath", function(event, uniqueid) {
-    const path = dialog.showOpenDialogSync({
-        properties: ["openFile"],
-        filters: [{ name: "Audio", extensions: ["mp3", "ogg", "oga", "wav", "flac"] }]
-    });
-    event.sender.send("gotSoundFilePath", { path: path, id: uniqueid });
-});
-
-// Get Video File Path
-// This listens for an event from the render media.js file to open a dialog to get a filepath.
-ipcMain.on("getVideoPath", function(event, uniqueid) {
-    const path = dialog.showOpenDialogSync({
-        properties: ["openFile"],
-        filters: [{ name: "Video", extensions: ["mp4", "webm", "ogv"] }]
-    });
-    event.sender.send("gotVideoFilePath", { path: path, id: uniqueid });
-});
-
-// Get Image File Path
-// This listens for an event from the render media.js file to open a dialog to get a filepath.
-ipcMain.on("getImagePath", function(event, uniqueid) {
-    const path = dialog.showOpenDialogSync({
-        properties: ["openFile"],
-        filters: [{ name: "Image", extensions: ["jpg", "gif", "png", "jpeg"] }]
-    });
-    event.sender.send("gotImageFilePath", { path: path, id: uniqueid });
-});
-
 function getRandomInt(min, max) {
     min = Math.ceil(min);
     max = Math.floor(max);
@@ -276,4 +245,4 @@ exports.sound = soundProcessor;
 exports.image = imageProcessor;
 exports.video = videoProcessor;
 exports.text = showText;
-exports.randomLocation = getRandomPresetLocation;
+exports.randomLocation = getRandomPresetLocation;
\ No newline at end of file
diff --git a/src/gui/app/controllers/commands.controller.js b/src/gui/app/controllers/commands.controller.js
index 949f6e125..009d67af2 100644
--- a/src/gui/app/controllers/commands.controller.js
+++ b/src/gui/app/controllers/commands.controller.js
@@ -4,12 +4,9 @@
         .module("firebotApp")
         .controller("commandsController", function(
             $scope,
-            triggerSearchFilter,
-            sortTagSearchFilter,
             commandsService,
             utilityService,
-            listenerService,
-            viewerRolesService,
+            backendCommunicator,
             objectCopyHelper,
             sortTagsService
         ) {
@@ -22,10 +19,7 @@
             $scope.sts = sortTagsService;
 
             $scope.manuallyTriggerCommand = (id) => {
-                listenerService.fireEvent(
-                    listenerService.EventType.COMMAND_MANUAL_TRIGGER,
-                    id
-                );
+                backendCommunicator.send("command-manual-trigger", id);
             };
 
             $scope.toggleCustomCommandActiveState = (command) => {
diff --git a/src/gui/app/controllers/events.controller.js b/src/gui/app/controllers/events.controller.js
index 1a0097642..a60ec7fdc 100644
--- a/src/gui/app/controllers/events.controller.js
+++ b/src/gui/app/controllers/events.controller.js
@@ -5,11 +5,11 @@
     angular
         .module("firebotApp")
         .controller("eventsController", function($scope, eventsService, utilityService,
-            listenerService, objectCopyHelper) {
+            backendCommunicator, objectCopyHelper) {
 
             $scope.es = eventsService;
 
-            const sources = listenerService.fireEventSync("getAllEventSources");
+            const sources = backendCommunicator.fireEventSync("getAllEventSources");
 
             function friendlyEventTypeName(sourceId, eventId) {
                 const source = sources.find(s => s.id === sourceId);
@@ -103,7 +103,7 @@
                         label: "New Event Set Name",
                         saveText: "Create",
                         validationFn: (value) => {
-                            return new Promise(resolve => {
+                            return new Promise((resolve) => {
                                 if (value == null || value.trim().length < 1) {
                                     resolve(false);
                                 } else {
@@ -126,7 +126,7 @@
                         label: "Rename Event Set",
                         saveText: "Save",
                         validationFn: (value) => {
-                            return new Promise(resolve => {
+                            return new Promise((resolve) => {
                                 if (value == null || value.trim().length < 1) {
                                     resolve(false);
                                 } else {
@@ -151,7 +151,7 @@
                         confirmLabel: "Delete",
                         confirmBtnType: "btn-danger"
                     })
-                    .then(confirmed => {
+                    .then((confirmed) => {
                         if (confirmed) {
                             eventsService.deleteGroup(group.id);
                         }
@@ -175,7 +175,7 @@
                         event: () => event,
                         groupId: () => selectedGroupId
                     },
-                    closeCallback: resp => {
+                    closeCallback: (resp) => {
                         const { action, event, groupId } = resp;
 
                         switch (action) {
@@ -208,7 +208,7 @@
                         confirmLabel: "Delete",
                         confirmBtnType: "btn-danger"
                     })
-                    .then(confirmed => {
+                    .then((confirmed) => {
                         if (confirmed) {
                             const groupId = eventsService.getSelectedTab();
                             deleteEvent(groupId, eventId);
@@ -365,7 +365,7 @@
                     },
                     {
                         text: "Move to...",
-                        children: availableGroups.map(g => {
+                        children: availableGroups.map((g) => {
                             return {
                                 html: `<a href>${g.name}</a>`,
                                 click: () => {
diff --git a/src/gui/app/directives/controls/searchableEventDropdown.js b/src/gui/app/directives/controls/searchableEventDropdown.js
index bac6a48bc..26c094d6c 100644
--- a/src/gui/app/directives/controls/searchableEventDropdown.js
+++ b/src/gui/app/directives/controls/searchableEventDropdown.js
@@ -33,11 +33,11 @@
         </ui-select-choices>
       </ui-select>
       `,
-        controller: function(listenerService) {
+        controller: function(backendCommunicator) {
             const ctrl = this;
 
-            const events = listenerService.fireEventSync("getAllEvents", false);
-            const sources = listenerService.fireEventSync("getAllEventSources", false);
+            const events = backendCommunicator.fireEventSync("getAllEvents", false);
+            const sources = backendCommunicator.fireEventSync("getAllEventSources", false);
 
             const getSelected = () => {
                 // sort events by name
@@ -60,7 +60,7 @@
                 getSelected();
 
                 // Add source info to event objects for filtering
-                events.forEach(e => {
+                events.forEach((e) => {
                     e.source = {
                         id: e.sourceId,
                         name: ctrl.getSourceName(e.sourceId)
diff --git a/src/gui/app/directives/effectOptions.js b/src/gui/app/directives/effectOptions.js
index 2ac056a38..a7e237ef7 100644
--- a/src/gui/app/directives/effectOptions.js
+++ b/src/gui/app/directives/effectOptions.js
@@ -33,7 +33,7 @@
                         element.children("#child").replaceWith(template);
                     });
                 },
-                controller: ($scope, $injector, listenerService) => {
+                controller: ($scope, $injector, backendCommunicator) => {
                     // Add common options to the scope so we can access them in any effect option template
                     $scope.commonOptions = effectHelperService.commonOptionsForEffectTypes;
 
@@ -41,7 +41,7 @@
                     // and run it.
                     function findController() {
 
-                        const effectDef = listenerService.fireEventSync(
+                        const effectDef = backendCommunicator.fireEventSync(
                             "getEffectDefinition",
                             $scope.type
                         );
diff --git a/src/gui/app/directives/modals/backups/restoreBackupModal.js b/src/gui/app/directives/modals/backups/restoreBackupModal.js
index 530786a0c..59188ffac 100644
--- a/src/gui/app/directives/modals/backups/restoreBackupModal.js
+++ b/src/gui/app/directives/modals/backups/restoreBackupModal.js
@@ -37,7 +37,7 @@
             dismiss: "&",
             modalInstance: "<"
         },
-        controller: function($timeout, $q, logger, backupService, listenerService) {
+        controller: function($timeout, $q, logger, backupService, backendCommunicator) {
             const $ctrl = this;
 
             $ctrl.restoreComplete = false;
@@ -47,7 +47,7 @@
 
             $ctrl.exit = function() {
                 if ($ctrl.restoreComplete) {
-                    listenerService.fireEvent(listenerService.EventType.RESTART_APP);
+                    backendCommunicator.send("restartApp");
                 } else {
                     $ctrl.modalInstance.dismiss("cancel");
                 }
diff --git a/src/gui/app/services/chat-messages.service.js b/src/gui/app/services/chat-messages.service.js
index 8a84fa128..95c362910 100644
--- a/src/gui/app/services/chat-messages.service.js
+++ b/src/gui/app/services/chat-messages.service.js
@@ -6,7 +6,7 @@
 
     angular
         .module('firebotApp')
-        .factory('chatMessagesService', function (logger, listenerService, settingsService,
+        .factory('chatMessagesService', function (logger, settingsService,
             soundService, backendCommunicator, pronounsService, accountAccess, ngToast) {
             const service = {};
 
@@ -465,23 +465,7 @@
 
             // Watches for an chat update from main process
             // This handles clears, deletions, timeouts, etc... Anything that isn't a message.
-            listenerService.registerListener(
-                { type: listenerService.ListenerType.CHAT_UPDATE },
-                (data) => {
-                    service.chatUpdateHandler(data);
-                }
-            );
-
-            // Connection Monitor
-            // Receives event from main process that connection has been established or disconnected.
-            listenerService.registerListener(
-                { type: listenerService.ListenerType.CHAT_CONNECTION_STATUS },
-                (isChatConnected) => {
-                    if (isChatConnected) {
-                        service.chatQueue = [];
-                    }
-                }
-            );
+            backendCommunicator.on("chatUpdate", service.chatUpdateHandler);
 
             return service;
         });
diff --git a/src/gui/app/services/connection-manager.service.js b/src/gui/app/services/connection-manager.service.js
index 94a4ca728..75e4a008c 100644
--- a/src/gui/app/services/connection-manager.service.js
+++ b/src/gui/app/services/connection-manager.service.js
@@ -7,165 +7,19 @@
         .module("firebotApp")
         .factory("connectionManager", function(
             connectionService,
-            listenerService,
+            backendCommunicator,
             settingsService,
-            soundService,
-            integrationService,
-            logger
+            integrationService
         ) {
             const service = {};
 
-            let overlayStatus = listenerService.fireEventSync("getOverlayStatus");
-
-            function delay(time) {
-                return new Promise((resolve) => {
-                    setTimeout(() => {
-                        resolve();
-                    }, time || 100);
-                });
-            }
+            let overlayStatus = backendCommunicator.fireEventSync("getOverlayStatus");
 
             // Connection Monitor for Overlay
             // Recieves event from main process that connection has been established or disconnected.
-            listenerService.registerListener(
-                {
-                    type: listenerService.ListenerType.OVERLAY_CONNECTION_STATUS
-                },
-                (overlayStatusData) => {
-                    overlayStatus = overlayStatusData;
-                }
-            );
-
-            service.isWaitingForServicesStatusChange = function() {
-                return (
-                    connectionService.waitingForStatusChange ||
-                    connectionService.waitingForChatStatusChange ||
-                    connectionService.isConnectingAll
-                );
-            };
-
-            service.setConnectionToChat = function(shouldConnect) {
-                return new Promise((resolve) => {
-                    listenerService.registerListener(
-                        {
-                            type: listenerService.ListenerType.CHAT_CONNECTION_STATUS,
-                            runOnce: true
-                        },
-                        (isChatConnected) => {
-                            resolve(isChatConnected);
-                        }
-                    );
-
-                    if (shouldConnect) {
-                        connectionService.connectToChat();
-                    } else {
-                        connectionService.disconnectFromChat();
-                    }
-                });
-            };
-
-            service.connectedServiceCount = function(services) {
-                if (services == null) {
-                    services = settingsService.getSetting("SidebarControlledServices");
-                }
-
-                let count = 0;
-
-                services.forEach((s) => {
-                    switch (s) {
-                        case "chat":
-                            if (connectionService.connectedToChat) {
-                                count++;
-                            }
-                            break;
-                        default:
-                            if (s.startsWith("integration.")) {
-                                const intId = s.replace("integration.", "");
-                                if (integrationService.integrationIsConnected(intId)) {
-                                    count++;
-                                }
-                            }
-                    }
-                });
-
-                return count;
-            };
-
-            service.partialServicesConnected = function() {
-                const services = settingsService.getSetting("SidebarControlledServices");
-                const connectedCount = service.connectedServiceCount();
-
-                return connectedCount > 0 && services.length > connectedCount;
-            };
-
-            service.allServicesConnected = function() {
-                const services = settingsService.getSetting("SidebarControlledServices");
-                const connectedCount = service.connectedServiceCount();
-
-                return services.length === connectedCount;
-            };
-
-            service.toggleSidebarServices = function() {
-                const services = settingsService.getSetting("SidebarControlledServices");
-
-                // we only want to connect if none of the connections are currently connected
-                // otherwise we will attempt to disconnect everything.
-                const shouldConnect = service.connectedServiceCount() === 0;
-
-                service.toggleConnectionForServices(services, shouldConnect);
-            };
-
-            service.toggleConnectionForServices = async function(
-                services,
-                shouldConnect = false
-            ) {
-                if (service.isWaitingForServicesStatusChange()) {
-                    return;
-                }
-
-                // Clear all reconnect timeouts if any are running.
-                ipcRenderer.send("clearReconnect", "All");
-
-                connectionService.isConnectingAll = true;
-
-                soundService.resetPopCounter();
-
-                for (let i = 0; i < services.length; i++) {
-                    const s = services[i];
-                    switch (s) {
-                        case "chat":
-                            if (shouldConnect) {
-                                const didConnect = await service.setConnectionToChat(true);
-                                if (didConnect) {
-                                    soundService.popSound();
-                                    await delay(100);
-                                }
-                            } else if (connectionService.connectedToChat) {
-                                await service.setConnectionToChat(false);
-                            }
-                            break;
-                        default:
-                            if (s.startsWith("integration.")) {
-                                const intId = s.replace("integration.", "");
-                                logger.info(`Connecting to ${intId}`);
-                                if (integrationService.integrationIsLinked(intId)) {
-                                    if (shouldConnect) {
-                                        const didConnect = await integrationService.setConnectionForIntegration(intId, true);
-                                        if (didConnect) {
-                                            soundService.popSound();
-                                        }
-                                    } else if (integrationService.integrationIsConnected(intId)) {
-                                        await integrationService.setConnectionForIntegration(intId, false);
-                                    }
-                                }
-                            }
-                    }
-                }
-                connectionService.isConnectingAll = false;
-
-                const soundType = service.connectedServiceCount() > 0 ? "Online" : "Offline";
-                soundService.connectSound(soundType);
-            };
+            backendCommunicator.on("overlayStatusUpdate", (overlayStatusData) => {
+                overlayStatus = overlayStatusData;
+            });
 
             service.getConnectionStatusForService = function(service) {
                 let connectionStatus = null;
diff --git a/src/gui/app/services/effect-helper.service.js b/src/gui/app/services/effect-helper.service.js
index bbdad0d3a..9c7f8664c 100644
--- a/src/gui/app/services/effect-helper.service.js
+++ b/src/gui/app/services/effect-helper.service.js
@@ -4,10 +4,7 @@
 
     angular
         .module("firebotApp")
-        .factory("effectHelperService", function(
-            listenerService,
-            backendCommunicator
-        ) {
+        .factory("effectHelperService", function(backendCommunicator) {
             const service = {};
 
             service.getEffectDefinition = function(id) {
@@ -15,10 +12,7 @@
                     return null;
                 }
 
-                const effectDef = listenerService.fireEventSync(
-                    "getEffectDefinition",
-                    id
-                );
+                const effectDef = backendCommunicator.fireEventSync("getEffectDefinition", id);
 
                 if (effectDef == null) {
                     return null;
diff --git a/src/gui/app/services/integration.service.js b/src/gui/app/services/integration.service.js
index a8c241631..33f21d6c0 100644
--- a/src/gui/app/services/integration.service.js
+++ b/src/gui/app/services/integration.service.js
@@ -27,9 +27,7 @@
             }
 
             service.updateIntegrations = function() {
-                integrations = listenerService.fireEventSync(
-                    "getAllIntegrationDefinitions"
-                );
+                integrations = backendCommunicator.fireEventSync("getAllIntegrationDefinitions");
             };
 
             service.getIntegrations = function() {
@@ -51,7 +49,7 @@
                 }
 
                 addIntegrationToWaitingConnection(id);
-                listenerService.fireEvent("connectIntegration", id);
+                backendCommunicator.send("connectIntegration", id);
             };
 
             service.disconnectIntegration = function(id) {
@@ -61,7 +59,7 @@
                 }
 
                 addIntegrationToWaitingConnection(id);
-                listenerService.fireEvent("disconnectIntegration", id);
+                backendCommunicator.send("disconnectIntegration", id);
             };
 
             service.toggleConnectionForIntegration = function(id) {
@@ -129,11 +127,11 @@
             };
 
             service.linkIntegration = function(id) {
-                listenerService.fireEvent("linkIntegration", id);
+                backendCommunicator.send("linkIntegration", id);
             };
 
             service.unlinkIntegration = function(id) {
-                listenerService.fireEvent("unlinkIntegration", id);
+                backendCommunicator.send("unlinkIntegration", id);
             };
 
             service.toggleLinkforIntegration = function(id) {
diff --git a/src/gui/app/services/listener.service.js b/src/gui/app/services/listener.service.js
index 7bde6d71e..ff53e6d5f 100644
--- a/src/gui/app/services/listener.service.js
+++ b/src/gui/app/services/listener.service.js
@@ -9,71 +9,20 @@
 
         const registeredListeners = {
             filePath: {},
-            connectionStatus: {},
-            connectionChangeRequest: {},
-            chatConnectionStatus: {},
-            chatConnectionChangeRequest: {},
-            overlayStatusUpdate: {},
-            toggleServicesRequest: {},
-            chatMessage: {},
-            chatUpdate: {},
-            error: {},
             updateError: {},
             updateDownloaded: {},
             installingUpdate: {},
-            showEvents: {},
-            playSound: {},
-            showImage: {},
-            showVideo: {},
-            showHtml: {},
-            showText: {},
-            celebrate: {},
-            info: {},
-            currentViewersUpdate: {},
             integrationConnectionUpdate: {},
-            integrationsUpdated: {},
-            clearEffects: {},
-            nonChatSkill: {},
-            gifUrlForSkill: {},
-            channelPatronageUpdate: {},
-            periodPatronageUpdate: {}
+            integrationsUpdated: {}
         };
 
         const ListenerType = {
-            IMAGE_FILE: "imageFile",
-            SOUND_FILE: "soundFile",
-            VIDEO_FILE: "videoFile",
             ANY_FILE: "anyFile",
-            IMPORT_FOLDER: "importFolder",
-            CONNECTION_STATUS: "connectionStatus",
-            CONNECTION_CHANGE_REQUEST: "connectionChangeRequest",
-            CHAT_CONNECTION_STATUS: "chatConnectionStatus",
-            CHAT_CONNECTION_CHANGE_REQUEST: "chatConnectionChangeRequest",
-            OVERLAY_CONNECTION_STATUS: "overlayStatusUpdate",
-            TOGGLE_SERVICES_REQUEST: "toggleServicesRequest",
-            CHAT_MESSAGE: "chatMessage",
-            CHAT_UPDATE: "chatUpdate",
-            CURRENT_VIEWERS_UPDATE: "currentViewersUpdate",
-            ERROR: "error",
             UPDATE_ERROR: "updateError",
             UPDATE_DOWNLOADED: "updateDownloaded",
             INSTALLING_UPDATE: "installingUpdate",
-            API_BUTTON: "apiButton",
-            SHOW_EVENTS: "showEvents",
-            PLAY_SOUND: "playSound",
-            SHOW_IMAGE: "showImage",
-            SHOW_VIDEO: "showVideo",
-            SHOW_TEXT: "showText",
-            SHOW_HTML: "showHtml",
-            CELEBRATE: "celebrate",
-            INFO: "info",
             INTEGRATION_CONNECTION_UPDATE: "integrationConnectionUpdate",
-            INTEGRATIONS_UPDATED: "integrationsUpdated",
-            CLEAR_EFFECTS: "clearEffects",
-            NON_CHAT_SKILL: "nonChatSkill",
-            GIF_FOR_SKILL: "gifUrlForSkill",
-            CHANNEL_PATRONAGE_UPDATE: "channelPatronageUpdate",
-            PERIOD_PATRONAGE_UPDATE: "periodPatronageUpdate"
+            INTEGRATIONS_UPDATED: "integrationsUpdated"
         };
 
         function runListener(listener, returnPayload) {
@@ -125,22 +74,10 @@
             const publishEvent = request.publishEvent === true;
 
             switch (listener.type) {
-                case ListenerType.VIDEO_FILE:
-                case ListenerType.IMAGE_FILE:
-                case ListenerType.SOUND_FILE:
-                case ListenerType.IMPORT_FOLDER:
                 case ListenerType.ANY_FILE:
                     registeredListeners.filePath[uuid] = listener;
                     if (publishEvent) {
-                        if (listener.type === ListenerType.IMAGE_FILE) {
-                            ipcRenderer.send("getImagePath", uuid);
-                        } else if (listener.type === ListenerType.SOUND_FILE) {
-                            ipcRenderer.send("getSoundPath", uuid);
-                        } else if (listener.type === ListenerType.VIDEO_FILE) {
-                            ipcRenderer.send("getVideoPath", uuid);
-                        } else if (listener.type === ListenerType.IMPORT_FOLDER) {
-                            ipcRenderer.send("getImportFolderPath", uuid);
-                        } else if (listener.type === ListenerType.ANY_FILE) {
+                        if (listener.type === ListenerType.ANY_FILE) {
                             ipcRenderer.send("getAnyFilePath", request.data);
                         }
                     }
@@ -154,10 +91,6 @@
 
         service.unregisterListener = function(type, uuid) {
             switch (type) {
-                case ListenerType.VIDEO_FILE:
-                case ListenerType.IMAGE_FILE:
-                case ListenerType.SOUND_FILE:
-                case ListenerType.IMPORT_FOLDER:
                 case ListenerType.ANY_FILE:
                     delete registeredListeners.filePath[uuid];
                     break;
@@ -170,135 +103,17 @@
     * Events
     */
         const EventType = {
-            DOWNLOAD_UPDATE: "downloadUpdate",
-            INSTALL_UPDATE: "installUpdate",
-            OPEN_ROOT: "openRootFolder",
-            GET_IMAGE: "getImagePath",
-            GET_SOUND: "getSoundPath",
-            GET_VIDEO: "getVideoPath",
-            GET_ANYFILE: "getAnyFilePath",
-            SPARK_EXEMPT_UPDATED: "sparkExemptUpdated",
-            RESTART_APP: "restartApp",
-            DELETE_CHAT_MESSAGE: "deleteChatMessage",
-            CHANGE_USER_MOD_STATUS: "changeUserModStatus",
-            COMMAND_MANUAL_TRIGGER: "command-manual-trigger"
+            GET_ANYFILE: "getAnyFilePath"
         };
         service.EventType = EventType;
 
-        service.fireEvent = function(type, data) {
-            ipcRenderer.send(type, data);
-        };
-
-        service.fireEventSync = function(type, data) {
-            return ipcRenderer.sendSync(type, data);
-        };
-
         /**
      * File path event listeners
      */
-        ipcRenderer.on("gotSoundFilePath", function(event, data) {
-            parseFilePathEvent(data);
-        });
-
-        ipcRenderer.on("gotImageFilePath", function(event, data) {
-            parseFilePathEvent(data);
-        });
-
-        ipcRenderer.on("gotVideoFilePath", function(event, data) {
-            parseFilePathEvent(data);
-        });
-
-        ipcRenderer.on("gotImportFolderPath", function(event, data) {
-            parseFilePathEvent(data);
-        });
-
-        ipcRenderer.on("gotBackupZipPath", function(event, data) {
-            parseFilePathEvent(data);
-        });
-
         ipcRenderer.on("gotAnyFilePath", function(event, data) {
             parseFilePathEvent(data);
         });
 
-        /**
-     * Connection event listeners
-     */
-
-        // Chat Connection Monitor
-        // Recieves event from main process that connection has been established or disconnected.
-        ipcRenderer.on("chatConnection", function(event, data) {
-            const isChatConnected = data ? data.toLowerCase() === "online" : false;
-            _.forEach(registeredListeners.chatConnectionStatus, (listener) => {
-                runListener(listener, isChatConnected);
-            });
-        });
-
-        // Overlay Connection Monitor
-        // Recieves event from main process that connection has been established or disconnected.
-        ipcRenderer.on("overlayStatusUpdate", function(event, data) {
-            _.forEach(registeredListeners.overlayStatusUpdate, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
-        // Toggle Services Request Monitor
-        ipcRenderer.on("toggleServicesRequest", function(event, data) {
-            const services = data ? data : [];
-            _.forEach(registeredListeners.toggleServicesRequest, (listener) => {
-                runListener(listener, services);
-            });
-        });
-
-        // Chat Connect Request
-        // Recieves an event from the main process when the global hotkey is hit for connecting.
-        ipcRenderer.on("getChatRefreshToken", function() {
-            _.forEach(registeredListeners.chatConnectionChangeRequest, (listener) => {
-                runListener(listener, null);
-            });
-        });
-
-        // Chat Message
-        // Recieves an event from main process when a chat message is processed.
-        ipcRenderer.on("chatMessage", function(event, data) {
-            _.forEach(registeredListeners.chatMessage, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
-        // Chat Update
-        // Recieves an event from main process when a chat event happens.
-        ipcRenderer.on("chatUpdate", function(event, data) {
-            _.forEach(registeredListeners.chatUpdate, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
-        // current viewers
-        // Recieves an event from main process when a current viewer count has changed
-        ipcRenderer.on("currentViewersUpdate", function(event, data) {
-            _.forEach(registeredListeners.currentViewersUpdate, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
-        /**
-     * Error event listener
-     */
-        ipcRenderer.on("error", function(event, errorMessage) {
-            _.forEach(registeredListeners.error, (listener) => {
-                runListener(listener, errorMessage);
-            });
-        });
-
-        /**
-     * Info event listener
-     */
-        ipcRenderer.on("info", function(event, infoMessage) {
-            _.forEach(registeredListeners.info, (listener) => {
-                runListener(listener, infoMessage);
-            });
-        });
-
         /**
      * Update error listener
      */
@@ -324,69 +139,6 @@
             });
         });
 
-        /**
-     * Show img event listener
-     */
-        ipcRenderer.on("showimage", function(event, data) {
-            _.forEach(registeredListeners.showImage, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
-        /**
-     * Show video event listener
-     */
-        ipcRenderer.on("showvideo", function(event, data) {
-            _.forEach(registeredListeners.showVideo, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
-        /**
-     * Show html event listener
-     */
-        ipcRenderer.on("showhtml", function(event, data) {
-            _.forEach(registeredListeners.showHtml, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
-        /**
-     * Show text event listener
-     */
-        ipcRenderer.on("showtext", function(event, data) {
-            _.forEach(registeredListeners.showText, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
-        /**
-     * Show Events listener
-     */
-        ipcRenderer.on("showEvents", function(event, data) {
-            _.forEach(registeredListeners.showEvents, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
-        /**
-     * Play sound event listener
-     */
-        ipcRenderer.on("playsound", function(event, data) {
-            _.forEach(registeredListeners.playSound, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
-        /**
-     *  Show Celebration animation
-     */
-        ipcRenderer.on("celebrate", function(event, data) {
-            _.forEach(registeredListeners.celebrate, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
         /**
      * integration conn update listener
      */
@@ -405,21 +157,6 @@
             });
         });
 
-        /**
-        * Clear effect listener
-        */
-        ipcRenderer.on('clearEffects', function (event, data) {
-            _.forEach(registeredListeners.clearEffects, (listener) => {
-                runListener(listener, data);
-            });
-        });
-
-
-
-        /**
-     *  Helpers
-     */
-
         return service;
     });
-}());
+}());
\ No newline at end of file
diff --git a/src/gui/app/services/sound.service.js b/src/gui/app/services/sound.service.js
index 675fcd30e..b53bafd39 100644
--- a/src/gui/app/services/sound.service.js
+++ b/src/gui/app/services/sound.service.js
@@ -5,7 +5,7 @@
 
     angular
         .module("firebotApp")
-        .factory("soundService", function(logger, settingsService, listenerService, $q, backendCommunicator) {
+        .factory("soundService", function(logger, settingsService, $q, backendCommunicator) {
             const service = {};
             /** @type {HTMLAudioElement[]} */
             const sounds = [];
@@ -175,24 +175,21 @@
             });
 
             // Watches for an event from main process
-            listenerService.registerListener(
-                { type: listenerService.ListenerType.PLAY_SOUND },
-                (data) => {
-                    const volume = data.volume / 100 * 10;
-
-                    let selectedOutputDevice = data.audioOutputDevice;
-                    if (
-                        selectedOutputDevice == null ||
-                        selectedOutputDevice.label === "App Default"
-                    ) {
-                        selectedOutputDevice = settingsService.getSetting("AudioOutputDevice");
-                    }
+            backendCommunicator.on("playsound", (data) => {
+                const volume = data.volume / 100 * 10;
+
+                let selectedOutputDevice = data.audioOutputDevice;
+                if (
+                    selectedOutputDevice == null ||
+                    selectedOutputDevice.label === "App Default"
+                ) {
+                    selectedOutputDevice = settingsService.getSetting("AudioOutputDevice");
+                }
 
-                    if (selectedOutputDevice.deviceId !== 'overlay') {
-                        service.playSound(data.isUrl ? data.url : data.filepath, volume, selectedOutputDevice, data.format, data.maxSoundLength);
-                    }
+                if (selectedOutputDevice.deviceId !== 'overlay') {
+                    service.playSound(data.isUrl ? data.url : data.filepath, volume, selectedOutputDevice, data.format, data.maxSoundLength);
                 }
-            );
+            });
 
             service.stopAllSounds = function() {
                 logger.info("Stopping all sounds...");
diff --git a/src/gui/app/services/updates.service.js b/src/gui/app/services/updates.service.js
index 31dbcfec3..e9b893d4e 100644
--- a/src/gui/app/services/updates.service.js
+++ b/src/gui/app/services/updates.service.js
@@ -11,7 +11,7 @@
 
     angular
         .module('firebotApp')
-        .factory('updatesService', function (logger, $q, $http, $sce, settingsService, utilityService, listenerService) {
+        .factory('updatesService', function (logger, $q, $http, $sce, settingsService, utilityService, backendCommunicator) {
             // factory/service object
             const service = {};
 
@@ -122,7 +122,7 @@
                                 // Check if we should auto update based on the users setting
                                 if (shouldAutoUpdate(autoUpdateLevel, latestUpdateType)) {
                                     utilityService.showDownloadModal();
-                                    listenerService.fireEvent(listenerService.EventType.DOWNLOAD_UPDATE);
+                                    backendCommunicator.send("downloadUpdate");
                                 }
                             }
 
@@ -154,14 +154,14 @@
             service.downloadUpdate = function() {
                 if (service.updateIsAvailable()) {
                     utilityService.showDownloadModal();
-                    listenerService.fireEvent(listenerService.EventType.DOWNLOAD_UPDATE);
+                    backendCommunicator.send("downloadUpdate");
                 }
             };
 
             service.installUpdate = function() {
                 if (service.updateIsAvailable()) {
                     utilityService.showDownloadModal();
-                    listenerService.fireEvent(listenerService.EventType.INSTALL_UPDATE);
+                    backendCommunicator.send("installUpdate");
                 }
             };
 
diff --git a/src/gui/app/services/utility.service.js b/src/gui/app/services/utility.service.js
index 8380d5365..b63eb7ad6 100644
--- a/src/gui/app/services/utility.service.js
+++ b/src/gui/app/services/utility.service.js
@@ -11,7 +11,6 @@
         .factory("utilityService", function(
             $rootScope,
             $uibModal,
-            listenerService,
             logger,
             $timeout,
             backendCommunicator,
@@ -1158,24 +1157,14 @@
             };
 
             // Watches for an event from main process
-            listenerService.registerListener(
-                {
-                    type: listenerService.ListenerType.INFO
-                },
-                (infoMessage) => {
-                    service.showInfoModal(infoMessage);
-                }
-            );
+            backendCommunicator.on("info", (infoMessage) => {
+                service.showInfoModal(infoMessage);
+            });
 
             // Watches for an event from main process
-            listenerService.registerListener(
-                {
-                    type: listenerService.ListenerType.ERROR
-                },
-                (errorMessage) => {
-                    service.showErrorModal(errorMessage);
-                }
-            );
+            backendCommunicator.on("error", (errorMessage) => {
+                service.showErrorModal(errorMessage);
+            });
 
             service.capitalize = function([first, ...rest]) {
                 return first.toUpperCase() + rest.join("").toLowerCase();

From 3c0589bf71ddd92ad7dd487c4fd9c6d9c586ee07 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Tue, 24 Dec 2024 01:12:14 -0500
Subject: [PATCH 45/54] chore: refactor FontManager

---
 .../electron/events/when-ready.js             |   5 +-
 src/backend/font-manager.ts                   | 175 ++++++++++++++++++
 src/backend/fontManager.js                    | 100 ----------
 src/gui/app/app-main.js                       |   9 +-
 .../modals/misc/font-management-modal.js      |  83 +++++++++
 .../modals/misc/fontManagementModal.js        | 114 ------------
 src/gui/app/index.html                        |   2 +-
 src/gui/app/services/font-manager.service.js  |  36 +++-
 8 files changed, 299 insertions(+), 225 deletions(-)
 create mode 100644 src/backend/font-manager.ts
 delete mode 100644 src/backend/fontManager.js
 create mode 100644 src/gui/app/directives/modals/misc/font-management-modal.js
 delete mode 100644 src/gui/app/directives/modals/misc/fontManagementModal.js

diff --git a/src/backend/app-management/electron/events/when-ready.js b/src/backend/app-management/electron/events/when-ready.js
index fa19e4598..e471c8dab 100644
--- a/src/backend/app-management/electron/events/when-ready.js
+++ b/src/backend/app-management/electron/events/when-ready.js
@@ -118,8 +118,9 @@ exports.whenReady = async () => {
     const { loadRestrictions } = require("../../../restrictions/builtin-restrictions-loader");
     loadRestrictions();
 
-    const fontManager = require("../../../fontManager");
-    fontManager.generateAppFontCssFile();
+    windowManagement.updateSplashScreenStatus("Loading fonts...");
+    const { FontManager } = require("../../../font-manager");
+    await FontManager.loadInstalledFonts();
 
     windowManagement.updateSplashScreenStatus("Loading events...");
     const eventsAccess = require("../../../events/events-access");
diff --git a/src/backend/font-manager.ts b/src/backend/font-manager.ts
new file mode 100644
index 000000000..220076f93
--- /dev/null
+++ b/src/backend/font-manager.ts
@@ -0,0 +1,175 @@
+import fsp from "fs/promises";
+import path from "path";
+import logger from "./logwrapper";
+import frontendCommunicator from "./common/frontend-communicator";
+import profileManager from "./common/profile-manager";
+
+export enum FontFormat {
+    TrueType = "truetype",
+    OpenType = "opentype",
+    WOFF = "woff",
+    WOFF2 = "woff2"
+}
+
+export type FirebotFont = {
+    filename: string;
+    path: string;
+    name: string;
+    format: FontFormat
+}
+
+class FontManager {
+    cachedFonts: FirebotFont[] = [];
+
+    constructor() {
+        frontendCommunicator.on("fonts:get-font-folder-path", () => {
+            return this.fontsFolder;
+        });
+
+        frontendCommunicator.on("fonts:get-generated-css-path", () => {
+            return this.fontCssPath;
+        });
+
+        frontendCommunicator.on("fonts:get-installed-fonts", () => {
+            return this.cachedFonts;
+        });
+
+        frontendCommunicator.on("fonts:get-font", (name: string) => {
+            return this.getFont(name);
+        });
+
+        frontendCommunicator.onAsync("fonts:install-font", async (filepath: string) => {
+            return await this.installFont(filepath);
+        });
+
+        frontendCommunicator.onAsync("fonts:remove-font", async (name: string) => {
+            await this.removeFont(name);
+        });
+    }
+
+    private stripFontFileType(f: string): string {
+        return f.replace(/\.ttf/i, "")
+            .replace(/\.woff/i, "")
+            .replace(/\.woff2/i, "")
+            .replace(/\.otf/i, "");
+    }
+
+    private getFontFormatFromFilename(f: string): FontFormat {
+        const normalized = f.toLowerCase();
+        if (normalized.endsWith(".ttf")) {
+            return FontFormat.TrueType;
+        }
+        if (normalized.endsWith(".woff")) {
+            return FontFormat.WOFF;
+        }
+        if (normalized.endsWith(".woff2")) {
+            return FontFormat.WOFF2;
+        }
+        if (normalized.endsWith(".otf")) {
+            return FontFormat.OpenType;
+        }
+    }
+
+    get fontsFolder() {
+        return profileManager.getPathInProfile("/fonts");
+    }
+
+    get fontCssPath() {
+        return path.join(this.fontsFolder, "fonts.css");
+    }
+
+    async loadInstalledFonts(): Promise<void> {
+        const fonts = (await fsp.readdir(this.fontsFolder))
+            .filter((f) => {
+                const normalized = f.toLowerCase();
+                return normalized.endsWith(".ttf")
+                    || normalized.endsWith(".woff")
+                    || normalized.endsWith(".woff2")
+                    || normalized.endsWith(".otf");
+            })
+            .map((f): FirebotFont => {
+                return {
+                    filename: f,
+                    path: path.join(this.fontsFolder, f).replace(/\\/g, "/"),
+                    name: this.stripFontFileType(f),
+                    format: this.getFontFormatFromFilename(f)
+                };
+            });
+
+        this.cachedFonts = fonts;
+        await this.generateAppFontCssFile();
+    }
+
+    getFont(name: string): FirebotFont {
+        const font = this.cachedFonts.find(f => f.name === name);
+        return font;
+    }
+
+    async installFont(filepath: string): Promise<boolean> {
+        try {
+            const filename = path.parse(filepath).base;
+            const destination = path.join(this.fontsFolder, filename);
+
+            await fsp.cp(filepath, destination);
+            this.cachedFonts.push({
+                filename: filename,
+                path: destination.replace(/\\/g, "/"),
+                name: this.stripFontFileType(filename),
+                format: this.getFontFormatFromFilename(filename)
+            });
+            logger.info(`Font ${filename} installed`);
+
+            await this.generateAppFontCssFile();
+
+            return true;
+        } catch (error) {
+            logger.error(`Error installing font from ${path}`, error);
+            return false;
+        }
+    }
+
+    async removeFont(name: string): Promise<void> {
+        const font = this.cachedFonts.find(f => f.name === name);
+
+        if (font != null) {
+            try {
+                await fsp.unlink(font.path);
+                this.cachedFonts.splice(this.cachedFonts.indexOf(font), 1);
+                logger.info(`Font ${name} removed`);
+
+                await this.generateAppFontCssFile();
+            } catch (error) {
+                logger.error(`Error removing font ${name}`, error);
+            }
+        }
+    }
+
+    async generateAppFontCssFile(): Promise<void> {
+        try {
+            let cssFileRaw = "";
+
+            this.cachedFonts.forEach((font) => {
+                const fontPath = `file:///${font.path}`;
+
+                cssFileRaw +=
+                    `@font-face {
+                        font-family: '${font.name}';
+                        src: url('${fontPath}') format('${font.format}')
+                    }
+                    `;
+            });
+
+            await fsp.writeFile(this.fontCssPath, cssFileRaw, { encoding: "utf8" });
+
+            frontendCommunicator.send("fonts:reload-font-css");
+
+            logger.info("Font CSS file generated");
+        } catch (error) {
+            logger.error("Error generated font CSS file", error);
+        }
+    }
+}
+
+const fontManager = new FontManager();
+
+export { fontManager as FontManager };
\ No newline at end of file
diff --git a/src/backend/fontManager.js b/src/backend/fontManager.js
deleted file mode 100644
index 58bc1d8e1..000000000
--- a/src/backend/fontManager.js
+++ /dev/null
@@ -1,100 +0,0 @@
-"use strict";
-
-const profileManager = require("./common/profile-manager");
-const fs = require("fs");
-const path = require("path");
-const logger = require("./logwrapper");
-
-function stripFontFileType(f) {
-    return f.replace(/\.ttf/i, "")
-        .replace(/\.woff/i, "")
-        .replace(/\.woff2/i, "")
-        .replace(/\.otf/i, "");
-}
-
-function getFontFormatFromFilename(f) {
-    const normalized = f.toLowerCase();
-    if (normalized.endsWith(".ttf")) {
-        return "truetype";
-    }
-    if (normalized.endsWith(".woff")) {
-        return "woff";
-    }
-    if (normalized.endsWith(".woff2")) {
-        return "woff2";
-    }
-    if (normalized.endsWith(".otf")) {
-        return "opentype";
-    }
-}
-
-function getInstalledFonts() {
-    const fontFolder = profileManager.getPathInProfile("/fonts");
-
-    const fonts = fs.readdirSync(fontFolder)
-        .filter(f => {
-            const normalized = f.toLowerCase();
-            return normalized.endsWith(".ttf")
-                || normalized.endsWith(".woff")
-                || normalized.endsWith(".woff2")
-                || normalized.endsWith(".otf");
-        })
-        .map(f => {
-            return {
-                filename: f,
-                path: path.join(fontFolder, path.sep, f).replace(/\\/g, "/"),
-                name: stripFontFileType(f),
-                format: getFontFormatFromFilename(f)
-            };
-        });
-
-    return fonts;
-}
-
-function removeFont(name) {
-    return new Promise((resolve, reject) => {
-        const font = getInstalledFonts().find(f => f.name === name);
-        if (font != null) {
-            fs.unlink(font.path, (err) => {
-                if (err) {
-                    logger.error(err);
-                    reject(err);
-                } else {
-                    resolve();
-                }
-            });
-        }
-    });
-
-}
-
-function generateAppFontCssFile() {
-    const fontFolder = profileManager.getPathInProfile("/fonts");
-
-    let cssFileRaw = "";
-
-    const fonts = getInstalledFonts();
-    fonts.forEach(font => {
-        const fontPath = `file:///${font.path}`;
-
-        cssFileRaw +=
-            `@font-face {
-                font-family: '${font.name}';
-                src: url('${fontPath}') format('${font.format}')
-            }
-            `;
-    });
-
-    const fontCssPath = path.join(fontFolder, path.sep, "fonts.css");
-    fs.writeFileSync(fontCssPath, cssFileRaw, { encoding: "utf8" });
-}
-
-exports.generateAppFontCssFile = generateAppFontCssFile;
-exports.getInstalledFonts = getInstalledFonts;
-exports.removeFont = removeFont;
-exports.getFont = (name) => {
-    const font = getInstalledFonts().find(f => f.name === name);
-    return font;
-};
-
-exports.FONTS_FOLDER = profileManager.getPathInProfile("/fonts");
\ No newline at end of file
diff --git a/src/gui/app/app-main.js b/src/gui/app/app-main.js
index a65c74283..e373b2f1e 100644
--- a/src/gui/app/app-main.js
+++ b/src/gui/app/app-main.js
@@ -203,7 +203,7 @@
     });
 
     app.controller("MainController", function($scope, $rootScope, $timeout, connectionService, utilityService,
-        settingsService, backupService, sidebarManager, logger, backendCommunicator) {
+        settingsService, backupService, sidebarManager, logger, backendCommunicator, fontManager) {
         $rootScope.showSpinner = true;
 
         $scope.fontAwesome5KitUrl = `https://kit.fontawesome.com/${secrets.fontAwesome5KitId}.js`;
@@ -406,7 +406,12 @@
         const appVersion = firebotAppDetails.version;
         $scope.appTitle = `Firebot v${appVersion}`;
 
-        $scope.customFontCssPath = profileManager.getPathInProfile("/fonts/fonts.css");
+        const url = require("url");
+        $scope.customFontCssPath = url.pathToFileURL(fontManager.getFontCssPath());
+
+        backendCommunicator.on("fonts:reload-font-css", () => {
+            $scope.customFontCssPath = `${url.pathToFileURL(fontManager.getFontCssPath())}?reload=${new Date().getTime()}`;
+        });
 
         //make sure sliders render properly
         $timeout(function() {
diff --git a/src/gui/app/directives/modals/misc/font-management-modal.js b/src/gui/app/directives/modals/misc/font-management-modal.js
new file mode 100644
index 000000000..fdfb57389
--- /dev/null
+++ b/src/gui/app/directives/modals/misc/font-management-modal.js
@@ -0,0 +1,83 @@
+'use strict';
+
+(function() {
+    angular
+        .module('firebotApp')
+        .component("fontManagementModal", {
+            template: `
+            <div class="modal-header flex-row-center jspacebetween">
+                <h4 class="modal-title" style="display:inline;">Manage Fonts</h4>
+            </div>
+            <div class="modal-body">
+                <div class="list-group" style="margin-bottom: 0;">
+                    <span class="muted" ng-show="$ctrl.fonts.length === 0">No custom fonts installed.</span>
+                    <div class="list-group-item flex-row-center jspacebetween" ng-repeat="font in $ctrl.fonts track by $index">
+                        <div>
+                            <h4 class="list-group-item-heading">{{font.name}}</h4>
+                            <p class="list-group-item-text muted">Format: {{font.format}}</p>
+                        </div>
+                        <div style="font-size:17px">
+                            <span uib-tooltip="Remove Font" tooltip-append-to-body="true" class="clickable" style="color:red;" ng-click="$ctrl.removeFont(font.name)">
+                                <i class="fas fa-trash-alt"></i>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+                <div style="color: #fb7373;" ng-if="$ctrl.installError">{{$ctrl.installError}}</div>
+                <div style="color: green;text-align: center;padding-top: 5px;" ng-if="$ctrl.installSuccessful">Font successfully installed! Please <strong>refresh the overlay</strong> to put changes into effect.</div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default pull-left" ng-click="$ctrl.openFileExplorer()">Install Font</button>
+                <button class="btn btn-primary" ng-click="$ctrl.dismiss()">Close</button>
+            </div>
+            `,
+            bindings: {
+                resolve: '<',
+                close: '&',
+                dismiss: '&'
+            },
+            controller: function(backendCommunicator, fontManager) {
+                const $ctrl = this;
+
+                $ctrl.installError = null;
+                $ctrl.installSuccessful = false;
+
+                $ctrl.fonts = fontManager.getInstalledFonts();
+
+                $ctrl.removeFont = async (name) => {
+                    try {
+                        await fontManager.removeFont(name);
+                        $ctrl.fonts = fontManager.getInstalledFonts();
+                    } catch (error) {
+                        $ctrl.installError = `There was an error removing the font: ${error.message}`;
+                    }
+                };
+
+                $ctrl.openFileExplorer = async () => {
+                    $ctrl.installError = null;
+                    $ctrl.installSuccessful = null;
+                    const response = await backendCommunicator.fireEventAsync("open-file-browser", {
+                        options: {
+                            title: 'Select Font File',
+                            filters: [
+                                {
+                                    name: 'Font', extensions: ['ttf', 'woff', 'woff2', 'otf']
+                                }
+                            ]
+                        }
+                    });
+
+                    if (response?.path?.length) {
+                        const success = await fontManager.installFont(response.path);
+
+                        if (success) {
+                            $ctrl.fonts = fontManager.getInstalledFonts();
+                            $ctrl.installSuccessful = true;
+                        } else {
+                            $ctrl.installError = "There was an error installing the font. Check the log for more details.";
+                        }
+                    }
+                };
+            }
+        });
+}());
\ No newline at end of file
diff --git a/src/gui/app/directives/modals/misc/fontManagementModal.js b/src/gui/app/directives/modals/misc/fontManagementModal.js
deleted file mode 100644
index 96624ea89..000000000
--- a/src/gui/app/directives/modals/misc/fontManagementModal.js
+++ /dev/null
@@ -1,114 +0,0 @@
-'use strict';
-
-(function() {
-    angular
-        .module('firebotApp')
-        .component("fontManagementModal", {
-            template: `
-            <div class="modal-header flex-row-center jspacebetween">
-                <h4 class="modal-title" style="display:inline;">Manage Fonts</h4>
-            </div>
-            <div class="modal-body">
-                <div class="list-group" style="margin-bottom: 0;">
-                    <span class="muted" ng-show="$ctrl.fonts.length === 0">No custom fonts installed.</span>
-                    <div class="list-group-item flex-row-center jspacebetween" ng-repeat="font in $ctrl.fonts track by $index">
-                        <div>
-                            <h4 class="list-group-item-heading">{{font.name}}</h4>
-                            <p class="list-group-item-text muted">Format: {{font.format}}</p>
-                        </div>
-                        <div style="font-size:17px">
-                            <span uib-tooltip="Remove Font" tooltip-append-to-body="true" class="clickable" style="color:red;" ng-click="$ctrl.removeFont(font.name)">
-                                <i class="fas fa-trash-alt"></i>
-                            </span>    
-                        </div>
-                    </div>
-                </div>
-                <div style="color: #fb7373;" ng-if="$ctrl.installError">{{$ctrl.installError}}</div>
-                <div style="color: green;text-align: center;padding-top: 5px;" ng-if="$ctrl.installSuccessful">Font successfully installed! Please <strong>restart Firebot</strong> and <strong>refresh the overlay</strong> to put changes into effect.</div>
-            </div>
-            <div class="modal-footer">
-                <button class="btn btn-default pull-left" ng-click="$ctrl.openFileExplorer()">Install Font</button>
-                <button class="btn btn-primary" ng-click="$ctrl.dismiss()">Close</button>
-            </div>
-            `,
-            bindings: {
-                resolve: '<',
-                close: '&',
-                dismiss: '&'
-            },
-            controller: function($scope, listenerService, logger, fontManager) {
-                const fsExtra = require('fs-extra');
-                const path = require("path");
-
-                const $ctrl = this;
-
-                $ctrl.installError = null;
-                $ctrl.installSuccessful = false;
-
-                $ctrl.fonts = fontManager.getInstalledFonts();
-
-                $ctrl.removeFont = function(name) {
-                    fontManager.removeFont(name)
-                        .then(() => {
-                            $ctrl.fonts = fontManager.getInstalledFonts();
-                        })
-                        .catch((err) => {
-                            $ctrl.installError = `There was an error removing the font: ${err.message}`;
-                        });
-                };
-
-                let fileListenerId = null;
-
-                $scope.$on('modal.closing', function() {
-                    if (fileListenerId) {
-                        listenerService.unregisterListener(listenerService.ListenerType.ANY_FILE, fileListenerId);
-                    }
-                });
-
-                $ctrl.openFileExplorer = function() {
-                    $ctrl.installError = null;
-                    $ctrl.installSuccessful = null;
-                    const registerRequest = {
-                        type: listenerService.ListenerType.ANY_FILE,
-                        runOnce: true,
-                        publishEvent: true,
-                        data: {
-                            options: {
-                                title: 'Select Font File',
-                                filters: [
-                                    {
-                                        name: 'Font', extensions: ['ttf', 'woff', 'woff2', 'otf']
-                                    }
-                                ]
-                            }
-                        }
-                    };
-                    fileListenerId = listenerService.registerListener(registerRequest, (filepath) => {
-                        fileListenerId = null;
-                        if (filepath == null || filepath.length === 0) {
-                            return;
-                        }
-                        const filename = path.parse(filepath).base;
-                        const destination = path.join(fontManager.FONTS_FOLDER, path.sep, filename);
-
-                        fsExtra.copy(filepath, destination)
-                            .then(() => {
-                                $ctrl.fonts = fontManager.getInstalledFonts();
-                                $ctrl.installSuccessful = true;
-                            })
-                            .catch((err) => {
-                                logger.error(err);
-                                $ctrl.installError = `There was an error installing the font: ${err.message}`;
-                            });
-
-                    });
-                };
-
-                $ctrl.$onInit = function () {
-                    // When the component is initialized
-                    // This is where you can start to access bindings, such as variables stored in 'resolve'
-                    // IE $ctrl.resolve.shouldDelete or whatever
-                };
-            }
-        });
-}());
diff --git a/src/gui/app/index.html b/src/gui/app/index.html
index dedd5c39c..9fb0c7491 100644
--- a/src/gui/app/index.html
+++ b/src/gui/app/index.html
@@ -285,7 +285,7 @@
     <script type="text/javascript" src="./directives/modals/misc/editBannedWordsModal.js"></script>
     <script type="text/javascript" src="./directives/modals/misc/editUrlAllowlistModal.js"></script>
     <script type="text/javascript" src="./directives/modals/misc/errorDetailModal.js"></script>
-    <script type="text/javascript" src="./directives/modals/misc/fontManagementModal.js"></script>
+    <script type="text/javascript" src="./directives/modals/misc/font-management-modal.js"></script>
     <script type="text/javascript" src="./directives/modals/misc/give-currency-modal.js"></script>
     <script type="text/javascript" src="./directives/modals/misc/idEntryModal.js"></script>
     <script type="text/javascript" src="./directives/modals/misc/inputModal.js"></script>
diff --git a/src/gui/app/services/font-manager.service.js b/src/gui/app/services/font-manager.service.js
index 40d73b147..2671a853b 100644
--- a/src/gui/app/services/font-manager.service.js
+++ b/src/gui/app/services/font-manager.service.js
@@ -1,11 +1,35 @@
 "use strict";
-(function() {
-
-    const fontManager = require('../../backend/fontManager');
 
+(function() {
     angular
         .module("firebotApp")
-        .factory("fontManager", function() {
-            return fontManager;
+        .factory("fontManager", function (backendCommunicator) {
+            const service = {};
+
+            service.getFontFolderPath = () => {
+                return backendCommunicator.fireEventSync("fonts:get-font-folder-path");
+            };
+
+            service.getFontCssPath = () => {
+                return backendCommunicator.fireEventSync("fonts:get-generated-css-path");
+            };
+
+            service.getInstalledFonts = () => {
+                return backendCommunicator.fireEventSync("fonts:get-installed-fonts");
+            };
+
+            service.getFont = (name) => {
+                return backendCommunicator.fireEventSync("fonts:get-font", name);
+            };
+
+            service.installFont = async (path) => {
+                return await backendCommunicator.fireEventAsync("fonts:install-font", path);
+            };
+
+            service.removeFont = async (name) => {
+                return await backendCommunicator.fireEventAsync("fonts:remove-font", name);
+            };
+
+            return service;
         });
-}());
+}());
\ No newline at end of file

From bc592e20857e1f2e64b9167cc353a392621cf3eb Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Tue, 24 Dec 2024 01:19:11 -0500
Subject: [PATCH 46/54] fix: font API controller got lost along the way

---
 src/server/api/v1/controllers/fontsApiController.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/api/v1/controllers/fontsApiController.js b/src/server/api/v1/controllers/fontsApiController.js
index 843100f2b..836a4828e 100644
--- a/src/server/api/v1/controllers/fontsApiController.js
+++ b/src/server/api/v1/controllers/fontsApiController.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const fontManager = require('../../../../backend/fontManager');
+const fontManager = require('../../../../backend/font-manager');
 
 exports.getFontNames = function(req, res) {
-    const fonts = fontManager.getInstalledFonts().map(f => {
+    const fonts = fontManager.getInstalledFonts().map((f) => {
         return {
             name: f.name,
             format: f.format

From d626519954e896844c020941907173dbb397799e Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Tue, 24 Dec 2024 01:21:02 -0500
Subject: [PATCH 47/54] chore: move SettingsManager events into constructor

---
 src/backend/common/settings-manager.ts | 40 +++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/backend/common/settings-manager.ts b/src/backend/common/settings-manager.ts
index 4b71ff525..516643278 100644
--- a/src/backend/common/settings-manager.ts
+++ b/src/backend/common/settings-manager.ts
@@ -20,6 +20,26 @@ class SettingsManager extends EventEmitter {
         super();
 
         this.migrateUserSettingsToGlobal();
+
+        frontendCommunicator.on("settings:get-setting-path", (settingName: keyof FirebotSettingsTypes) => {
+            return this.getSettingPath(settingName);
+        });
+
+        frontendCommunicator.on("settings:get-setting", (settingName: keyof FirebotSettingsTypes) => {
+            return this.getSetting(settingName);
+        });
+
+        frontendCommunicator.on("settings:save-setting", (request: { settingName: keyof FirebotSettingsTypes, data: FirebotSettingsTypes[keyof FirebotSettingsTypes] }) => {
+            this.saveSetting(request.settingName, request.data);
+        });
+
+        frontendCommunicator.on("settings:delete-setting", (settingName: keyof FirebotSettingsTypes) => {
+            this.deleteSetting(settingName);
+        });
+
+        frontendCommunicator.on("settings:flush-settings-cache", () => {
+            this.flushSettingsCache();
+        });
     }
 
     private getSettingsFile(): JsonDB {
@@ -367,24 +387,4 @@ class SettingsManager extends EventEmitter {
 
 const settings = new SettingsManager();
 
-frontendCommunicator.on("settings:get-setting-path", (settingName: keyof FirebotSettingsTypes) => {
-    return settings.getSettingPath(settingName);
-});
-
-frontendCommunicator.on("settings:get-setting", (settingName: keyof FirebotSettingsTypes) => {
-    return settings.getSetting(settingName);
-});
-
-frontendCommunicator.on("settings:save-setting", (request: { settingName: keyof FirebotSettingsTypes, data: FirebotSettingsTypes[keyof FirebotSettingsTypes] }) => {
-    settings.saveSetting(request.settingName, request.data);
-});
-
-frontendCommunicator.on("settings:delete-setting", (settingName: keyof FirebotSettingsTypes) => {
-    settings.deleteSetting(settingName);
-});
-
-frontendCommunicator.on("settings:flush-settings-cache", () => {
-    settings.flushSettingsCache();
-});
-
 export { settings as SettingsManager };
\ No newline at end of file

From 3cd40d5cc13e0358c1122247e3d2f1a98ea8e256 Mon Sep 17 00:00:00 2001
From: CaveMobster <cavemobster@gmail.com>
Date: Tue, 24 Dec 2024 11:34:38 +0100
Subject: [PATCH 48/54] Add scheduled tasks to the setup importer

---
 src/backend/import/setups/setup-importer.js         | 13 +++++++++++++
 .../directives/modals/setups/create-setup-modal.js  |  9 ++++++++-
 .../directives/modals/setups/import-setup-modal.js  |  4 +++-
 .../directives/modals/setups/remove-setup-modal.js  |  5 ++++-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/backend/import/setups/setup-importer.js b/src/backend/import/setups/setup-importer.js
index a61cb4d2c..e6636f760 100644
--- a/src/backend/import/setups/setup-importer.js
+++ b/src/backend/import/setups/setup-importer.js
@@ -9,6 +9,7 @@ const countersManager = require("../../counters/counter-manager");
 const effectQueueManager = require("../../effects/queues/effect-queue-manager");
 const eventsAccess = require("../../events/events-access");
 const timerManager = require("../../timers/timer-manager");
+const scheduledTaskManager = require("../../timers/scheduled-task-manager");
 const presetEffectListManager = require("../../effects/preset-lists/preset-effect-list-manager");
 const customRolesManager = require("../../roles/custom-roles-manager");
 const quickActionManager = require("../../quick-actions/quick-action-manager");
@@ -165,6 +166,13 @@ async function importSetup(setup, selectedCurrency) {
     }
     timerManager.triggerUiRefresh();
 
+    // scheduled tasks
+    const scheduledTasks = setup.components.scheduledTasks || [];
+    for (const scheduledTask of scheduledTasks) {
+        scheduledTaskManager.saveScheduledTask(scheduledTask);
+    }
+    scheduledTaskManager.triggerUiRefresh();
+
     // variable macros
     const variableMacros = setup.components.variableMacros || [];
     for (const macro of variableMacros) {
@@ -230,6 +238,9 @@ function removeSetupComponents(components) {
                     case "timers":
                         timerManager.deleteItem(id);
                         break;
+                    case "scheduledTasks":
+                        scheduledTaskManager.deleteScheduledTask(id);
+                        break;
                     case "variableMacros":
                         variableMacroManager.deleteItem(id);
                         break;
@@ -260,6 +271,8 @@ function removeSetupComponents(components) {
                 presetEffectListManager.triggerUiRefresh();
             } else if (componentType === "timers") {
                 timerManager.triggerUiRefresh();
+            } else if (componentType === "scheduledTasks") {
+                scheduledTaskManager.triggerUiRefresh();
             } else if (componentType === "variableMacros") {
                 variableMacroManager.triggerUiRefresh();
             } else if (componentType === "viewerRoles") {
diff --git a/src/gui/app/directives/modals/setups/create-setup-modal.js b/src/gui/app/directives/modals/setups/create-setup-modal.js
index a1da7acf2..55ad9460b 100644
--- a/src/gui/app/directives/modals/setups/create-setup-modal.js
+++ b/src/gui/app/directives/modals/setups/create-setup-modal.js
@@ -83,7 +83,7 @@
             },
             controller: function(commandsService, countersService, currencyService,
                 effectQueuesService, eventsService, hotkeyService, presetEffectListsService,
-                timerService, viewerRolesService, quickActionsService, variableMacroService, viewerRanksService, accountAccess, utilityService,
+                timerService, scheduledTaskService, viewerRolesService, quickActionsService, variableMacroService, viewerRanksService, accountAccess, utilityService,
                 ngToast, backendCommunicator, sortTagsService, $q) {
 
                 const $ctrl = this;
@@ -143,6 +143,12 @@
                         nameField: "name",
                         key: "timers"
                     },
+                    {
+                        label: "Scheduled Effect Lists",
+                        all: scheduledTaskService.getScheduledTasks(),
+                        nameField: "name",
+                        key: "scheduledTasks"
+                    },
                     {
                         label: "Variable Macros",
                         all: variableMacroService.macros,
@@ -199,6 +205,7 @@
                         hotkeys: [],
                         presetEffectLists: [],
                         timers: [],
+                        scheduledTasks: [],
                         variableMacros: [],
                         viewerRoles: [],
                         viewerRankLadders: [],
diff --git a/src/gui/app/directives/modals/setups/import-setup-modal.js b/src/gui/app/directives/modals/setups/import-setup-modal.js
index b599d4b50..4d211841d 100644
--- a/src/gui/app/directives/modals/setups/import-setup-modal.js
+++ b/src/gui/app/directives/modals/setups/import-setup-modal.js
@@ -77,7 +77,7 @@
             },
             controller: function($q, logger, ngToast, commandsService, countersService, currencyService,
                 effectQueuesService, eventsService, hotkeyService, presetEffectListsService,
-                timerService, viewerRolesService, quickActionsService, variableMacroService, viewerRanksService, backendCommunicator, $sce) {
+                timerService, scheduledTaskService, viewerRolesService, quickActionsService, variableMacroService, viewerRanksService, backendCommunicator, $sce) {
                 const $ctrl = this;
 
                 $ctrl.setupFilePath = null;
@@ -98,6 +98,7 @@
                     ...hotkeyService.getHotkeys().map(i => i.id),
                     ...presetEffectListsService.getPresetEffectLists().map(i => i.id),
                     ...timerService.getTimers().map(i => i.id),
+                    ...scheduledTaskService.getScheduledTasks().map(i => i.id),
                     ...variableMacroService.macros.map(i => i.id),
                     ...viewerRolesService.getCustomRoles().map(i => i.id),
                     ...viewerRanksService.rankLadders.map(i => i.id),
@@ -118,6 +119,7 @@
                     hotkeys: "Hotkey",
                     presetEffectLists: "Preset Effect List",
                     timers: "Timer",
+                    scheduledTasks: "Scheduled Effect List",
                     variableMacros: "Variable Macro",
                     viewerRoles: "Viewer Role",
                     viewerRankLadders: "Viewer Rank Ladder",
diff --git a/src/gui/app/directives/modals/setups/remove-setup-modal.js b/src/gui/app/directives/modals/setups/remove-setup-modal.js
index d1fc0c4b3..d0a2045e3 100644
--- a/src/gui/app/directives/modals/setups/remove-setup-modal.js
+++ b/src/gui/app/directives/modals/setups/remove-setup-modal.js
@@ -57,7 +57,7 @@
             },
             controller: function($q, logger, ngToast, commandsService, countersService, currencyService,
                 effectQueuesService, eventsService, hotkeyService, presetEffectListsService,
-                timerService, viewerRolesService, quickActionsService, variableMacroService, viewerRanksService, backendCommunicator) {
+                timerService, scheduledTaskService, viewerRolesService, quickActionsService, variableMacroService, viewerRanksService, backendCommunicator) {
                 const $ctrl = this;
 
                 $ctrl.setupFilePath = null;
@@ -74,6 +74,7 @@
                     hotkeys: "Hotkey",
                     presetEffectLists: "Preset Effect List",
                     timers: "Timer",
+                    scheduledTasks: "Scheduled Effect List",
                     variableMacros: "Variable Macro",
                     viewerRoles: "Viewer Role",
                     viewerRankLadders: "Viewer Rank Ladder",
@@ -90,6 +91,7 @@
                     hotkeys: [],
                     presetEffectLists: [],
                     timers: [],
+                    scheduledTasks: [],
                     variableMacros: [],
                     viewerRoles: [],
                     viewerRankLadders: [],
@@ -109,6 +111,7 @@
                     ...hotkeyService.getHotkeys().map(i => i.id),
                     ...presetEffectListsService.getPresetEffectLists().map(i => i.id),
                     ...timerService.getTimers().map(i => i.id),
+                    ...scheduledTaskService.getScheduledTasks().map(i => i.id),
                     ...variableMacroService.macros.map(i => i.id),
                     ...viewerRolesService.getCustomRoles().map(i => i.id),
                     ...viewerRanksService.rankLadders.map(i => i.id),

From 3b55f75bf292114f2e346d442d7d4834d9f15540 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Tue, 24 Dec 2024 10:58:06 -0500
Subject: [PATCH 49/54] chore: refactor font API to TS

---
 .../api/v1/controllers/fontsApiController.js  | 29 ------------------
 .../api/v1/controllers/fontsApiController.ts  | 30 +++++++++++++++++++
 2 files changed, 30 insertions(+), 29 deletions(-)
 delete mode 100644 src/server/api/v1/controllers/fontsApiController.js
 create mode 100644 src/server/api/v1/controllers/fontsApiController.ts

diff --git a/src/server/api/v1/controllers/fontsApiController.js b/src/server/api/v1/controllers/fontsApiController.js
deleted file mode 100644
index 836a4828e..000000000
--- a/src/server/api/v1/controllers/fontsApiController.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-
-const fontManager = require('../../../../backend/font-manager');
-
-exports.getFontNames = function(req, res) {
-    const fonts = fontManager.getInstalledFonts().map((f) => {
-        return {
-            name: f.name,
-            format: f.format
-        };
-    });
-    res.json(fonts);
-};
-
-// set up font endpoint
-exports.getFont = function (req, res) {
-
-    const fontName = req.params.name || null;
-    if (fontName != null) {
-        const font = fontManager.getFont(fontName);
-        if (font) {
-            const path = font.path;
-            res.sendFile(path);
-            return;
-        }
-    }
-
-    res.status(404).send({status: "error", message: `${req.originalUrl} not found`});
-};
diff --git a/src/server/api/v1/controllers/fontsApiController.ts b/src/server/api/v1/controllers/fontsApiController.ts
new file mode 100644
index 000000000..6c4c7ad1b
--- /dev/null
+++ b/src/server/api/v1/controllers/fontsApiController.ts
@@ -0,0 +1,30 @@
+import { Request, Response } from "express";
+import { FontManager } from '../../../../backend/font-manager';
+
+export function getFontNames(req: Request, res: Response) {
+    let fonts = [];
+    if (FontManager.cachedFonts?.length) {
+        fonts = FontManager.cachedFonts.map((f) => {
+            return {
+                name: f.name,
+                format: f.format
+            };
+        });
+    }
+    res.json(fonts);
+}
+
+// set up font endpoint
+export function getFont(req: Request, res: Response) {
+    const fontName = req.params.name || null;
+    if (fontName != null) {
+        const font = FontManager.getFont(fontName);
+        if (font) {
+            const path = font.path;
+            res.sendFile(path);
+            return;
+        }
+    }
+
+    res.status(404).send({status: "error", message: `${req.originalUrl} not found`});
+}
\ No newline at end of file

From 064ac4ff2d96f13e1468607e2a29fc11551446fc Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Tue, 24 Dec 2024 12:05:12 -0500
Subject: [PATCH 50/54] feat: dynamic font reload

---
 src/backend/font-manager.ts                   |  2 +
 .../modals/misc/font-management-modal.js      |  2 +-
 src/resources/overlay/js/main.js              | 60 ++++++++++---------
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/backend/font-manager.ts b/src/backend/font-manager.ts
index 220076f93..e8de46e5d 100644
--- a/src/backend/font-manager.ts
+++ b/src/backend/font-manager.ts
@@ -3,6 +3,7 @@ import path from "path";
 import logger from "./logwrapper";
 import frontendCommunicator from "./common/frontend-communicator";
 import profileManager from "./common/profile-manager";
+import webServer from "../server/http-server-manager";
 
 export enum FontFormat {
     TrueType = "truetype",
@@ -162,6 +163,7 @@ class FontManager {
             await fsp.writeFile(this.fontCssPath, cssFileRaw, { encoding: "utf8" });
 
             frontendCommunicator.send("fonts:reload-font-css");
+            webServer.sendToOverlay("OVERLAY:RELOAD_FONTS");
 
             logger.info("Font CSS file generated");
         } catch (error) {
diff --git a/src/gui/app/directives/modals/misc/font-management-modal.js b/src/gui/app/directives/modals/misc/font-management-modal.js
index fdfb57389..b105ce95c 100644
--- a/src/gui/app/directives/modals/misc/font-management-modal.js
+++ b/src/gui/app/directives/modals/misc/font-management-modal.js
@@ -24,7 +24,7 @@
                     </div>
                 </div>
                 <div style="color: #fb7373;" ng-if="$ctrl.installError">{{$ctrl.installError}}</div>
-                <div style="color: green;text-align: center;padding-top: 5px;" ng-if="$ctrl.installSuccessful">Font successfully installed! Please <strong>refresh the overlay</strong> to put changes into effect.</div>
+                <div style="color: green;text-align: center;padding-top: 5px;" ng-if="$ctrl.installSuccessful">Font successfully installed!</div>
             </div>
             <div class="modal-footer">
                 <button class="btn btn-default pull-left" ng-click="$ctrl.openFileExplorer()">Install Font</button>
diff --git a/src/resources/overlay/js/main.js b/src/resources/overlay/js/main.js
index d97aa47b1..9d1cc3b08 100644
--- a/src/resources/overlay/js/main.js
+++ b/src/resources/overlay/js/main.js
@@ -3,10 +3,31 @@ firebotOverlay = new EventEmitter();
 let params = new URL(location).searchParams;
 
 const overlayPort = window.location.port || (window.location.protocol === 'https:' ? 443 : 80);
-const baseUrl = window.location.hostname + (overlayPort ? `:${overlayPort}` : '');
+const baseUrl = `${window.location.hostname}${(overlayPort ? `:${overlayPort}` : '')}`;
 
 startedVidCache = { test: true };
 
+function loadFonts() {
+    document.getElementById("firebot-overlay-fonts")?.remove();
+
+    fetch(`//${baseUrl}/api/v1/fonts`).then((response) => {
+        response.json().then((fonts) => {
+            const fontElement = document.createElement("style");
+            fontElement.setAttribute("type", "text/css");
+            fontElement.setAttribute("id", "firebot-overlay-fonts");
+
+            const cacheBuster = new Date().getTime();
+
+            fonts.forEach(font => {
+                let fontPath = `//${baseUrl}/api/v1/fonts/${font.name}?reload=${cacheBuster}`
+                fontElement.append(`@font-face { font-family: '${font.name}'; src: url('${fontPath}') format('${font.format}') }\n`);
+            });
+
+            document.getElementsByTagName("head")[0].prepend(fontElement);
+        });
+    });
+}
+
 // Kickstarter
 // This function kickstarts the connection process.
 function overlaySocketConnect(){
@@ -40,7 +61,7 @@ function overlaySocketConnect(){
 				return;
 			}
 			const data = message.data;
-			
+
 			const event = data.event;
 
 			const meta = data.meta;
@@ -73,6 +94,11 @@ function overlaySocketConnect(){
 				return;
 			}
 
+            if (event == "OVERLAY:RELOAD_FONTS") {
+                loadFonts();
+                return;
+            }
+
 			firebotOverlay.emit(event, data.meta);
 		};
 
@@ -103,36 +129,16 @@ function sendWebsocketEvent(name, data) {
 	}));
 }
 
-function loadFonts() {
-	$.get(`//${baseUrl}/api/v1/fonts`, (fonts) => {
-
-		let fontStyleBlock = `<style type="text/css">`;
-
-		fonts.forEach(font => {
-			let fontPath = `//${baseUrl}/api/v1/fonts/${font.name}`
-			fontStyleBlock +=
-                `@font-face {
-                    font-family: '${font.name}';
-                    src: url('${fontPath}') format('${font.format}')
-                }
-                `;
-		});
-		fontStyleBlock += "</style>";
-
-		$("head").prepend(fontStyleBlock);
-	  });
-}
-
-loadFonts();
-
 // Error Handling & Keep Alive
 function errorHandle(ws){
-  var wsState = ws.readyState;
+  const wsState = ws.readyState;
   if (wsState !== 1){
     // Connection not open.
-    console.log('Ready State is '+wsState);
+    console.log(`Ready State is ${wsState}`);
   } else {
     // Connection open, send keep alive.
     ws.send(2);
   }
-}
\ No newline at end of file
+}
+
+loadFonts();
\ No newline at end of file

From 5263111c2b508ec14788846607357f256877b8e9 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Tue, 24 Dec 2024 12:37:44 -0500
Subject: [PATCH 51/54] chore: refactor SecretsManager to TS

---
 src/backend/auth/twitch-auth.ts               |  4 +-
 .../builtin/streamlabs/streamlabs.js          |  6 +-
 .../builtin/tipeeestream/tipeeestream.js      |  6 +-
 src/backend/secrets-manager.js                | 74 -------------------
 src/backend/secrets-manager.ts                | 70 ++++++++++++++++++
 src/main.js                                   |  4 +-
 6 files changed, 80 insertions(+), 84 deletions(-)
 delete mode 100644 src/backend/secrets-manager.js
 create mode 100644 src/backend/secrets-manager.ts

diff --git a/src/backend/auth/twitch-auth.ts b/src/backend/auth/twitch-auth.ts
index 7f365bc48..584d2cb18 100644
--- a/src/backend/auth/twitch-auth.ts
+++ b/src/backend/auth/twitch-auth.ts
@@ -2,7 +2,7 @@ import axios from "axios";
 import authManager from "./auth-manager";
 import accountAccess, { FirebotAccount } from "../common/account-access";
 import logger from "../logwrapper";
-import { secrets } from "../secrets-manager";
+import { SecretsManager } from "../secrets-manager";
 import { AuthProviderDefinition } from "./auth";
 import { getExpiryDateOfAccessToken } from "@twurple/auth";
 
@@ -14,7 +14,7 @@ class TwitchAuthProviders {
     readonly streamerAccountProviderId = "twitch:streamer-account";
     readonly botAccountProviderId = "twitch:bot-account";
 
-    readonly twitchClientId = secrets.twitchClientId;
+    readonly twitchClientId = SecretsManager.secrets.twitchClientId;
 
     readonly streamerAccountProvider: AuthProviderDefinition = {
         id: this.streamerAccountProviderId,
diff --git a/src/backend/integrations/builtin/streamlabs/streamlabs.js b/src/backend/integrations/builtin/streamlabs/streamlabs.js
index 8a70792c8..67e77310d 100644
--- a/src/backend/integrations/builtin/streamlabs/streamlabs.js
+++ b/src/backend/integrations/builtin/streamlabs/streamlabs.js
@@ -4,7 +4,7 @@ const io = require("socket.io-client");
 const axios = require("axios").default;
 const logger = require("../../../logwrapper");
 
-const { secrets } = require("../../../secrets-manager");
+const { SecretsManager } = require("../../../secrets-manager");
 
 const slEventHandler = require("./events/streamlabs-event-handler");
 const slEffectsLoader = require("./effects/streamlabs-effect-loader");
@@ -20,8 +20,8 @@ const integrationDefinition = {
         name: "StreamLabs",
         redirectUriHost: "localhost",
         client: {
-            id: secrets.streamLabsClientId,
-            secret: secrets.streamLabsClientSecret
+            id: SecretsManager.secrets.streamLabsClientId,
+            secret: SecretsManager.secrets.streamLabsClientSecret
         },
         auth: {
             type: "code",
diff --git a/src/backend/integrations/builtin/tipeeestream/tipeeestream.js b/src/backend/integrations/builtin/tipeeestream/tipeeestream.js
index 21fe06266..5165dfd65 100644
--- a/src/backend/integrations/builtin/tipeeestream/tipeeestream.js
+++ b/src/backend/integrations/builtin/tipeeestream/tipeeestream.js
@@ -3,7 +3,7 @@ const EventEmitter = require("events");
 const io = require("socket.io-client");
 const axios = require("axios").default;
 const logger = require("../../../logwrapper");
-const { secrets } = require("../../../secrets-manager");
+const { SecretsManager } = require("../../../secrets-manager");
 
 const tsEventHandler = require("./events/tipeeestream-event-handler");
 
@@ -17,8 +17,8 @@ const integrationDefinition = {
         id: "tipeeestream",
         name: "TipeeeStream",
         client: {
-            id: secrets.tipeeeStreamClientId,
-            secret: secrets.tipeeeStreamClientSecret
+            id: SecretsManager.secrets.tipeeeStreamClientId,
+            secret: SecretsManager.secrets.tipeeeStreamClientSecret
         },
         auth: {
             type: "code",
diff --git a/src/backend/secrets-manager.js b/src/backend/secrets-manager.js
deleted file mode 100644
index f9ff5b05a..000000000
--- a/src/backend/secrets-manager.js
+++ /dev/null
@@ -1,74 +0,0 @@
-"use strict";
-
-const { resolve } = require('path');
-const { readFileSync } = require('fs');
-
-const logger = require("./logwrapper");
-const argv = require('./common/argv-parser');
-
-
-
-/**
- * @typedef FirebotSecrets
- * @property {string} twitchClientId
- * @property {string} tipeeeStreamClientId
- * @property {string} tipeeeStreamClientSecret
- * @property {string} streamLabsClientId
- * @property {string} streamLabsClientSecret
- */
-
-/**@type {(keyof FirebotSecrets)[]} */
-const expectedKeys = [
-    "twitchClientId",
-    "tipeeeStreamClientId",
-    "tipeeeStreamClientSecret",
-    "streamLabsClientId",
-    "streamLabsClientSecret",
-    "fontAwesome5KitId"
-];
-
-exports.testSecrets = () => {
-    logger.debug("...Starting secrets test");
-    let missingKeys = expectedKeys;
-    try {
-
-        /**@type {FirebotSecrets} */
-        let secrets;
-        if (Object.hasOwn(argv, 'fbsecrets-config') && typeof argv['fbsecrets-config'] === 'string' && /^\.json/i.test(argv['fbsecrets-config'])) {
-            secrets = JSON.parse(readFileSync(resolve(__dirname, '../', argv['fbsecrets-config']), 'utf-8'));
-
-        } else {
-            secrets = require("../secrets.json") || {};
-        }
-
-        missingKeys = expectedKeys.filter(k => secrets[k] == null);
-
-        if (!missingKeys.length) {
-            // We have no missing keys
-            return true;
-        }
-    } catch (err) {
-        if (err && err.code === "MODULE_NOT_FOUND") {
-            logger.error("Unable to find secrets.json in the root directory. Please create one. Contact us in the CrowbarTools Discord if you have any questions.");
-            return false;
-        } else if (err && err.code === 'ENOENT') {
-            logger.error(`Unable to find user-specified secrets file '${resolve(__dirname, '../', argv['fb-secrets-json'])}'`);
-            return false;
-        }
-        logger.error(`Secrets file is invalid JSON data`);
-        return false;
-    }
-
-    logger.error(`secrets.json is missing the following key(s): ${missingKeys.join(", ")}`);
-    return false;
-};
-
-/**@type {FirebotSecrets} */
-let secrets = {};
-try {
-    secrets = require("../secrets.json");
-} catch (error) {
-    //silently fail
-}
-
-exports.secrets = secrets;
\ No newline at end of file
diff --git a/src/backend/secrets-manager.ts b/src/backend/secrets-manager.ts
new file mode 100644
index 000000000..f0e19e58a
--- /dev/null
+++ b/src/backend/secrets-manager.ts
@@ -0,0 +1,70 @@
+import { resolve } from 'path';
+import { readFileSync } from 'fs';
+import logger from "./logwrapper";
+import argv from './common/argv-parser';
+
+interface FirebotSecrets {
+    twitchClientId: string;
+    tipeeeStreamClientId: string;
+    tipeeeStreamClientSecret: string;
+    streamLabsClientId: string;
+    streamLabsClientSecret: string;
+    fontAwesome5KitId: string;
+}
+
+class SecretsManager {
+    secrets: FirebotSecrets;
+    expectedKeys: (keyof FirebotSecrets)[] = [
+        "twitchClientId",
+        "tipeeeStreamClientId",
+        "tipeeeStreamClientSecret",
+        "streamLabsClientId",
+        "streamLabsClientSecret",
+        "fontAwesome5KitId"
+    ];
+
+    constructor() {
+        try {
+            this.secrets = require("../secrets.json");
+        } catch (error) {
+            //silently fail
+        }
+    }
+
+    testSecrets(): boolean {
+        logger.debug("...Starting secrets test");
+        let missingKeys = this.expectedKeys;
+        try {
+            let secrets: FirebotSecrets;
+            if (Object.hasOwn(argv, 'fbsecrets-config') && typeof argv['fbsecrets-config'] === 'string' && /^\.json/i.test(argv['fbsecrets-config'])) {
+                secrets = JSON.parse(readFileSync(resolve(__dirname, '../', argv['fbsecrets-config']), 'utf-8'));
+            } else {
+                secrets = require("../secrets.json") || {};
+            }
+
+            missingKeys = this.expectedKeys.filter(k => secrets[k] == null);
+
+            if (!missingKeys.length) {
+                // We have no missing keys
+                return true;
+            }
+        } catch (err) {
+            if (err && err.code === "MODULE_NOT_FOUND") {
+                logger.error("Unable to find secrets.json in the root directory. Please create one. Contact us in the CrowbarTools Discord if you have any questions.");
+                return false;
+            } else if (err && err.code === 'ENOENT') {
+                logger.error(`Unable to find user-specified secrets file '${resolve(__dirname, '../', argv['fb-secrets-json'])}'`);
+                return false;
+            }
+            logger.error(`Secrets file is invalid JSON data`);
+            return false;
+        }
+
+        logger.error(`secrets.json is missing the following key(s): ${missingKeys.join(", ")}`);
+        return false;
+    }
+}
+
+const secretsManager = new SecretsManager();
+
+export { secretsManager as SecretsManager };
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index af0d8612c..530dc5c05 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,7 +3,7 @@ const { app } = require("electron");
 const path = require('node:path');
 
 const logger = require("./backend/logwrapper");
-const secretsManager = require("./backend/secrets-manager");
+const { SecretsManager } = require("./backend/secrets-manager");
 const { handleSquirrelEvents } = require("./backend/app-management/squirrel-events");
 const {
     whenReady,
@@ -16,7 +16,7 @@ const {
 
 logger.info("Starting Firebot...");
 
-if (!secretsManager.testSecrets()) {
+if (!SecretsManager.testSecrets()) {
     logger.debug("...Testing for secrets failed");
     app.quit();
     return;

From 87d649f74c62c98d0adb262ea91e71a29dda2747 Mon Sep 17 00:00:00 2001
From: dennisrijsdijk <git@dennis.gg>
Date: Tue, 24 Dec 2024 21:04:12 +0100
Subject: [PATCH 52/54] chore: only fetch Twitch user for customrole effect
 when needed

---
 .../{update-role.js => update-role.ts}        | 77 ++++++++++++-------
 1 file changed, 51 insertions(+), 26 deletions(-)
 rename src/backend/effects/builtin/{update-role.js => update-role.ts} (72%)

diff --git a/src/backend/effects/builtin/update-role.js b/src/backend/effects/builtin/update-role.ts
similarity index 72%
rename from src/backend/effects/builtin/update-role.js
rename to src/backend/effects/builtin/update-role.ts
index 1cb38fb39..3e9558284 100644
--- a/src/backend/effects/builtin/update-role.js
+++ b/src/backend/effects/builtin/update-role.ts
@@ -1,14 +1,21 @@
-"use strict";
-
-const { EffectCategory } = require('../../../shared/effect-constants');
-const twitchApi = require("../../twitch-api/api");
-const customRolesManager = require("../../roles/custom-roles-manager");
-const logger = require('../../logwrapper');
+import { EffectType } from "../../../types/effects";
+import { EffectCategory } from "../../../shared/effect-constants";
+import twitchApi from "../../twitch-api/api";
+import customRolesManager from "../../roles/custom-roles-manager";
+import logger from "../../logwrapper";
+import viewerDatabase from "../../viewers/viewer-database";
+import { BasicViewer } from "../../../types/viewers";
 
 /**
- * The Delay effect
+ * The 'Update Role' effect
  */
-const delay = {
+const model: EffectType<{
+    addRoleId: string;
+    customViewer: string;
+    removeRoleId: string;
+    removeAllRoleId: string;
+    viewerType: "current" | "custom";
+}> = {
     /**
    * The definition of the Effect
    */
@@ -20,10 +27,8 @@ const delay = {
         categories: [EffectCategory.ADVANCED],
         dependencies: []
     },
-    globalSettings: {},
     optionsTemplate: `
-
-    <eos-container header="Custom Role Actions" pad-top="true">
+        <eos-container header="Custom Role Actions" pad-top="true">
             <div>
                 <label class="control-fb control--checkbox"> Add user to role</tooltip>
                     <input type="checkbox" ng-init="shouldAddRole = (effect.addRoleId != null && effect.addRoleId !== '')" ng-model="shouldAddRole" ng-click="effect.addRoleId = undefined">
@@ -111,33 +116,53 @@ const delay = {
     /**
    * When the effect is triggered by something
    */
-    onTriggerEvent: async event => {
+    onTriggerEvent: async (event) => {
         const effect = event.effect;
-        
+
         if (effect.removeAllRoleId) {
             customRolesManager.removeAllViewersFromRole(effect.removeAllRoleId);
             return;
         }
 
-        let username = "";
+        const user: BasicViewer = {
+            id: "",
+            username: ""
+        };
+
         if (effect.viewerType === "current") {
-            username = event.trigger.metadata.username;
+            user.id = event.trigger.metadata.userId as string | undefined ?? event.trigger.metadata.eventData?.userId as string | undefined;
+            user.username = event.trigger.metadata.username as string | undefined ?? event.trigger.metadata.eventData?.username as string | undefined;
+            user.displayName = event.trigger.metadata.userDisplayName as string | undefined ?? event.trigger.metadata.eventData?.userDisplayName as string | undefined;
         } else {
-            username = effect.customViewer ? effect.customViewer.trim() : "";
+            user.username = effect.customViewer ? effect.customViewer.trim() : "";
         }
 
-        const user = await twitchApi.users.getUserByName(username);
-        if (user == null) {
-            logger.warn(`Unable to ${effect.addRoleId ? "add" : "remove"} custom role for ${username}. User does not exist.`);
-            return;
+        if (user.id == null || user.id === "") {
+            if (user.username === "") {
+                logger.warn(`Unable to ${effect.addRoleId ? "add" : "remove"} custom role. No user information provided.`);
+                return;
+            }
+
+            const viewer = await viewerDatabase.getViewerByUsername(user.username);
+
+            if (viewer) {
+                user.id = viewer._id;
+                user.displayName = viewer.displayName;
+            } else {
+                const twitchUser = await twitchApi.users.getUserByName(user.username);
+
+                if (twitchUser == null) {
+                    logger.warn(`Unable to ${effect.addRoleId ? "add" : "remove"} custom role for ${user.username}. User does not exist.`);
+                    return;
+                }
+
+                user.id = twitchUser.id;
+                user.displayName = twitchUser.displayName;
+            }
         }
 
         if (effect.addRoleId) {
-            customRolesManager.addViewerToRole(effect.addRoleId, {
-                id: user.id,
-                username: user.name,
-                displayName: user.displayName
-            });
+            customRolesManager.addViewerToRole(effect.addRoleId, user);
         }
 
         if (effect.removeRoleId) {
@@ -148,4 +173,4 @@ const delay = {
     }
 };
 
-module.exports = delay;
+export = model;

From dc87e1c8e09df1bb3ebd4ef99f38c5d8be622490 Mon Sep 17 00:00:00 2001
From: Zack Williamson <zwilliamson@outlook.com>
Date: Tue, 24 Dec 2024 17:16:02 -0500
Subject: [PATCH 53/54] chore: farewell, Firebot v4

---
 .../electron/events/when-ready.js             |   2 -
 .../custom-scripts/custom-script-helpers.js   |  46 +---
 .../custom-scripts/custom-script-runner.js    |   3 +-
 .../import/v4/areas/v4-commands-importer.js   |  80 -------
 .../import/v4/areas/v4-fonts-importer.js      |  41 ----
 .../import/v4/areas/v4-hotkeys-importer.js    |  89 --------
 .../v4/areas/v4-overlay-instances-importer.js |  45 ----
 .../import/v4/areas/v4-scripts-importer.js    |  59 -----
 .../v4/areas/v4-viewergroups-importer.js      |  52 -----
 src/backend/import/v4/import-helpers.js       |  55 -----
 src/backend/import/v4/v4-effect-mapper.js     | 153 -------------
 src/backend/import/v4/v4-importer.js          | 135 -----------
 src/backend/import/v4/v4-permission-mapper.js |  59 -----
 .../modals/misc/setupWizardModal.js           | 214 ++----------------
 14 files changed, 16 insertions(+), 1017 deletions(-)
 delete mode 100644 src/backend/import/v4/areas/v4-commands-importer.js
 delete mode 100644 src/backend/import/v4/areas/v4-fonts-importer.js
 delete mode 100644 src/backend/import/v4/areas/v4-hotkeys-importer.js
 delete mode 100644 src/backend/import/v4/areas/v4-overlay-instances-importer.js
 delete mode 100644 src/backend/import/v4/areas/v4-scripts-importer.js
 delete mode 100644 src/backend/import/v4/areas/v4-viewergroups-importer.js
 delete mode 100644 src/backend/import/v4/import-helpers.js
 delete mode 100644 src/backend/import/v4/v4-effect-mapper.js
 delete mode 100644 src/backend/import/v4/v4-importer.js
 delete mode 100644 src/backend/import/v4/v4-permission-mapper.js

diff --git a/src/backend/app-management/electron/events/when-ready.js b/src/backend/app-management/electron/events/when-ready.js
index e471c8dab..9abafd1a4 100644
--- a/src/backend/app-management/electron/events/when-ready.js
+++ b/src/backend/app-management/electron/events/when-ready.js
@@ -185,8 +185,6 @@ exports.whenReady = async () => {
 
     // get importer in memory
     windowManagement.updateSplashScreenStatus("Loading importers...");
-    const v4Importer = require("../../../import/v4/v4-importer");
-    v4Importer.setupListeners();
 
     const setupImporter = require("../../../import/setups/setup-importer");
     setupImporter.setupListeners();
diff --git a/src/backend/common/handlers/custom-scripts/custom-script-helpers.js b/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
index ec85b62f0..17e7c9a38 100644
--- a/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
+++ b/src/backend/common/handlers/custom-scripts/custom-script-helpers.js
@@ -11,49 +11,6 @@ const {
 
 const accountAccess = require('../../account-access');
 
-//v4 effect types are keys, supported v5 types are values
-const v4EffectTypeMap = {
-    "API Button": "firebot:api",
-    "Celebration": "firebot:celebration",
-    "Change Group": null,
-    "Change Scene": null,
-    "Chat": "firebot:chat",
-    "Cooldown": null,
-    "Custom Script": "firebot:customscript",
-    "Run Command": null,
-    "Delay": "firebot:delay",
-    "Dice": "firebot:dice",
-    "Game Control": "firebot:controlemulation",
-    "HTML": "firebot:html",
-    "Show Event": null,
-    "Play Sound": "firebot:playsound",
-    "Random Effect": "firebot:randomeffect",
-    "Effect Group": "firebot:run-effect-list",
-    "Show Image": "firebot:showImage",
-    "Create Clip": "firebot:clip",
-    "Show Video": "firebot:playvideo",
-    "Clear Effects": null,
-    "Write Text To File": "firebot:filewriter",
-    "Group List": null,
-    "Scene List": null,
-    "Command List": null,
-    "Change User Scene": null,
-    "Change Group Scene": null,
-    "Update Button": null,
-    "Toggle Connection": "firebot:toggleconnection",
-    "Show Text": "firebot:showtext"
-};
-
-function mapV4EffectToV5(effect) {
-    if (effect && effect.type) {
-        const mappedType = v4EffectTypeMap[effect.type];
-        if (mappedType != null) {
-            effect.type = mappedType;
-        }
-    }
-    return effect;
-}
-
 function buildModules(scriptManifest) {
     const streamerName = accountAccess.getAccounts().streamer.username || "Unknown Streamer";
     const appVersion = app.getVersion();
@@ -211,5 +168,4 @@ function mapParameters(parameterData) {
 
 exports.mapParameters = mapParameters;
 exports.getScriptPath = getScriptPath;
-exports.buildRunRequest = buildRunRequest;
-exports.mapV4EffectToV5 = mapV4EffectToV5;
\ No newline at end of file
+exports.buildRunRequest = buildRunRequest;
\ No newline at end of file
diff --git a/src/backend/common/handlers/custom-scripts/custom-script-runner.js b/src/backend/common/handlers/custom-scripts/custom-script-runner.js
index 7f621c1bf..ce37417cb 100644
--- a/src/backend/common/handlers/custom-scripts/custom-script-runner.js
+++ b/src/backend/common/handlers/custom-scripts/custom-script-runner.js
@@ -4,7 +4,7 @@ const { v4: uuid } = require("uuid");
 const logger = require("../../../logwrapper");
 const utils = require("../../../utility");
 const profileManager = require("../../profile-manager");
-const { getScriptPath, buildRunRequest, mapParameters, mapV4EffectToV5 } = require("./custom-script-helpers");
+const { getScriptPath, buildRunRequest, mapParameters } = require("./custom-script-helpers");
 const effectRunner = require("../../effect-runner.js");
 import { SettingsManager } from "../../settings-manager";
 
@@ -124,7 +124,6 @@ async function executeScript(scriptData, trigger, isStartupScript = false) {
             list: effects
                 .filter(e => e.type != null && e.type !== "")
                 .map((e) => {
-                    e = mapV4EffectToV5(e);
                     if (e.id == null) {
                         e.id = uuid();
                     }
diff --git a/src/backend/import/v4/areas/v4-commands-importer.js b/src/backend/import/v4/areas/v4-commands-importer.js
deleted file mode 100644
index 49c914830..000000000
--- a/src/backend/import/v4/areas/v4-commands-importer.js
+++ /dev/null
@@ -1,80 +0,0 @@
-"use strict";
-const path = require("path");
-const logger = require("../../../logwrapper");
-const importHelpers = require("../import-helpers");
-
-const commandManager = require("../../../chat/commands/command-manager");
-
-const effectsMapper = require("../v4-effect-mapper");
-const permissionMapper = require("../v4-permission-mapper");
-
-async function checkForV4Commands() {
-    const v4CommandsPath = path.join(importHelpers.v4DataPath, "/chat/commands.json");
-    const v4CommandsDetected = await importHelpers.pathExists(v4CommandsPath);
-    return v4CommandsDetected;
-}
-
-function mapCommands(v4Commands, activeStatus = true, incompatibilityWarnings) {
-    for (const v4Command of v4Commands) {
-        const v5Command = {
-            active: activeStatus,
-            cooldown: {
-                global: v4Command.cooldown && !isNaN(v4Command.cooldown) ? parseInt(v4Command.cooldown) : 0,
-                user: 0
-            },
-            trigger: v4Command.trigger || "!unknowntrigger",
-            effects: {}
-        };
-
-        if (v4Command.effects != null) {
-            const effectsMapResult = effectsMapper.mapV4EffectList(v4Command.effects, { type: "Chat Command", name: v4Command.trigger });
-            if (effectsMapResult) {
-                v5Command.effects = effectsMapResult.effects;
-                effectsMapResult.incompatibilityWarnings.forEach(w => incompatibilityWarnings.push(w));
-            }
-        }
-
-        const restrictionData = permissionMapper.mapV4Permissions(v4Command.permissionType, v4Command.permissions);
-        v5Command.restrictionData = restrictionData;
-
-        commandManager.saveImportedCustomCommand(v5Command);
-    }
-
-}
-
-exports.run = async () => {
-    const incompatibilityWarnings = [];
-
-    const foundCommandsFile = await checkForV4Commands();
-
-    if (foundCommandsFile) {
-        let v4Commands;
-        try {
-            const v4CommandsDb = importHelpers.getJsonDbInV4Data("/chat/commands.json");
-            v4Commands = v4CommandsDb.getData("/");
-        } catch (err) {
-            logger.warn("Error while attempting to load v4 commands db.", err);
-        }
-
-        if (v4Commands != null) {
-            const activeCommandsObj = v4Commands["Active"];
-            if (activeCommandsObj != null) {
-                const activeCommands = Object.values(activeCommandsObj);
-                mapCommands(activeCommands, true, incompatibilityWarnings);
-            }
-
-            const inactiveCommandsObj = v4Commands["Inactive"];
-            if (inactiveCommandsObj != null) {
-                const inactiveCommands = Object.values(inactiveCommandsObj);
-                mapCommands(inactiveCommands, false, incompatibilityWarnings);
-            }
-
-            commandManager.triggerUiRefresh();
-        }
-    }
-
-    return {
-        success: true,
-        incompatibilityWarnings: incompatibilityWarnings
-    };
-};
\ No newline at end of file
diff --git a/src/backend/import/v4/areas/v4-fonts-importer.js b/src/backend/import/v4/areas/v4-fonts-importer.js
deleted file mode 100644
index 6ee4d626f..000000000
--- a/src/backend/import/v4/areas/v4-fonts-importer.js
+++ /dev/null
@@ -1,41 +0,0 @@
-"use strict";
-
-const path = require("path");
-const logger = require("../../../logwrapper");
-const importHelpers = require("../import-helpers");
-const fse = require("fs-extra");
-const profileManager = require("../../../common/profile-manager");
-
-const v4FontsPath = path.join(importHelpers.v4DataPath, "/fonts");
-const v5FontsPath = profileManager.getPathInProfile("/fonts");
-
-async function checkForV4Fonts() {
-    let hasFonts = false;
-    try {
-        const files = await fse.readdir(v4FontsPath);
-        hasFonts = files != null && files.length > 0;
-    } catch (err) {
-        logger.warn("Unable to read fonts folder.", err);
-    }
-    return hasFonts;
-}
-
-exports.run = async () => {
-    const incompatibilityWarnings = [];
-
-    const v4FontsExist = await checkForV4Fonts();
-
-    if (v4FontsExist) {
-        try {
-            await fse.copy(v4FontsPath, v5FontsPath);
-        } catch (err) {
-            incompatibilityWarnings.push("Unable to import V4 Fonts as an error occurred.");
-            logger.warn("Unable to copy v4 fonts.", err);
-        }
-    }
-
-    return {
-        success: true,
-        incompatibilityWarnings: incompatibilityWarnings
-    };
-};
\ No newline at end of file
diff --git a/src/backend/import/v4/areas/v4-hotkeys-importer.js b/src/backend/import/v4/areas/v4-hotkeys-importer.js
deleted file mode 100644
index 8cb1598e5..000000000
--- a/src/backend/import/v4/areas/v4-hotkeys-importer.js
+++ /dev/null
@@ -1,89 +0,0 @@
-"use strict";
-
-const path = require("path");
-const logger = require("../../../logwrapper");
-const { v4: uuid } = require("uuid");
-const importHelpers = require("../import-helpers");
-const profileManager = require("../../../common/profile-manager");
-const frontendCommunicator = require("../../../common/frontend-communicator");
-
-const effectsMapper = require("../v4-effect-mapper");
-
-function saveHotkeysToFile(hotkeys) {
-    const hotkeyDb = profileManager.getJsonDbInProfile("/hotkeys");
-    try {
-        const hotkeyData = hotkeyDb.getData("/");
-        let currentHotkeys = [];
-        if (hotkeyData != null && hotkeyData.length > 0) {
-            currentHotkeys = hotkeyData;
-        }
-
-        currentHotkeys = currentHotkeys.concat(hotkeys);
-
-        hotkeyDb.push("/", currentHotkeys);
-    } catch (err) {
-        logger.error(err);
-    }
-}
-
-async function checkForV4Hotkeys() {
-    const v4HotkeysPath = path.join(importHelpers.v4DataPath, "/hotkeys.json");
-    const v4HotkeysDetected = await importHelpers.pathExists(v4HotkeysPath);
-    return v4HotkeysDetected;
-}
-
-exports.run = async () => {
-    const incompatibilityWarnings = [];
-
-    const v4HotkeysExist = await checkForV4Hotkeys();
-
-    if (v4HotkeysExist) {
-        let v4Hotkeys;
-        try {
-            const v4HotkeysDb = importHelpers.getJsonDbInV4Data("/hotkeys.json");
-            v4Hotkeys = v4HotkeysDb.getData("/");
-        } catch (err) {
-            logger.warn("Error while attempting to load v4 hotkeys db.", err);
-        }
-
-        if (v4Hotkeys != null) {
-
-            const v5Hotkeys = [];
-            for (const v4Hotkey of v4Hotkeys) {
-
-                if (v4Hotkey.action == null || v4Hotkey.action.type !== "Run Effects") {
-                    incompatibilityWarnings.push(`Could not import hotkey '${v4Hotkey.name}' because: V5 hotkeys have fundamentally changed and don't support v4 action type '${v4Hotkey.action.type}'`);
-                    continue;
-                }
-
-                const v5Hotkey = {
-                    id: uuid(),
-                    active: v4Hotkey.active !== false,
-                    code: v4Hotkey.code,
-                    name: v4Hotkey.name
-                };
-
-                const effects = v4Hotkey.action.metadata != null ? v4Hotkey.action.metadata.effects : [];
-
-                if (effects != null) {
-                    const effectsMapResult = effectsMapper.mapV4EffectList(effects, { type: "Event", name: v4Hotkey.name });
-                    if (effectsMapResult) {
-                        v5Hotkey.effects = effectsMapResult.effects;
-                        effectsMapResult.incompatibilityWarnings.forEach(w => incompatibilityWarnings.push(w));
-                    }
-                }
-
-                v5Hotkeys.push(v5Hotkey);
-            }
-
-            saveHotkeysToFile(v5Hotkeys);
-
-            frontendCommunicator.send("import-hotkeys-update");
-        }
-    }
-
-    return {
-        success: true,
-        incompatibilityWarnings: incompatibilityWarnings
-    };
-};
diff --git a/src/backend/import/v4/areas/v4-overlay-instances-importer.js b/src/backend/import/v4/areas/v4-overlay-instances-importer.js
deleted file mode 100644
index ab34b1455..000000000
--- a/src/backend/import/v4/areas/v4-overlay-instances-importer.js
+++ /dev/null
@@ -1,45 +0,0 @@
-"use strict";
-
-const path = require("path");
-const logger = require("../../../logwrapper");
-const importHelpers = require("../import-helpers");
-const { SettingsManager } = require("../../../common/settings-manager");
-
-
-async function checkForV4SettingsFile() {
-    const v4SettingsPath = path.join(importHelpers.v4DataPath, "/settings.json");
-    return await importHelpers.pathExists(v4SettingsPath);
-}
-
-exports.run = async () => {
-    const incompatibilityWarnings = [];
-
-    const v4SettingsExists = await checkForV4SettingsFile();
-
-    if (v4SettingsExists) {
-
-        const v4SettingsDb = importHelpers.getJsonDbInV4Data("/settings.json");
-
-        let allV4Settings;
-        try {
-            allV4Settings = v4SettingsDb.getData("/");
-        } catch (err) {
-            logger.warn("Failed to read v4 settings file.", err);
-        }
-
-        if (allV4Settings != null) {
-            const useOverlayInstances = allV4Settings.settings.useOverlayInstances === true;
-            SettingsManager.saveSetting("UseOverlayInstances", useOverlayInstances);
-
-            const overlayInstances = allV4Settings.settings.overlayInstances || [];
-            SettingsManager.saveSetting("OverlayInstances", overlayInstances);
-
-            SettingsManager.flushSettingsCache();
-        }
-    }
-
-    return {
-        success: true,
-        incompatibilityWarnings: incompatibilityWarnings
-    };
-};
\ No newline at end of file
diff --git a/src/backend/import/v4/areas/v4-scripts-importer.js b/src/backend/import/v4/areas/v4-scripts-importer.js
deleted file mode 100644
index bc72f788e..000000000
--- a/src/backend/import/v4/areas/v4-scripts-importer.js
+++ /dev/null
@@ -1,59 +0,0 @@
-"use strict";
-
-const path = require("path");
-const logger = require("../../../logwrapper");
-const importHelpers = require("../import-helpers");
-const fse = require("fs-extra");
-const profileManager = require("../../../common/profile-manager");
-const { SettingsManager } = require("../../../common/settings-manager");
-
-const v4ScriptsPath = path.join(importHelpers.v4DataPath, "/scripts");
-const v5ScriptsPath = profileManager.getPathInProfile("/scripts");
-
-async function checkForV4Scripts() {
-    let hasScripts = false;
-    try {
-        const files = await fse.readdir(v4ScriptsPath);
-        hasScripts = files != null && files.length > 0;
-    } catch (err) {
-        logger.warn("Unable to read scripts folder.", err);
-    }
-    return hasScripts;
-}
-
-exports.run = async () => {
-    const incompatibilityWarnings = [];
-
-    const v4ScriptsExist = await checkForV4Scripts();
-
-    if (v4ScriptsExist) {
-        try {
-            await fse.copy(v4ScriptsPath, v5ScriptsPath);
-        } catch (err) {
-            incompatibilityWarnings.push("Unable to import V4 Scripts as an error occurred.");
-            logger.warn("Unable to copy v4 scripts.", err);
-        }
-
-        const v4SettingsDb = importHelpers.getJsonDbInV4Data("/settings.json");
-
-        let allV4Settings;
-        try {
-            allV4Settings = v4SettingsDb.getData("/");
-        } catch (err) {
-            logger.warn("Failed to read v4 settings file.", err);
-        }
-
-        if (allV4Settings != null) {
-            const runCustomScripts = allV4Settings.settings.runCustomScripts === true;
-            SettingsManager.saveSetting("RunCustomScripts", runCustomScripts);
-
-            SettingsManager.flushSettingsCache();
-        }
-
-    }
-
-    return {
-        success: true,
-        incompatibilityWarnings: incompatibilityWarnings
-    };
-};
\ No newline at end of file
diff --git a/src/backend/import/v4/areas/v4-viewergroups-importer.js b/src/backend/import/v4/areas/v4-viewergroups-importer.js
deleted file mode 100644
index 55fca9597..000000000
--- a/src/backend/import/v4/areas/v4-viewergroups-importer.js
+++ /dev/null
@@ -1,52 +0,0 @@
-"use strict";
-
-const path = require("path");
-const logger = require("../../../logwrapper");
-const { v4: uuid } = require("uuid");
-const importHelpers = require("../import-helpers");
-
-const customRolesManager = require("../../../roles/custom-roles-manager");
-
-async function checkForV4ViewerGroups() {
-    const v4ViewerGroupsPath = path.join(importHelpers.v4DataPath, "/groups.json");
-    const v4ViewerGroupsDetected = await importHelpers.pathExists(v4ViewerGroupsPath);
-    return v4ViewerGroupsDetected;
-}
-
-exports.run = async () => {
-    const incompatibilityWarnings = [];
-
-    const v4ViewerGroupsExist = await checkForV4ViewerGroups();
-
-    if (v4ViewerGroupsExist) {
-        let v4ViewerGroupsObj;
-        try {
-            const v4ViewerGroupsDb = importHelpers.getJsonDbInV4Data("/groups.json");
-            v4ViewerGroupsObj = v4ViewerGroupsDb.getData("/");
-        } catch (err) {
-            logger.warn("Error while attempting to load v4 events db.", err);
-        }
-
-        if (v4ViewerGroupsObj != null) {
-            let viewerGroups = Object.values(v4ViewerGroupsObj) || [];
-            viewerGroups = viewerGroups.filter(g => g.groupName !== "banned");
-
-            for (const viewerGroup of viewerGroups) {
-                const customRole = {
-                    id: uuid(),
-                    name: viewerGroup.groupName,
-                    viewers: viewerGroup.users
-                };
-
-                await customRolesManager.importCustomRole(customRole);
-            }
-
-            customRolesManager.triggerUiRefresh();
-        }
-    }
-
-    return {
-        success: true,
-        incompatibilityWarnings: incompatibilityWarnings
-    };
-};
\ No newline at end of file
diff --git a/src/backend/import/v4/import-helpers.js b/src/backend/import/v4/import-helpers.js
deleted file mode 100644
index 9ef771081..000000000
--- a/src/backend/import/v4/import-helpers.js
+++ /dev/null
@@ -1,55 +0,0 @@
-"use strict";
-const electron = require("electron");
-const path = require("path");
-const fs = require("fs");
-const { JsonDB } = require("node-json-db");
-
-const appDataPath = electron.app.getPath("appData");
-const v4DataPath = path.join(appDataPath, "Firebot/firebot-data/user-settings");
-exports.v4DataPath = v4DataPath;
-
-exports.pathExists = (path) => {
-    return new Promise(resolve => {
-        fs.access(path, err => {
-            if (err) {
-                //ENOENT means Error NO ENTity found, aka the file/folder doesn't exist.
-                if (err.code === "ENOENT") {
-                    // This folder doesn't exist. Resolve and create it.
-                    resolve(false);
-                } else {
-                    // Some weird error happened other than the path missing.
-                    const logger = require("../logwrapper");
-                    logger.error(err);
-                    resolve(false);
-                }
-            } else {
-                resolve(true);
-            }
-        });
-    });
-};
-
-/**
- * @returns JsonDB
- */
-exports.getJsonDbInV4Data = function(filePath) {
-    const jsonDbPath = path.join(v4DataPath, filePath);
-    return new JsonDB(jsonDbPath, false, true);
-};
-
-// error types
-class IncompatibilityError extends Error {
-    constructor(reason, ...params) {
-        super(reason, ...params);
-        // Maintains proper stack trace for where our error was thrown
-        if (Error.captureStackTrace) {
-            Error.captureStackTrace(this, IncompatibilityError);
-        }
-        this.name = 'IncompatibilityError';
-        this.reason = reason;
-    }
-}
-
-exports.errors = {
-    IncompatibilityError
-};
diff --git a/src/backend/import/v4/v4-effect-mapper.js b/src/backend/import/v4/v4-effect-mapper.js
deleted file mode 100644
index fc48033cf..000000000
--- a/src/backend/import/v4/v4-effect-mapper.js
+++ /dev/null
@@ -1,153 +0,0 @@
-"use strict";
-
-const logger = require("../../logwrapper");
-
-const { IncompatibilityError } = require("./import-helpers").errors;
-
-const { v4: uuid } = require("uuid");
-
-//v4 effect types are keys, supported v5 types are values
-const v4EffectTypeMap = {
-    "API Button": "firebot:api",
-    "Celebration": "firebot:celebration",
-    "Change Group": null, // v5 is fundamentally different here, cant import
-    "Change Scene": null, // v5 is fundamentally different here, cant import
-    "Chat": "firebot:chat",
-    "Cooldown": null, // vastly different than v5 equivalent, extremely difficult to import correctly
-    "Custom Script": "firebot:customscript",
-    "Run Command": null, // was only available to custom scripts in v4, don't think it will even show up
-    "Delay": "firebot:delay",
-    "Dice": "firebot:dice",
-    "Game Control": "firebot:controlemulation",
-    "HTML": "firebot:html",
-    "Show Event": null, // going to deprecate the v5 equivalent so not going to bother importing
-    "Play Sound": "firebot:playsound",
-    "Random Effect": "firebot:randomeffect",
-    "Effect Group": "firebot:run-effect-list",
-    "Show Image": "firebot:showImage",
-    "Create Clip": "firebot:clip",
-    "Show Video": "firebot:playvideo",
-    "Clear Effects": null,
-    "Write Text To File": "firebot:filewriter",
-    "Group List": null,
-    "Scene List": null,
-    "Command List": null, // v5 equivalent doesnt exist as theres a sys cmd for this now
-    "Change User Scene": null,
-    "Change Group Scene": null,
-    "Update Button": null, // vastly different than v5 equivalent, extremely difficult to import correctly
-    "Toggle Connection": "firebot:toggleconnection",
-    "Show Text": "firebot:showtext"
-};
-
-const v4IncompatibilityReasonMap = {
-    "Change Group": "V5 handles groups/scenes fundamentally different",
-    "Change Scene": "V5 handles groups/scenes fundamentally different",
-    "Cooldown": "V5 handles control cooldowns fundamentally different",
-    "Run Command": "Impossible to import effect",
-    "Show Event": "Effect is no longer supported",
-    "Clear Effects": "Effect is fundamentally different in V5",
-    "Group List": "V5 handles groups/scenes fundamentally different",
-    "Scene List": "V5 handles groups/scenes fundamentally different",
-    "Command List": "Effect doesn't exist in V5 as this functionality now exists as a System Command",
-    "Change User Scene": "V5 handles groups/scenes fundamentally different",
-    "Change Group Scene": "V5 handles groups/scenes fundamentally different",
-    "Update Button": "V5 handles control updates fundamentally different"
-};
-
-function updateReplaceVariables(effect) {
-    if (effect == null) {
-        return effect;
-    }
-
-    const keys = Object.keys(effect);
-
-    for (const key of keys) {
-        const value = effect[key];
-
-        if (value && typeof value === "string") {
-            effect[key] = value.replace(/\$\(user\)/, "$user");
-        } else if (value && typeof value === "object") {
-            effect[key] = updateReplaceVariables(value);
-        }
-    }
-
-    return effect;
-}
-
-function mapV4Effect (v4Effect, triggerData, incompatibilityWarnings) {
-    if (v4Effect == null || v4Effect.type == null) {
-        throw new IncompatibilityError("v4 effect isn't formatted properly.");
-    }
-    const v5EffectTypeId = v4EffectTypeMap[v4Effect.type];
-
-    // Null signifies we don't support this v4 effect
-    if (v5EffectTypeId == null) {
-        const reason = v4IncompatibilityReasonMap[v4Effect.type] || "Unknown effect";
-        throw new IncompatibilityError(reason);
-    }
-
-    let v5Effect = v4Effect;
-    v5Effect.type = v5EffectTypeId;
-    v5Effect.id = uuid();
-
-    //do any per effect type tweaks here
-    if (v5Effect.type === "firebot:playsound") {
-        v5Effect.filepath = v5Effect.file;
-    }
-
-    if (v5Effect.type === "firebot:randomeffect" || v5Effect.type === "firebot:run-effect-list") {
-
-        const mapResult = exports.mapV4EffectList(v5Effect.effectList, triggerData);
-
-        mapResult.incompatibilityWarnings.forEach(iw => incompatibilityWarnings.push(iw));
-
-        v5Effect.effectList = mapResult.effects;
-    }
-
-    v5Effect = updateReplaceVariables(v5Effect);
-
-    return v5Effect;
-}
-
-exports.mapV4EffectList = (v4EffectList, triggerData) => {
-    const incompatibilityWarnings = [];
-
-    if (v4EffectList == null) {
-        return { effects: null, incompatibilityWarnings: incompatibilityWarnings};
-    }
-
-    // v4 effect lists can be objects or arrays
-    const v4Effects = Array.isArray(v4EffectList) ? v4EffectList : Object.values(v4EffectList);
-
-    const v5EffectObj = {
-        id: uuid(),
-        list: []
-    };
-
-    for (const v4Effect of v4Effects) {
-        if (v4Effect == null || v4Effect.type == null) {
-            continue;
-        }
-        try {
-            const mappedV5Effect = mapV4Effect(v4Effect, triggerData, incompatibilityWarnings);
-            if (mappedV5Effect) {
-                v5EffectObj.list.push(mappedV5Effect);
-            }
-        } catch (error) {
-            let reason;
-            if (error instanceof IncompatibilityError) {
-                reason = error.reason;
-            } else {
-                logger.warn("Error during v4 effect import", error);
-                reason = "An unexpected error occurred";
-            }
-            const message = `Could not import V4 Effect '${v4Effect.type}' in ${triggerData.type} '${triggerData.name}' because: ${reason}`;
-            incompatibilityWarnings.push(message);
-        }
-    }
-
-    return {
-        effects: v5EffectObj,
-        incompatibilityWarnings: incompatibilityWarnings
-    };
-};
\ No newline at end of file
diff --git a/src/backend/import/v4/v4-importer.js b/src/backend/import/v4/v4-importer.js
deleted file mode 100644
index c83bf3db2..000000000
--- a/src/backend/import/v4/v4-importer.js
+++ /dev/null
@@ -1,135 +0,0 @@
-"use strict";
-
-const logger = require("../../logwrapper");
-const path = require("path");
-const importHelpers = require("./import-helpers");
-const frontendCommunicator = require("../../common/frontend-communicator");
-
-//areas
-const commandsImporter = require("./areas/v4-commands-importer");
-const viewerGroupsImporter = require("./areas/v4-viewergroups-importer");
-const hotkeysImporter = require("./areas/v4-hotkeys-importer");
-const scriptsImporter = require("./areas/v4-scripts-importer");
-const fontsImporter = require("./areas/v4-fonts-importer");
-const overlayInstancesImporter = require("./areas/v4-overlay-instances-importer");
-
-const v4DataPath = importHelpers.v4DataPath;
-
-function wait(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-async function checkForV4Data() {
-    const v4SettingsPath = path.join(v4DataPath, "settings.json");
-    const v4DataDetected = await importHelpers.pathExists(v4SettingsPath);
-    logger.debug(`V4 Data Detected: ${v4DataDetected}`);
-    return v4DataDetected;
-}
-
-async function importV4Data(settings) {
-    const v4DataDetected = await checkForV4Data();
-
-    logger.info("Starting v4 import...");
-
-    // no v4 data detected
-    if (!v4DataDetected) {
-        return;
-    }
-
-    logger.info("v4 data detected! Continuing...");
-
-    frontendCommunicator.send("v4-import-started");
-    await wait(50);
-
-    //keep track of incompatibility issues so we can display them to the user later
-    let incompatibilityWarnings = [];
-
-    if (settings.commands) {
-
-        logger.info("Importing v4 commands data...");
-
-        frontendCommunicator.send("v4-import-update", { importing: "Chat Commands" });
-
-        await wait(2000);
-
-        const commandsResult = await commandsImporter.run();
-
-        incompatibilityWarnings = incompatibilityWarnings.concat(commandsResult.incompatibilityWarnings);
-    }
-
-    if (settings.viewerGroups) {
-
-        logger.info("Importing v4 viewer group data...");
-
-        frontendCommunicator.send("v4-import-update", { importing: "Viewer Groups (Roles)" });
-
-        await wait(2000);
-
-        const viewerGroupsResult = await viewerGroupsImporter.run();
-
-        incompatibilityWarnings = incompatibilityWarnings.concat(viewerGroupsResult.incompatibilityWarnings);
-    }
-
-    if (settings.hotkeys) {
-
-        logger.info("Importing v4 hotkey data...");
-
-        frontendCommunicator.send("v4-import-update", { importing: "Hotkeys" });
-
-        await wait(2000);
-
-        const hotkeysResult = await hotkeysImporter.run();
-
-        incompatibilityWarnings = incompatibilityWarnings.concat(hotkeysResult.incompatibilityWarnings);
-    }
-
-    if (settings.misc) {
-        logger.info("Importing v4 misc data...");
-
-        frontendCommunicator.send("v4-import-update", { importing: "Extras (Custom Scripts)" });
-
-        await wait(2000);
-
-        const scriptsResult = await scriptsImporter.run();
-
-        incompatibilityWarnings = incompatibilityWarnings.concat(scriptsResult.incompatibilityWarnings);
-
-
-        frontendCommunicator.send("v4-import-update", { importing: "Extras (Fonts)" });
-
-        await wait(2000);
-
-        const fontsResult = await fontsImporter.run();
-
-        incompatibilityWarnings = incompatibilityWarnings.concat(fontsResult.incompatibilityWarnings);
-
-
-        frontendCommunicator.send("v4-import-update", { importing: "Extras (Overlay Instances)" });
-
-        await wait(2000);
-
-        const overlayInstancesResult = await overlayInstancesImporter.run();
-
-        incompatibilityWarnings = incompatibilityWarnings.concat(overlayInstancesResult.incompatibilityWarnings);
-    }
-
-    logger.info("V4 import completed!");
-    logger.info(incompatibilityWarnings);
-
-    frontendCommunicator.send("v4-import-complete", { success: true, incompatibilityWarnings: incompatibilityWarnings });
-}
-
-function setupListeners() {
-    frontendCommunicator.on("start-v4-import", (importSettings) => {
-        importV4Data(importSettings);
-    });
-
-    frontendCommunicator.onAsync("v4-data-check", async () => {
-        return await checkForV4Data();
-    });
-}
-
-
-exports.checkForV4Data = checkForV4Data;
-exports.importV4Data = importV4Data;
-exports.setupListeners = setupListeners;
\ No newline at end of file
diff --git a/src/backend/import/v4/v4-permission-mapper.js b/src/backend/import/v4/v4-permission-mapper.js
deleted file mode 100644
index efe55bf4b..000000000
--- a/src/backend/import/v4/v4-permission-mapper.js
+++ /dev/null
@@ -1,59 +0,0 @@
-"use strict";
-
-const { v4: uuid } = require("uuid");
-
-function mapV4RolesToMixerRoles(permissions) {
-    if (permissions == null || !Array.isArray(permissions) || permissions.length === 0) {
-        return [];
-    }
-    return permissions
-        .map((p) => {
-            switch (p) {
-                case "Staff":
-                    return "Staff";
-                case "Pro":
-                    return "Pro";
-                case "Moderators":
-                    return "Mod";
-                case "Subscribers":
-                    return "Subscriber";
-                case "Channel Editors":
-                    return "ChannelEditor";
-                case "Streamer":
-                    return "Owner";
-                default:
-                    return null;
-            }
-        })
-        .filter(r => r != null);
-}
-
-exports.mapV4Permissions = (permissionType, permissions) => {
-    const restrictionData = {
-        restrictions: [],
-        mode: "all"
-    };
-
-    if (permissionType === "Group") {
-        permissions = mapV4RolesToMixerRoles(permissions);
-        const restriction = {
-            id: uuid(),
-            type: "firebot:permissions",
-            mode: "roles",
-            roleIds: permissions || []
-        };
-
-        restrictionData.restrictions.push(restriction);
-    } else if (permissionType === "Individual") {
-        const restriction = {
-            id: uuid(),
-            type: "firebot:permissions",
-            mode: "viewer",
-            username: typeof permissions === "string" ? permissions : ""
-        };
-
-        restrictionData.restrictions.push(restriction);
-    }
-
-    return restrictionData;
-};
\ No newline at end of file
diff --git a/src/gui/app/directives/modals/misc/setupWizardModal.js b/src/gui/app/directives/modals/misc/setupWizardModal.js
index ea119614d..9b4ceeed3 100644
--- a/src/gui/app/directives/modals/misc/setupWizardModal.js
+++ b/src/gui/app/directives/modals/misc/setupWizardModal.js
@@ -27,107 +27,6 @@
                     </div>
 
                     <div ng-switch-when="1" class="wave">
-                        <div ng-hide="$ctrl.importStarted || $ctrl.importCompleted" style="display:flex; flex-direction:column; justify-content: space-between;">
-                            <div>
-                                <div>
-                                    <p>We have detected Firebot v4 data on your computer.<br><strong>Would you like to import anything?</strong></p>
-
-                                    <div class="muted" style="font-size:12px;padding: 0 65px;margin-top: 0px;">
-                                        <strong>Please note:</strong><br>Due to some changes and fundamental differences in v5, we may not be able to import 100% of your v4 data. Some additional setup may be required.
-                                    </div>
-                                </div>
-                                <div style="margin-top: 10px;">
-                                    <div class="modal-subheader" style="padding: 0 0 10px 0; font-size: 17px;">
-                                        IMPORT SETTINGS
-                                    </div>
-                                    <div style="text-align:left !important;display:flex; justify-content: center;">
-                                        <div style="transform: translateX(40px);">
-                                            <div style="margin-bottom: 3px">
-                                                <label class="control-fb control--checkbox" style="margin-bottom: 0px; font-size: 13px;opacity:0.9;display:inline-block;"> Chat Commands
-                                                    <input type="checkbox" ng-model="$ctrl.importSettings.commands">
-                                                    <div class="control__indicator"></div>
-                                                </label>
-                                            </div>
-                                            <div style="margin-bottom: 3px">
-                                                <label class="control-fb control--checkbox" style="margin-bottom: 0px; font-size: 13px;opacity:0.9;display:inline-block;"> Events
-                                                    <input type="checkbox" ng-model="$ctrl.importSettings.events">
-                                                    <div class="control__indicator"></div>
-                                                </label>
-                                            </div>
-                                            <div style="margin-bottom: 3px">
-                                                <label class="control-fb control--checkbox" style="margin-bottom: 0px; font-size: 13px;opacity:0.9;display:inline-block;"> Viewer Groups
-                                                    <input type="checkbox" ng-model="$ctrl.importSettings.viewerGroups">
-                                                    <div class="control__indicator"></div>
-                                                </label>
-                                            </div>
-                                            <div style="margin-bottom: 3px">
-                                                <label class="control-fb control--checkbox" style="margin-bottom: 0px; font-size: 13px;opacity:0.9;display:inline-block;"> Hotkeys
-                                                    <input type="checkbox" ng-model="$ctrl.importSettings.hotkeys">
-                                                    <div class="control__indicator"></div>
-                                                </label>
-                                            </div>
-                                            <div style="margin-bottom: 3px">
-                                                <label class="control-fb control--checkbox" style="margin-bottom: 0px; font-size: 13px;opacity:0.9;display:inline-block;"> Extras <span class="muted">(Scripts/Fonts/Overlay Instances)</span>
-                                                    <input type="checkbox" ng-model="$ctrl.importSettings.misc">
-                                                    <div class="control__indicator"></div>
-                                                </label>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div style="margin-top: 10px;">
-                                    <button class="btn btn-default" ng-click="$ctrl.startImport()" ng-disabled="!$ctrl.canStartImport()"><i class="fad fa-file-import"></i> Import</button>
-                                </div>
-
-                            </div>
-
-                            <div style="margin-top: 15px;">
-                                <div>
-                                    <a class="btn btn-link" style="font-size: 17px;color: #5BC0DE;" ng-click="$ctrl.setCurrentStep(2)">No, don't import for now.</a>
-                                </div>
-                                <div>
-                                    <span style="font-size: 11px; opacity: 0.8; margin-top: 3px;">(You can import later at any time by going to Settings > Open Setup Wizard)</span>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div ng-show="$ctrl.importStarted && !$ctrl.importCompleted">
-                            <h3>Importing...</h3>
-                            <div style="font-size: 200px;">
-                                <i class="fad fa-spinner fa-pulse"></i>
-                            </div>
-                            <p ng-show="$ctrl.currentlyImporting"><span style="font-weight: 100;">Currently Importing:</span> <strong>{{$ctrl.currentlyImporting}}</strong></h3>
-                        </div>
-
-
-                        <div ng-show="!$ctrl.importStarted && $ctrl.importCompleted">
-                            <div style="font-size: 75px;color:green;line-height: 1;margin-bottom:20px">
-                                <i class="fad fa-check-circle"></i>
-                            </div>
-
-                            <h3 style="margin-top:0;">V4 import completed successfully with <strong>{{$ctrl.importIncompatibilityMessages.length}}</strong> incompatibility warning(s)</h3>
-
-                            <div style="height: 147px;">
-                                <div ng-hide="$ctrl.importIncompatibilityMessages.length < 1">
-                                    <eos-collapsable-panel show-label="Show incompatibility warnings" hide-label="Hide incompatibility warnings" hide-info-box="true">
-                                        <div class="incompat-warnings-wrapper">
-                                            <ul>
-                                                <li ng-repeat="message in $ctrl.importIncompatibilityMessages track by $index">{{message}}</li>
-                                            </ul>
-                                        </div>
-                                    </eos-collapsable-panel>
-                                </div>
-                             </div>
-
-                            <p style="font-size: 18px;font-weight: 100;">You're nearly there! Just a few more steps to go.</p>
-                            <button class="btn btn-info" ng-click="$ctrl.handleNext()">Continue</button>
-                        </div>
-
-
-                    </div>
-
-                    <div ng-switch-when="2" class="wave">
                         <p>
                             Firebot supports two different accounts:</br></br>
                             <b>Streamer</b> - the account you stream with <span class="muted">(Required)</span></br>
@@ -189,7 +88,7 @@
                         </div>
                     </div>
 
-                    <div ng-switch-when="3" class="wave">
+                    <div ng-switch-when="2" class="wave">
 
                         <p>The overlay is what allows Firebot to display images, videos, and more on your stream.</p>
 
@@ -217,7 +116,7 @@
                         </div>
                     </div>
 
-                    <div ng-switch-when="4" class="wave">
+                    <div ng-switch-when="3" class="wave">
                         <p>We love spotlighting the amazing interactive experiences<br />crafted by our community using Firebot.</p>
                         <p style="font-weight: 700;margin-top: 20px;">Would you like to be <a href="https:firebot.app/watch">featured on our website</a> during your live streams?</p>
                         <div style="margin-top: 20px;">
@@ -231,7 +130,7 @@
                         </div>
                     </div>
 
-                    <div ng-switch-when="5" class="slide-fade">
+                    <div ng-switch-when="4" class="slide-fade">
                         <div style="margin-top: 20px" class="animated fadeIn">
                             <img style="width: 80px; height: 80px" class="jump-infinite" src="../images/logo_transparent.png">
                         </div>
@@ -292,9 +191,8 @@
 
             $ctrl.stepTitles = [
                 "",
-                "Import V4 Data",
                 "Get Signed In",
-                "Lets Setup The Overlay",
+                "Let's Setup the Overlay",
                 "Feature Your Stream",
                 ""
             ];
@@ -326,29 +224,17 @@
             };
 
             $ctrl.getNextLabel = function() {
-                switch ($ctrl.step) {
-                    default:
-                        return "Next";
-                }
+                return "Next";
             };
 
             $ctrl.handlePrevious = function() {
-                switch ($ctrl.step) {
-                    case 2:
-                        $ctrl.step = 0;
-                        break;
-                    default:
-                        $ctrl.step -= $ctrl.isFirstStep() ? 0 : 1;
-                }
+                $ctrl.step -= $ctrl.isFirstStep() ? 0 : 1;
             };
 
             $ctrl.showNextButton = function() {
                 if ($ctrl.isFirstStep() || $ctrl.isLastStep()) {
                     return false;
                 }
-                if ($ctrl.step === 1) {
-                    return false;
-                }
                 return true;
             };
 
@@ -361,87 +247,21 @@
 
             $ctrl.canGoToNext = function() {
                 switch ($ctrl.step) {
-                    case 2:
+                    case 1:
                         return connectionService.accounts.streamer.loggedIn;
-                    case 3: {
+                    case 2: {
                         const overlayStatus = connectionManager.getOverlayStatus();
                         return !overlayStatus.serverStarted || overlayStatus.clientsConnected;
                     }
                 }
                 return true;
             };
-
-            $ctrl.v4DataDetected = false;
-            backendCommunicator.fireEventAsync("v4-data-check")
-                .then((detected) => {
-                    $ctrl.v4DataDetected = detected;
-                });
-
-            $ctrl.importSettings = {};
-
-            $ctrl.canStartImport = () => {
-                return $ctrl.importSettings.commands ||
-                $ctrl.importSettings.events ||
-                $ctrl.importSettings.viewerGroups ||
-                $ctrl.importSettings.hotkeys ||
-                $ctrl.importSettings.misc;
-            };
-
-            $ctrl.startImport = () => {
-                if (!$ctrl.canStartImport()) {
-                    return;
-                }
-
-                backendCommunicator.fireEvent("start-v4-import", $ctrl.importSettings);
-            };
-
-            $ctrl.importStarted = false;
-            $ctrl.currentlyImporting = null;
-            $ctrl.importCompleted = false;
-            $ctrl.importSuccess = false;
-            $ctrl.importIncompatibilityMessages = [];
-            $ctrl.importIncompatibilityMessageText = "";
-
-            backendCommunicator.on("v4-import-started", () => {
-                $ctrl.importStarted = true;
-            });
-
-            backendCommunicator.on("v4-import-update", (data) => {
-                $ctrl.currentlyImporting = data.importing;
-            });
-
-            backendCommunicator.on("v4-import-complete", (data) => {
-                $ctrl.importCompleted = true;
-                $ctrl.importStarted = false;
-                $ctrl.importSuccess = data.success;
-                $ctrl.importIncompatibilityMessages = data.incompatibilityWarnings;
-            });
-
             $ctrl.handleNext = async function(forceNext) {
                 if ($ctrl.isLastStep()) {
                     $ctrl.close();
                 } else {
-                    switch ($ctrl.step) {
-                        case 0:
-                            if ($ctrl.v4DataDetected) {
-                                $ctrl.step = 1;
-                            } else {
-                                $ctrl.step = 2;
-                            }
-                            return;
-                        case 1:
-                            $ctrl.step = 2;
-                            $ctrl.importCompleted = false;
-                            return;
-                        case 2:
-                        case 3:
-                        case 4: {
-                            if (!$ctrl.canGoToNext() && !forceNext) {
-                                return;
-                            }
-
-                            break;
-                        }
+                    if (!$ctrl.canGoToNext() && !forceNext) {
+                        return;
                     }
                     $ctrl.step += 1;
                 }
@@ -449,10 +269,10 @@
 
             $ctrl.getTooltipText = function() {
                 switch ($ctrl.step) {
-                    case 2:
+                    case 1:
                         return "Please sign into your Streamer account.";
-                    case 3:
-                        return "Please add the overlay url to your broadcasting software.";
+                    case 2:
+                        return "Please add the overlay URL to your broadcasting software.";
                 }
                 return "";
             };
@@ -498,12 +318,6 @@
                         }
                     });
             };
-
-            $ctrl.$onInit = function() {
-                // When the component is initialized
-                // This is where you can start to access bindings, such as variables stored in 'resolve'
-                // IE $ctrl.resolve.shouldDelete or whatever
-            };
         }
     });
-}());
+}());
\ No newline at end of file

From d24d9c9384603483d5b8473f8b11eacd6ecaf0f1 Mon Sep 17 00:00:00 2001
From: CKY <xx_cky_xx@hotmail.com>
Date: Wed, 25 Dec 2024 01:26:24 -0700
Subject: [PATCH 54/54] feat: add set currency command (#2925)

* feat: add set currency command

* fix capitalization

---------

Co-authored-by: CaveMobster <cavemobster@gmail.com>
---
 .../currency/currency-command-manager.ts      | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/backend/currency/currency-command-manager.ts b/src/backend/currency/currency-command-manager.ts
index 97dd385e4..fd1e2bee3 100644
--- a/src/backend/currency/currency-command-manager.ts
+++ b/src/backend/currency/currency-command-manager.ts
@@ -34,6 +34,7 @@ class CurrencyCommandManager {
         currencyBalanceMessageTemplate: string;
         whisperCurrencyBalanceMessage: boolean;
         addMessageTemplate: string;
+        setMessageTemplate: string;
         removeMessageTemplate: string;
         addAllMessageTemplate: string;
         removeAllMessageTemplate: string;
@@ -47,6 +48,7 @@ class CurrencyCommandManager {
             currencyBalanceMessageTemplate: string;
             whisperCurrencyBalanceMessage: boolean;
             addMessageTemplate: string;
+            setMessageTemplate: string;
             removeMessageTemplate: string;
             addAllMessageTemplate: string;
             removeAllMessageTemplate: string;
@@ -113,6 +115,14 @@ class CurrencyCommandManager {
                         tip: "Variables: {currency}, {amount}",
                         default: `Removed {amount} {currency} from everyone!`,
                         useTextArea: true
+                    },
+                    setMessageTemplate: {
+                        type: "string",
+                        title: "Set Currency Message Template",
+                        description: "How the !currency set message appears in chat.",
+                        tip: "Variables: {user}, {currency}, {amount}",
+                        default: `Set {user}'s {currency} to {amount} !`,
+                        useTextArea: true
                     }
                 },
                 subCommands: [
@@ -157,6 +167,24 @@ class CurrencyCommandManager {
                         usage: "give [@user] [amount]",
                         description: "Gives currency from one user to another user."
                     },
+                    {
+                        arg: "set",
+                        usage: "set [@user] [amount]",
+                        description: "Sets currency to the amount.",
+                        restrictionData: {
+                            restrictions: [
+                                {
+                                    id: "sys-cmd-mods-only-perms",
+                                    type: "firebot:permissions",
+                                    mode: "roles",
+                                    roleIds: [
+                                        "mod",
+                                        "broadcaster"
+                                    ]
+                                }
+                            ]
+                        }
+                    },
                     {
                         arg: "addall",
                         usage: "addall [amount]",
@@ -269,6 +297,28 @@ class CurrencyCommandManager {
 
                         break;
                     }
+                    case "set": {
+                        // Get username and make sure our currency amount is a positive integer.
+                        const username = args[1].replace(/^@/, ''),
+                            currencyAdjust = Math.abs(parseInt(args[2]));
+
+                        // Adjust currency, it will return true on success and false on failure.
+                        const status = await currencyManager.adjustCurrencyForViewer(username, currencyId, currencyAdjust, "set");
+
+                        if (status) {
+                            const setMessageTemplate = commandOptions.setMessageTemplate
+                                .replace("{user}", username)
+                                .replace("{currency}", currencyName)
+                                .replace("{amount}", util.commafy(currencyAdjust));
+                            await twitchChat.sendChatMessage(setMessageTemplate);
+                        } else {
+                            // Error removing currency.
+                            await twitchChat.sendChatMessage(`Error: Could not set currency for user.`);
+                            logger.error(`Error setting currency for user (${username}) via chat command. Currency: ${currencyId}. Value: ${currencyAdjust}`);
+                        }
+
+                        break;
+                    }
                     case "give": {
                         // Get username and make sure our currency amount is a positive integer.
                         const username = args[1].replace(/^@/, ''),