From f48c57b1c5368aa29d04ac0b37cd427f96206583 Mon Sep 17 00:00:00 2001
From: mini-bomba <55105495+mini-bomba@users.noreply.github.com>
Date: Thu, 13 Jun 2024 01:08:12 +0200
Subject: Don't inject into the cookie rotate iframe

There's nothing there, it only breaks the refreshing.
---
 manifest/manifest.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifest/manifest.json b/manifest/manifest.json
index 5a513095..2ebf3cd3 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -11,6 +11,9 @@
             "https://*.youtube.com/*",
             "https://www.youtube-nocookie.com/embed/*"
         ],
+        "exclude_matches": [
+            "https://accounts.youtube.com/RotateCookiesPage*"
+        ],
         "all_frames": true,
         "js": [
             "./js/content.js"
-- 
cgit v1.2.3


From 0b946d5ef724cae59347ac089cca9f7f3615062c Mon Sep 17 00:00:00 2001
From: mini-bomba <55105495+mini-bomba@users.noreply.github.com>
Date: Thu, 13 Jun 2024 01:18:02 +0200
Subject: Don't fetch segments when videoID is null

Also log an error to the console if we ever try to do this in the future
---
 src/content.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/content.ts b/src/content.ts
index 226caba7..2218aa61 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -264,7 +264,9 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
             // it will assume the page is not a video page and stop the refresh animation
             sendResponse({ hasVideo: getVideoID() != null });
             // fetch segments
-            sponsorsLookup(false);
+            if (getVideoID()) {
+                sponsorsLookup(false);
+            }
 
             break;
         case "unskip":
@@ -1115,7 +1117,12 @@ async function sponsorsLookup(keepOldSubmissions = true) {
     const hashParams = getHashParams();
     if (hashParams.requiredSegment) extraRequestData.requiredSegment = hashParams.requiredSegment;
 
-    const hashPrefix = (await getHash(getVideoID(), 1)).slice(0, 4) as VideoID & HashedValue;
+    const videoID = getVideoID()
+    if (!videoID) {
+        console.error("[SponsorBlock] Attempted to fetch segments with a null/undefined videoID.");
+        return;
+    }
+    const hashPrefix = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
     const response = await asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
         categories,
         actionTypes: getEnabledActionTypes(),
@@ -2733,4 +2740,4 @@ function checkForMiniplayerPlaying() {
             }
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3