Re-sync with pixeltris/TwitchAdSolutions@0863c6

brave · Aug 21, 2024 · 57c6f96 · 57c6f96
1 parent 5cd5372
commit 57c6f96
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 48 deletions.
diff --git a/resources/vaft-ublock-origin.js b/resources/vaft-ublock-origin.js
@@ -811,27 +811,7 @@
             return realFetch.apply(this, arguments);
         };
     }
-    function isWorkerIntact() {
-        // Taken from Adguard Extra
-        const iframe = window.document.createElement('iframe');
-        window.document.body.append(iframe);
-        const cleanWindow = iframe.contentWindow;
-        if (cleanWindow.Worker.toString() === window.Worker.toString()) {
-            iframe.remove();
-            return true;
-        }
-        iframe.remove();
-        return false;
-    }
     function onContentLoaded() {
-        if (!isWorkerIntact()) {
-            console.log('Twitch Worker is already hooked');
-            return;
-        }
-        window.reloadTwitchPlayer = reloadTwitchPlayer;
-        declareOptions(window);
-        hookWindowWorker();
-        hookFetch();
         // This stops Twitch from pausing the player when in another tab and an ad shows.
         // Taken from https://github.com/saucettv/VideoAdBlockForTwitch/blob/cefce9d2b565769c77e3666ac8234c3acfe20d83/chrome/content.js#L30
         try {
@@ -873,11 +853,19 @@
             }
         }catch{}
     }
-    if (document.readyState === "complete" || document.readyState === "loaded" || document.readyState === "interactive") {
-        onContentLoaded();
+    if (window.Worker.toString().includes('twitch')) {
+        console.log('Twitch Worker is already hooked');
     } else {
-        window.addEventListener("DOMContentLoaded", function() {
+        window.reloadTwitchPlayer = reloadTwitchPlayer;
+        declareOptions(window);
+        hookWindowWorker();
+        hookFetch();
+        if (document.readyState === "complete" || document.readyState === "loaded" || document.readyState === "interactive") {
             onContentLoaded();
-        });
+        } else {
+            window.addEventListener("DOMContentLoaded", function() {
+                onContentLoaded();
+            });
+        }
     }
 })();
diff --git a/resources/video-swap-new-ublock-origin.js b/resources/video-swap-new-ublock-origin.js
@@ -580,27 +580,7 @@
             localStorage.setItem(lsKeyVolume, currentVolumeLS);
         }, 3000);
     }
-    function isWorkerIntact() {
-        // Taken from Adguard Extra
-        const iframe = window.document.createElement('iframe');
-        window.document.body.append(iframe);
-        const cleanWindow = iframe.contentWindow;
-        if (cleanWindow.Worker.toString() === window.Worker.toString()) {
-            iframe.remove();
-            return true;
-        }
-        iframe.remove();
-        return false;
-    }
     function onContentLoaded() {
-        if (!isWorkerIntact()) {
-            console.log('Twitch Worker is already hooked');
-            return;
-        }
-        window.reloadTwitchPlayer = reloadTwitchPlayer;
-        declareOptions(window);
-        hookWindowWorker();
-        hookFetch();
         // This stops Twitch from pausing the player when in another tab and an ad shows.
         // Taken from https://github.com/saucettv/VideoAdBlockForTwitch/blob/cefce9d2b565769c77e3666ac8234c3acfe20d83/chrome/content.js#L30
         try {
@@ -668,11 +648,19 @@
             return realGetItem.apply(this, arguments);
         };
     }
-    if (document.readyState === "complete" || document.readyState === "loaded" || document.readyState === "interactive") {
-        onContentLoaded();
+    if (window.Worker.toString().includes('twitch')) {
+        console.log('Twitch Worker is already hooked');
     } else {
-        window.addEventListener("DOMContentLoaded", function() {
+        window.reloadTwitchPlayer = reloadTwitchPlayer;
+        declareOptions(window);
+        hookWindowWorker();
+        hookFetch();
+        if (document.readyState === "complete" || document.readyState === "loaded" || document.readyState === "interactive") {
             onContentLoaded();
-        });
+        } else {
+            window.addEventListener("DOMContentLoaded", function() {
+                onContentLoaded();
+            });
+        }
     }
 })();