From c3b357830d539fbd45a259f36bc84f88398fd5c4 Mon Sep 17 00:00:00 2001 From: CKY- Date: Sat, 16 Mar 2024 02:27:03 -0600 Subject: [PATCH] Fix: toggle connection effect --- .../app-management/electron/window-management.js | 4 ++-- src/backend/effects/builtin/toggle-connection.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/backend/app-management/electron/window-management.js b/src/backend/app-management/electron/window-management.js index d063bf555..f08199b45 100644 --- a/src/backend/app-management/electron/window-management.js +++ b/src/backend/app-management/electron/window-management.js @@ -435,7 +435,7 @@ async function createMainWindow() { ); // wait for the main window's content to load, then show it - mainWindow.webContents.on("did-finish-load", () => { + mainWindow.webContents.on("did-finish-load", async () => { createTray(mainWindow); @@ -449,7 +449,7 @@ async function createMainWindow() { } const startupScriptsManager = require("../../common/handlers/custom-scripts/startup-scripts-manager"); - startupScriptsManager.runStartupScripts(); + await startupScriptsManager.runStartupScripts(); const eventManager = require("../../events/EventManager"); eventManager.triggerEvent("firebot", "firebot-started", { diff --git a/src/backend/effects/builtin/toggle-connection.js b/src/backend/effects/builtin/toggle-connection.js index d6e0a9e10..e8ec2667f 100644 --- a/src/backend/effects/builtin/toggle-connection.js +++ b/src/backend/effects/builtin/toggle-connection.js @@ -72,12 +72,12 @@ const toggleConnection = { $scope.effect.services = []; } - $scope.serviceIsSelected = (serviceId) => $scope.effect.services.some(s => s.id === serviceId); + $scope.serviceIsSelected = serviceId => $scope.effect.services.some(s => s.id === serviceId); $scope.toggleServiceSelected = (serviceId) => { if ($scope.serviceIsSelected(serviceId)) { $scope.effect.services = $scope.effect.services.filter( - (s) => s.id !== serviceId + s => s.id !== serviceId ); } else { $scope.effect.services.push({ @@ -92,7 +92,7 @@ const toggleConnection = { action ) => { const service = $scope.effect.services.find( - (s) => s.id === serviceId + s => s.id === serviceId ); if (service != null) { service.action = action; @@ -101,7 +101,7 @@ const toggleConnection = { $scope.getConnectionActionDisplay = (serviceId) => { const service = $scope.effect.services.find( - (s) => s.id === serviceId + s => s.id === serviceId ); if (service == null) { return ""; @@ -153,7 +153,7 @@ const toggleConnection = { .getAllIntegrationDefinitions() .filter(i => integrationManager.integrationIsConnectable(i.id)) .map(i => ({ - id: i.id, + id: `integration.${i.id}`, action: effect.allAction })) ];