Fix conflict with TwitchNoSub (0.9.1)

pixeltris · Feb 13, 2025 · 0b5ea5e · 0b5ea5e
1 parent ea9a01e
commit 0b5ea5e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 54 deletions.
diff --git a/vaft/vaft-ublock-origin.js b/vaft/vaft-ublock-origin.js
@@ -34,22 +34,13 @@ twitch-videoad.js text/javascript
     var IsPlayerAutoQuality = null;
     var workerStringConflicts = [
         'twitch',
-        'isVariantA',// TwitchNoSub
-        'besuper/'// TwitchNoSub (0.9)
+        'isVariantA'// TwitchNoSub
     ];
     var workerStringAllow = [];
-    //
-    // TwitchNoSub (userscript) conflicts in this scenario:
-    // - TwitchAdSolutions : TwitchNoSub : window.Worker
-    //
-    // But it's fine in this scenario:
-    // - TwitchNoSub : TwitchAdSolutions : window.Worker
-    //
-    // This is because their script ignores the incoming blob (our script) and replaces it with their own importScripts call
-    // To fix this we scoop out TwitchNoSub and re-insert it so that it inherits from our worker
     var workerStringReinsert = [
-        'isVariantA',// TwitchNoSub
-        'besuper/'// TwitchNoSub (0.9)
+        'isVariantA',// TwitchNoSub (prior to (0.9))
+        'besuper/',// TwitchNoSub (0.9)
+        '${patch_url}'// TwitchNoSub (0.9.1)
     ];
     function getCleanWorker(worker) {
         var root = null;

diff --git a/vaft/vaft.user.js b/vaft/vaft.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         TwitchAdSolutions (vaft)
 // @namespace    https://github.com/pixeltris/TwitchAdSolutions
-// @version      16.0.0
+// @version      17.0.0
 // @description  Multiple solutions for blocking Twitch ads (vaft)
 // @updateURL    https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js
 // @downloadURL  https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js
@@ -46,22 +46,13 @@
     var IsPlayerAutoQuality = null;
     var workerStringConflicts = [
         'twitch',
-        'isVariantA',// TwitchNoSub
-        'besuper/'// TwitchNoSub (0.9)
+        'isVariantA'// TwitchNoSub
     ];
     var workerStringAllow = [];
-    //
-    // TwitchNoSub (userscript) conflicts in this scenario:
-    // - TwitchAdSolutions : TwitchNoSub : window.Worker
-    //
-    // But it's fine in this scenario:
-    // - TwitchNoSub : TwitchAdSolutions : window.Worker
-    //
-    // This is because their script ignores the incoming blob (our script) and replaces it with their own importScripts call
-    // To fix this we scoop out TwitchNoSub and re-insert it so that it inherits from our worker
     var workerStringReinsert = [
-        'isVariantA',// TwitchNoSub
-        'besuper/'// TwitchNoSub (0.9)
+        'isVariantA',// TwitchNoSub (prior to (0.9))
+        'besuper/',// TwitchNoSub (0.9)
+        '${patch_url}'// TwitchNoSub (0.9.1)
     ];
     function getCleanWorker(worker) {
         var root = null;

diff --git a/video-swap-new/video-swap-new-ublock-origin.js b/video-swap-new/video-swap-new-ublock-origin.js
@@ -33,22 +33,13 @@ twitch-videoad.js text/javascript
     var twitchWorkers = [];
     var workerStringConflicts = [
         'twitch',
-        'isVariantA',// TwitchNoSub
-        'besuper/'// TwitchNoSub (0.9)
+        'isVariantA'// TwitchNoSub
     ];
     var workerStringAllow = [];
-    //
-    // TwitchNoSub (userscript) conflicts in this scenario:
-    // - TwitchAdSolutions : TwitchNoSub : window.Worker
-    //
-    // But it's fine in this scenario:
-    // - TwitchNoSub : TwitchAdSolutions : window.Worker
-    //
-    // This is because their script ignores the incoming blob (our script) and replaces it with their own importScripts call
-    // To fix this we scoop out TwitchNoSub and re-insert it so that it inherits from our worker
     var workerStringReinsert = [
-        'isVariantA',// TwitchNoSub
-        'besuper/'// TwitchNoSub (0.9)
+        'isVariantA',// TwitchNoSub (prior to (0.9))
+        'besuper/',// TwitchNoSub (0.9)
+        '${patch_url}'// TwitchNoSub (0.9.1)
     ];
     function getCleanWorker(worker) {
         var root = null;

diff --git a/video-swap-new/video-swap-new.user.js b/video-swap-new/video-swap-new.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         TwitchAdSolutions (video-swap-new)
 // @namespace    https://github.com/pixeltris/TwitchAdSolutions
-// @version      1.34
+// @version      1.35
 // @updateURL    https://github.com/pixeltris/TwitchAdSolutions/raw/master/video-swap-new/video-swap-new.user.js
 // @downloadURL  https://github.com/pixeltris/TwitchAdSolutions/raw/master/video-swap-new/video-swap-new.user.js
 // @description  Multiple solutions for blocking Twitch ads (video-swap-new)
@@ -45,22 +45,13 @@
     var twitchWorkers = [];
     var workerStringConflicts = [
         'twitch',
-        'isVariantA',// TwitchNoSub
-        'besuper/'// TwitchNoSub (0.9)
+        'isVariantA'// TwitchNoSub
     ];
     var workerStringAllow = [];
-    //
-    // TwitchNoSub (userscript) conflicts in this scenario:
-    // - TwitchAdSolutions : TwitchNoSub : window.Worker
-    //
-    // But it's fine in this scenario:
-    // - TwitchNoSub : TwitchAdSolutions : window.Worker
-    //
-    // This is because their script ignores the incoming blob (our script) and replaces it with their own importScripts call
-    // To fix this we scoop out TwitchNoSub and re-insert it so that it inherits from our worker
     var workerStringReinsert = [
-        'isVariantA',// TwitchNoSub
-        'besuper/'// TwitchNoSub (0.9)
+        'isVariantA',// TwitchNoSub (prior to (0.9))
+        'besuper/',// TwitchNoSub (0.9)
+        '${patch_url}'// TwitchNoSub (0.9.1)
     ];
     function getCleanWorker(worker) {
         var root = null;