From 0b5ea5ed8959a6b4eb4c1ea406aaa56313c9c907 Mon Sep 17 00:00:00 2001 From: pixeltris <6952411+pixeltris@users.noreply.github.com> Date: Thu, 13 Feb 2025 21:36:34 +0000 Subject: [PATCH] Fix conflict with TwitchNoSub (0.9.1) --- vaft/vaft-ublock-origin.js | 17 ++++------------- vaft/vaft.user.js | 19 +++++-------------- .../video-swap-new-ublock-origin.js | 17 ++++------------- video-swap-new/video-swap-new.user.js | 19 +++++-------------- 4 files changed, 18 insertions(+), 54 deletions(-) diff --git a/vaft/vaft-ublock-origin.js b/vaft/vaft-ublock-origin.js index e241cee..4c7b890 100644 --- 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 index 2e3b810..66271fa 100644 --- 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 index 97e977e..a488544 100644 --- 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 index 5f0c4c4..3bb69ab 100644 --- 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;