Fix conflicts with other solutions #282

pixeltris · Sep 24, 2024 · 69f098d · 69f098d
1 parent 055e1ad
commit 69f098d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/vaft/vaft-ublock-origin.js b/vaft/vaft-ublock-origin.js
@@ -27,12 +27,16 @@ twitch-videoad.js text/javascript
     var IsPlayerAutoQuality = null;
     const oldWorker = window.Worker;
     function hookWindowWorker() {
-        window.Worker = class Worker extends oldWorker {
+        var newWorker = window.Worker = class Worker extends oldWorker {
             constructor(twitchBlobUrl, options) {
                 var isTwitchWorker = false;
                 try {
                     isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv');
                 } catch {}
+                if (newWorker.toString() !== window.Worker.toString()) {
+                    console.log('Multiple twitch adblockers installed. Skipping Worker hook (vaft)');
+                    isTwitchWorker = false;
+                }
                 if (!isTwitchWorker) {
                     super(twitchBlobUrl, options);
                     return;

diff --git a/vaft/vaft.user.js b/vaft/vaft.user.js
@@ -39,12 +39,16 @@
     var IsPlayerAutoQuality = null;
     const oldWorker = window.Worker;
     function hookWindowWorker() {
-        window.Worker = class Worker extends oldWorker {
+        var newWorker = window.Worker = class Worker extends oldWorker {
             constructor(twitchBlobUrl, options) {
                 var isTwitchWorker = false;
                 try {
                     isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv');
                 } catch {}
+                if (newWorker.toString() !== window.Worker.toString()) {
+                    console.log('Multiple twitch adblockers installed. Skipping Worker hook (vaft)');
+                    isTwitchWorker = false;
+                }
                 if (!isTwitchWorker) {
                     super(twitchBlobUrl, options);
                     return;

diff --git a/video-swap-new/video-swap-new-ublock-origin.js b/video-swap-new/video-swap-new-ublock-origin.js
@@ -26,12 +26,16 @@ twitch-videoad.js text/javascript
     var twitchWorkers = [];
     const oldWorker = window.Worker;
     function hookWindowWorker() {
-        window.Worker = class Worker extends oldWorker {
+        var newWorker = window.Worker = class Worker extends oldWorker {
             constructor(twitchBlobUrl, options) {
                 var isTwitchWorker = false;
                 try {
                     isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv');
                 } catch {}
+                if (newWorker.toString() !== window.Worker.toString()) {
+                    console.log('Multiple twitch adblockers installed. Skipping Worker hook (video-swap-new)');
+                    isTwitchWorker = false;
+                }
                 if (!isTwitchWorker) {
                     super(twitchBlobUrl, options);
                     return;

diff --git a/video-swap-new/video-swap-new.user.js b/video-swap-new/video-swap-new.user.js
@@ -38,12 +38,16 @@
     var twitchWorkers = [];
     const oldWorker = window.Worker;
     function hookWindowWorker() {
-        window.Worker = class Worker extends oldWorker {
+        var newWorker = window.Worker = class Worker extends oldWorker {
             constructor(twitchBlobUrl, options) {
                 var isTwitchWorker = false;
                 try {
                     isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv');
                 } catch {}
+                if (newWorker.toString() !== window.Worker.toString()) {
+                    console.log('Multiple twitch adblockers installed. Skipping Worker hook (video-swap-new)');
+                    isTwitchWorker = false;
+                }
                 if (!isTwitchWorker) {
                     super(twitchBlobUrl, options);
                     return;