fix(ambient-mode): fix ambient-mode not working for videos after rest…

…art (th-ch#2294) * Fix Ambient Mode not working for videos after restart (th-ch#2255) This should fix th-ch#1641 * fix: fix waitForElement --------- Co-authored-by: craftgeil <[email protected]>
iryis · Aug 1, 2024 · a02e5df · a02e5df
1 parent eaf1a04
commit a02e5df
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 33 deletions.
diff --git a/src/plugins/album-actions/index.ts b/src/plugins/album-actions/index.ts
@@ -1,6 +1,7 @@
 import { t } from '@/i18n';
 import { createPlugin } from '@/utils';
 import { ElementFromHtml } from '@/plugins/utils/renderer';
+import { waitForElement } from '@/utils/wait-for-element';
 
 import undislikeHTML from './templates/undislike.html?raw';
 import dislikeHTML from './templates/dislike.html?raw';
@@ -16,7 +17,6 @@ export default createPlugin<
     changeObserver?: MutationObserver;
     waiting: boolean;
     onPageChange(): void;
-    waitForElem(selector: string): Promise<HTMLElement>;
     loadFullList: (event: MouseEvent) => void;
     applyToList(id: string, loader: HTMLElement): void;
     start(): void;
@@ -50,7 +50,7 @@ export default createPlugin<
       } else {
         this.waiting = true;
       }
-      const continuations = await this.waitForElem('#continuations');
+      const continuations = await waitForElement<HTMLElement>('#continuations');
       this.waiting = false;
       //Gets the for buttons
       const buttons: Array<HTMLElement> = [
@@ -183,16 +183,5 @@ export default createPlugin<
         button.remove();
       }
     },
-    waitForElem(selector: string) {
-      return new Promise((resolve) => {
-        const interval = setInterval(() => {
-          const elem = document.querySelector<HTMLElement>(selector);
-          if (!elem) return;
-
-          clearInterval(interval);
-          resolve(elem);
-        });
-      });
-    },
   },
 });
diff --git a/src/plugins/ambient-mode/index.ts b/src/plugins/ambient-mode/index.ts
@@ -4,6 +4,7 @@ import { t } from '@/i18n';
 import { createPlugin } from '@/utils';
 import { menu } from './menu';
 import { AmbientModePluginConfig } from './types';
+import { waitForElement } from '@/utils/wait-for-element';
 
 const defaultConfig: AmbientModePluginConfig = {
   enabled: false,
@@ -36,7 +37,7 @@ export default createPlugin({
     unregister: null as (() => void) | null,
     update: null as (() => void) | null,
     interval: null as NodeJS.Timeout | null,
-    lastMediaType: null as "video" | "image" | null,
+    lastMediaType: null as 'video' | 'image' | null,
     lastVideoSource: null as string | null,
     lastImageSource: null as string | null,
 
@@ -53,7 +54,8 @@ export default createPlugin({
       const songImage = document.querySelector<HTMLImageElement>('#song-image');
       const songVideo = document.querySelector<HTMLDivElement>('#song-video');
       const image = songImage?.querySelector<HTMLImageElement>('yt-img-shadow > img');
-      const video = songVideo?.querySelector<HTMLVideoElement>('.html5-video-container > video');
+      const video = await waitForElement<HTMLVideoElement>('.html5-video-container > video');
+
       const videoWrapper = document.querySelector('#song-video > .player-wrapper');
 
       const injectBlurImage = () => {
@@ -179,12 +181,12 @@ export default createPlugin({
       const isVideoMode = () => {
         const songVideo = document.querySelector<HTMLDivElement>('#song-video');
         if (!songVideo) {
-          this.lastMediaType = "image";
+          this.lastMediaType = 'image';
           return false;
         }
 
         const isVideo = getComputedStyle(songVideo).display !== 'none';
-        this.lastMediaType = isVideo ? "video" : "image";
+        this.lastMediaType = isVideo ? 'video' : 'image';
         return isVideo;
       };
 
@@ -196,16 +198,16 @@ export default createPlugin({
         if (isPageOpen) {
           const isVideo = isVideoMode();
           if (!force) {
-            if (this.lastMediaType === "video" && this.lastVideoSource === video?.src) return false;
-            if (this.lastMediaType === "image" && this.lastImageSource === image?.src) return false;
+            if (this.lastMediaType === 'video' && this.lastVideoSource === video?.src) return false;
+            if (this.lastMediaType === 'image' && this.lastImageSource === image?.src) return false;
           }
           this.unregister?.();
           this.unregister = (isVideo ? injectBlurVideo() : injectBlurImage()) ?? null;
         } else {
           this.unregister?.();
           this.unregister = null;
         }
-      }
+      };
 
       /* needed for switching between different views (e.g. miniplayer) */
       const observer = new MutationObserver((mutationsList) => {

diff --git a/src/plugins/skip-disliked-songs/index.ts b/src/plugins/skip-disliked-songs/index.ts
@@ -1,12 +1,12 @@
 import { t } from '@/i18n';
 import { createPlugin } from '@/utils';
+import { waitForElement } from '@/utils/wait-for-element';
 
 export default createPlugin<
   unknown,
   unknown,
   {
     observer?: MutationObserver;
-    waitForElem(selector: string): Promise<HTMLElement>;
     start(): void;
     stop(): void;
   }
@@ -15,19 +15,8 @@ export default createPlugin<
   description: () => t('plugins.skip-disliked-songs.description'),
   restartNeeded: false,
   renderer: {
-    waitForElem(selector: string) {
-      return new Promise<HTMLElement>((resolve) => {
-        const interval = setInterval(() => {
-          const elem = document.querySelector<HTMLElement>(selector);
-          if (!elem) return;
-
-          clearInterval(interval);
-          resolve(elem);
-        });
-      });
-    },
     start() {
-      this.waitForElem('#dislike-button-renderer').then((dislikeBtn) => {
+      waitForElement<HTMLElement>('#dislike-button-renderer').then((dislikeBtn) => {
         this.observer = new MutationObserver(() => {
           if (dislikeBtn?.getAttribute('like-status') == 'DISLIKE') {
             document

diff --git a/src/utils/wait-for-element.ts b/src/utils/wait-for-element.ts
@@ -0,0 +1,11 @@
+export const waitForElement = <T extends Element>(selector: string): Promise<T> => {
+  return new Promise<T>((resolve) => {
+    const interval = setInterval(() => {
+      const elem = document.querySelector<T>(selector);
+      if (!elem) return;
+
+      clearInterval(interval);
+      resolve(elem);
+    });
+  });
+};