Move more thumbnail logic to lib

src/content.ts

@@ -41,8 +41,8 @@ import { StorageChangesObject } from "@ajayyy/maze-utils/lib/config";
 import { findValidElement } from "@ajayyy/maze-utils/lib/dom"
 import { getHash, HashedValue } from "@ajayyy/maze-utils/lib/hash";
 import { generateUserID } from "@ajayyy/maze-utils/lib/setup";
-import { setThumbnailListener, updateAll } from "@ajayyy/maze-utils/lib/thumbnailManagement";
-import { labelThumbnails, setupThumbnailPageLoadListener } from "./utils/thumbnails";
+import { updateAll } from "@ajayyy/maze-utils/lib/thumbnailManagement";
+import { setupThumbnailListener } from "./utils/thumbnails";
 import * as documentScript from "../dist/js/document.js";
 
 const utils = new Utils();
@@ -113,8 +113,7 @@ setupVideoModule({
     resetValues,
     documentScript
 }, () => Config);
-setThumbnailListener(labelThumbnails);
-setupThumbnailPageLoadListener();
+setupThumbnailListener();
 
 //the video id of the last preview bar update
 let lastPreviewBarUpdate: VideoID;

src/utils/thumbnails.ts

@@ -1,8 +1,7 @@
-import { waitFor } from "@ajayyy/maze-utils";
-import { newThumbnails } from "@ajayyy/maze-utils/lib/thumbnailManagement";
 import { isOnInvidious, parseYouTubeVideoIDFromURL } from "@ajayyy/maze-utils/lib/video";
 import Config from "../config";
 import { getVideoLabel } from "./videoLabels";
+import { setThumbnailListener } from "@ajayyy/maze-utils/lib/thumbnailManagement";
 
 export async function labelThumbnails(thumbnails: HTMLImageElement[]): Promise<void> {
     await Promise.all(thumbnails.map((t) => labelThumbnail(t)));
@@ -109,23 +108,8 @@ function insertSBIconDefinition() {
     document.body.appendChild(container.children[0]);
 }
 
-export function setupThumbnailPageLoadListener(): void {
-    const onLoad = () => {
+export function setupThumbnailListener(): void {
+    setThumbnailListener(labelThumbnails, () => {
         insertSBIconDefinition();
-
-        // Label thumbnails on load if on Invidious (wait for variable initialization before checking)
-        waitFor(() => isOnInvidious() !== null).then(() => {
-            if (isOnInvidious()) newThumbnails();
-        });
-    };
-
-    if (document.readyState === "complete") {
-        onLoad();
-    } else {
-        window.addEventListener("load", onLoad);
-    }
-
-    waitFor(() => Config.isReady(), 5000, 10).then(() => {
-        newThumbnails();
-    });
+    }, () => Config.isReady());
 }