Fix clip page breaking extension

Closes #204
ajayyy · Dec 20, 2023 · 5e0367a · 5e0367a
1 parent cd9f70b
commit 5e0367a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/maze-utils b/maze-utils
diff --git a/src/video.ts b/src/video.ts
@@ -94,7 +94,8 @@ export function setupCBVideoModule(): void {
         resetValues,
         windowListenerHandler,
         newVideosLoaded,
-        documentScript: chrome.runtime.getManifest().manifest_version === 2 ? documentScript : undefined
+        documentScript: chrome.runtime.getManifest().manifest_version === 2 ? documentScript : undefined,
+        allowClipPage: true
     }, () => Config);
 
     if (onMobile()) {

diff --git a/src/videoBranding/videoBranding.ts b/src/videoBranding/videoBranding.ts
@@ -60,18 +60,19 @@ const threeRingLogo = chrome.runtime.getURL("icons/logo.svg");
 const videoBrandingInstances: Record<VideoID, VideoBrandingInstance> = {}
 
 export async function replaceCurrentVideoBranding(): Promise<[boolean, boolean]> {
-    const onWatchPage = document.URL.includes("/watch");
+    const onClipPage = document.URL.includes("/clip/");
+    const onWatchPage = document.URL.includes("/watch") || onClipPage;
     const onEmbedPage = document.URL.includes("/embed/");
     const possibleSelectors = getPossibleSelectors(onWatchPage, onEmbedPage);
 
     // Find first invisible one, or wait for the first one to be visible
     const mainTitle = possibleSelectors.map((selector) => getElement(selector.selector, selector.checkVisibility) as HTMLElement).filter((element) => isVisible(element))[0] || 
-        await waitForElement(possibleSelectors[0].selector, true) as HTMLElement;
-    const titles = (possibleSelectors.map((selector) => getElement(selector.selector, selector.checkVisibility)).filter((e) => !!e)) as HTMLElement[];
+        await waitForElement(possibleSelectors[0].selector, !onClipPage) as HTMLElement;
+    const titles = (possibleSelectors.map((selector) => getElement(selector.selector, selector.checkVisibility && !onClipPage)).filter((e) => !!e)) as HTMLElement[];
     const promises: [Promise<boolean>, Promise<boolean>] = [Promise.resolve(false), Promise.resolve(false)]
     const videoID = getVideoID();
 
-    if (videoID !== null && isVisible(mainTitle)) {
+    if (videoID !== null && (isVisible(mainTitle) || onClipPage)) {
         const videoBrandingInstance = getAndUpdateVideoBrandingInstances(videoID,
             async () => { await replaceCurrentVideoBranding(); });
         const brandingLocation = BrandingLocation.Watch;