Mirrors/TwitchAdSolutions
1
0
Fork 0
mirror of https://github.com/pixeltris/TwitchAdSolutions.git synced 2025-04-29 14:14:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vaft/vaft-ublock-origin.js
View File

@ -34,22 +34,13 @@ twitch-videoad.js text/javascript
var IsPlayerAutoQuality = null; var IsPlayerAutoQuality = null;
var workerStringConflicts = [ var workerStringConflicts = [
'twitch', 'twitch',
'isVariantA',// TwitchNoSub 'isVariantA'// TwitchNoSub
'besuper/'// TwitchNoSub (0.9)
]; ];
var workerStringAllow = []; 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 = [ var workerStringReinsert = [
'isVariantA',// TwitchNoSub 'isVariantA',// TwitchNoSub (prior to (0.9))
'besuper/'// TwitchNoSub (0.9) 'besuper/',// TwitchNoSub (0.9)
'${patch_url}'// TwitchNoSub (0.9.1)
]; ];
function getCleanWorker(worker) { function getCleanWorker(worker) {
var root = null; var root = null;

19
vaft/vaft.user.js
View File

@ -1,7 +1,7 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions (vaft) // @name TwitchAdSolutions (vaft)
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 16.0.0 // @version 17.0.0
// @description Multiple solutions for blocking Twitch ads (vaft) // @description Multiple solutions for blocking Twitch ads (vaft)
// @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js
// @downloadURL 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 IsPlayerAutoQuality = null;
var workerStringConflicts = [ var workerStringConflicts = [
'twitch', 'twitch',
'isVariantA',// TwitchNoSub 'isVariantA'// TwitchNoSub
'besuper/'// TwitchNoSub (0.9)
]; ];
var workerStringAllow = []; 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 = [ var workerStringReinsert = [
'isVariantA',// TwitchNoSub 'isVariantA',// TwitchNoSub (prior to (0.9))
'besuper/'// TwitchNoSub (0.9) 'besuper/',// TwitchNoSub (0.9)
'${patch_url}'// TwitchNoSub (0.9.1)
]; ];
function getCleanWorker(worker) { function getCleanWorker(worker) {
var root = null; var root = null;

17
video-swap-new/video-swap-new-ublock-origin.js
View File

@ -33,22 +33,13 @@ twitch-videoad.js text/javascript
var twitchWorkers = []; var twitchWorkers = [];
var workerStringConflicts = [ var workerStringConflicts = [
'twitch', 'twitch',
'isVariantA',// TwitchNoSub 'isVariantA'// TwitchNoSub
'besuper/'// TwitchNoSub (0.9)
]; ];
var workerStringAllow = []; 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 = [ var workerStringReinsert = [
'isVariantA',// TwitchNoSub 'isVariantA',// TwitchNoSub (prior to (0.9))
'besuper/'// TwitchNoSub (0.9) 'besuper/',// TwitchNoSub (0.9)
'${patch_url}'// TwitchNoSub (0.9.1)
]; ];
function getCleanWorker(worker) { function getCleanWorker(worker) {
var root = null; var root = null;

19
video-swap-new/video-swap-new.user.js
View File

@ -1,7 +1,7 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions (video-swap-new) // @name TwitchAdSolutions (video-swap-new)
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @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 // @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 // @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) // @description Multiple solutions for blocking Twitch ads (video-swap-new)
@ -45,22 +45,13 @@
var twitchWorkers = []; var twitchWorkers = [];
var workerStringConflicts = [ var workerStringConflicts = [
'twitch', 'twitch',
'isVariantA',// TwitchNoSub 'isVariantA'// TwitchNoSub
'besuper/'// TwitchNoSub (0.9)
]; ];
var workerStringAllow = []; 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 = [ var workerStringReinsert = [
'isVariantA',// TwitchNoSub 'isVariantA',// TwitchNoSub (prior to (0.9))
'besuper/'// TwitchNoSub (0.9) 'besuper/',// TwitchNoSub (0.9)
'${patch_url}'// TwitchNoSub (0.9.1)
]; ];
function getCleanWorker(worker) { function getCleanWorker(worker) {
var root = null; var root = null;