Merge pull request #2752 from crowbartools/v5

v5.63.2
crowbartools · Aug 27, 2024 · 98a7760 · 98a7760
2 parents 203523b + 48c6877
commit 98a7760
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "firebotv5",
-    "version": "5.63.1",
+    "version": "5.63.2",
     "description": "Powerful all-in-one bot for Twitch streamers.",
     "main": "build/main.js",
     "scripts": {

diff --git a/src/backend/chat/chat-listeners/twitch-chat-listeners.js b/src/backend/chat/chat-listeners/twitch-chat-listeners.js
@@ -202,7 +202,7 @@ exports.setupChatListeners = (streamerChatClient, botChatClient) => {
         } catch (error) {
             logger.error("Failed to parse resub message", error);
         }
-        viewerDatabase.calculateAutoRanksByName(subInfo.userId);
+        viewerDatabase.calculateAutoRanks(subInfo.userId);
     });
 
     streamerChatClient.onCommunitySub((_channel, _user, subInfo) => {
@@ -225,7 +225,7 @@ exports.setupChatListeners = (streamerChatClient, botChatClient) => {
             subInfo.months,
             subInfo.streak ?? 1
         );
-        viewerDatabase.calculateAutoRanksByName(subInfo.userId);
+        viewerDatabase.calculateAutoRanks(subInfo.userId);
     });
 
     streamerChatClient.onGiftPaidUpgrade((_channel, _user, subInfo, msg) => {
@@ -236,7 +236,7 @@ exports.setupChatListeners = (streamerChatClient, botChatClient) => {
             subInfo.gifterDisplayName,
             subInfo.plan
         );
-        viewerDatabase.calculateAutoRanksByName(subInfo.userId);
+        viewerDatabase.calculateAutoRanks(subInfo.userId);
     });
 
     streamerChatClient.onPrimePaidUpgrade((_channel, _user, subInfo, msg) => {
@@ -246,6 +246,6 @@ exports.setupChatListeners = (streamerChatClient, botChatClient) => {
             subInfo.displayName,
             subInfo.plan
         );
-        viewerDatabase.calculateAutoRanksByName(subInfo.userId);
+        viewerDatabase.calculateAutoRanks(subInfo.userId);
     });
 };
diff --git a/src/backend/common/user-access.js b/src/backend/common/user-access.js
@@ -1,6 +1,5 @@
 "use strict";
 
-const viewerDatabase = require("../viewers/viewer-database");
 const accountAccess = require("../common/account-access");
 const NodeCache = require('node-cache');
 const twitchApi = require("../twitch-api/api");
@@ -57,6 +56,8 @@ async function userFollowsChannels(username, channelNames, durationInSeconds = 0
 
 async function getUserDetails(userId) {
 
+    const viewerDatabase = require("../viewers/viewer-database");
+
     await viewerDatabase.calculateAutoRanks(userId);
 
     const firebotUserData = await viewerDatabase.getViewerById(userId);

diff --git a/src/backend/integrations/builtin/obs/obs-remote.ts b/src/backend/integrations/builtin/obs/obs-remote.ts
@@ -174,7 +174,8 @@ async function setupRemoteListeners() {
         );
     });
 
-    obs.on("SceneTransitionStarted", ({ transitionName }) => {
+    obs.on("SceneTransitionStarted", async ({ transitionName }) => {
+        programSceneName = (await obs.call("GetCurrentProgramScene"))?.sceneName || "";
         eventManager?.triggerEvent(
             OBS_EVENT_SOURCE_ID,
             OBS_SCENE_TRANSITION_STARTED_EVENT_ID,
@@ -194,16 +195,6 @@ async function setupRemoteListeners() {
         );
     });
 
-    obs.on("CurrentProgramSceneChanged", ({ sceneName }) => {
-        eventManager?.triggerEvent(
-            OBS_EVENT_SOURCE_ID,
-            OBS_CURRENT_PROGRAM_SCENE_CHANGED_EVENT_ID,
-            {
-                sceneName
-            }
-        );
-    });
-
     obs.on("CurrentSceneTransitionChanged", ({ transitionName }) => {
         eventManager?.triggerEvent(
             OBS_EVENT_SOURCE_ID,

diff --git a/src/gui/app/directives/misc/replaceVariableMenu.js b/src/gui/app/directives/misc/replaceVariableMenu.js
@@ -175,7 +175,7 @@
                     let wrapper = parent;
                     if (!parent.hasClass("input-group")) {
                         wrapper = angular.element(`
-                            <div style="position: relative;display: table; width: 100%;"></div>`
+                            <div style="position: relative;"></div>`
                         );
                         const compiled = $compile(wrapper)(scope);
                         element.wrap(compiled);