TwitchAdSolutions
Code Issues

Fix conflict with TwitchNoSub (0.9.1)

Browse Source
This commit is contained in:
pixeltris
2025-02-13 21:36:34 +00:00
parent ea9a01eb45
commit 0b5ea5ed89
4 changed files with 18 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vaft/vaft-ublock-origin.js
+4 -13
View File
@@ -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;
vaft/vaft.user.js
+5 -14
View File
@@ -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;