fix(widgets): infinite load on Media Share and Emote Wall (#5273)

* fix: emote wall widget and custom code/fields * fix(widgets): media share widget infinite load
stream-labs · Jan 7, 2025 · 9761254 · 9761254
1 parent b14a448
commit 9761254
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/app/components-react/widgets/common/useWidget.tsx b/app/components-react/widgets/common/useWidget.tsx
@@ -293,7 +293,7 @@ export class WidgetModule<TWidgetState extends IWidgetState = IWidgetState> {
     ]);
 
     this.setStaticConfig(staticConfig);
-    if (staticConfig) {
+    if (staticConfig?.data?.custom_code) {
       // I miss lenses
       const makeLenses = (type: 'html' | 'css' | 'js') => {
         const prop = `custom_${type}`;

diff --git a/app/components/widgets/WidgetSettings.vue.ts b/app/components/widgets/WidgetSettings.vue.ts
@@ -59,6 +59,7 @@ export default class WidgetSettings<
       this.requestState = 'success';
       this.afterFetch();
     } catch (e: unknown) {
+      console.error('Something failed on widget settings fetch', e);
       this.requestState = 'fail';
     }
   }

diff --git a/app/services/widgets/settings/emote-wall.ts b/app/services/widgets/settings/emote-wall.ts
@@ -36,8 +36,8 @@ export class EmoteWallService extends WidgetSettingsService<IEmoteWallData> {
       dataFetchUrl: `https://${this.getHost()}/api/v5/slobs/widget/emote-wall`,
       settingsSaveUrl: `https://${this.getHost()}/api/v5/slobs/widget/emote-wall`,
       settingsUpdateEvent: 'emoteWallSettingsUpdate',
-      customCodeAllowed: true,
-      customFieldsAllowed: true,
+      customCodeAllowed: false,
+      customFieldsAllowed: false,
       hasTestButtons: true,
     };
   }

diff --git a/app/services/widgets/settings/widget-settings.ts b/app/services/widgets/settings/widget-settings.ts
@@ -140,7 +140,7 @@ export abstract class WidgetSettingsService<TWidgetData extends IWidgetData>
 
     // TODO: type
     const { staticConfig }: any = this.state;
-    if (staticConfig) {
+    if (staticConfig?.data?.custom_code) {
       // These seem only used to restore defaults
       data.custom_defaults = staticConfig.data?.custom_code;
       // If we have a default for custom code and the fields are empty in the

diff --git a/app/services/widgets/widgets-config.ts b/app/services/widgets/widgets-config.ts
@@ -150,8 +150,8 @@ export function getWidgetsConfig(
       dataFetchUrl: `https://${host}/api/v5/slobs/widget/emote-wall`,
       settingsSaveUrl: `https://${host}/api/v5/slobs/widget/emote-wall`,
       settingsUpdateEvent: 'emoteWallSettingsUpdate',
-      customCodeAllowed: true,
-      customFieldsAllowed: true,
+      customCodeAllowed: false,
+      customFieldsAllowed: false,
     },
 
     // TODO: