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

Compare commits

base: Mirrors:v1
Branches Tags
Mirrors:master
Mirrors:v2
Mirrors:v1
...
compare: Mirrors:master
Branches Tags
Mirrors:master
Mirrors:v2
Mirrors:v1

3 Commits
v1 ... master

Author SHA1 Message Date
pixeltris
492c1db4cf Update permalinks 2025-02-13 21:37:38 +00:00
pixeltris
0b5ea5ed89 Fix conflict with TwitchNoSub (0.9.1) 2025-02-13 21:36:34 +00:00
pixeltris
ea9a01eb45 Update permalinks 2025-01-23 11:07:29 +00:00
5 changed files with 20 additions and 56 deletions
Show Stats Expand all files Collapse all files

4
README.md
View File

@ -25,9 +25,9 @@ Alternatively:
**There are better / easier to use methods in the above recommendations.** **There are better / easier to use methods in the above recommendations.**
- video-swap-new - [userscript](https://github.com/pixeltris/TwitchAdSolutions/raw/master/video-swap-new/video-swap-new.user.js) / [ublock](https://raw.githubusercontent.com/pixeltris/TwitchAdSolutions/master/video-swap-new/video-swap-new-ublock-origin.js) / [ublock (permalink)](https://raw.githubusercontent.com/pixeltris/TwitchAdSolutions/477085016b84beba8ccf0035689dd4b51fce929d/video-swap-new/video-swap-new-ublock-origin.js) - video-swap-new - [userscript](https://github.com/pixeltris/TwitchAdSolutions/raw/master/video-swap-new/video-swap-new.user.js) / [ublock](https://raw.githubusercontent.com/pixeltris/TwitchAdSolutions/master/video-swap-new/video-swap-new-ublock-origin.js) / [ublock (permalink)](https://raw.githubusercontent.com/pixeltris/TwitchAdSolutions/0b5ea5ed8959a6b4eb4c1ea406aaa56313c9c907/video-swap-new/video-swap-new-ublock-origin.js)
- Uses a lower resolution stream during ads. - Uses a lower resolution stream during ads.
- vaft - [userscript](https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js) / [ublock](https://raw.githubusercontent.com/pixeltris/TwitchAdSolutions/master/vaft/vaft-ublock-origin.js) / [ublock (permalink)](https://raw.githubusercontent.com/pixeltris/TwitchAdSolutions/477085016b84beba8ccf0035689dd4b51fce929d/vaft/vaft-ublock-origin.js) - vaft - [userscript](https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js) / [ublock](https://raw.githubusercontent.com/pixeltris/TwitchAdSolutions/master/vaft/vaft-ublock-origin.js) / [ublock (permalink)](https://raw.githubusercontent.com/pixeltris/TwitchAdSolutions/0b5ea5ed8959a6b4eb4c1ea406aaa56313c9c907/vaft/vaft-ublock-origin.js)
- The same as `video-swap-new` but attempts to get a clean stream faster (may suffer from more freezing / playback issues). - The same as `video-swap-new` but attempts to get a clean stream faster (may suffer from more freezing / playback issues).
## Applying a script (uBlock Origin) ## Applying a script (uBlock Origin)

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;