From 338dadc691551a3ed3a82c2e336f59072e6d7167 Mon Sep 17 00:00:00 2001 From: pixeltris <6952411+pixeltris@users.noreply.github.com> Date: Thu, 1 Sep 2022 19:12:51 +0100 Subject: [PATCH] Disable the proxy used by vaft and update list Also disabled stream "correction" (pause/play) on background tabs --- README.md | 8 ++++---- full-list.md | 4 ++-- vaft/vaft-ublock-origin.js | 4 ++-- vaft/vaft.user.js | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 84f474c..f3b6bb8 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@ This repo aims to provide multiple solutions for blocking Twitch ads. Proxies are the most reliable way of avoiding ads ([buffering / downtime info](full-list.md#proxy-issues)). -- `TTV LOL` - [chrome](https://chrome.google.com/webstore/detail/ttv-lol/ofbbahodfeppoklmgjiokgfdgcndngjm) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/ttv-lol/) / [code](https://github.com/TTV-LOL/extensions) -- `Purple AdBlock` - [chrome](https://chrome.google.com/webstore/detail/purple-adblock/lkgcfobnmghhbhgekffaadadhmeoindg) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/purpleadblock/) / [code](https://github.com/arthurbolsoni/Purple-adblock/) +- `TTV LOL` - [chrome](https://chrome.google.com/webstore/detail/ttv-lol/ofbbahodfeppoklmgjiokgfdgcndngjm) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/ttv-lol/) / [code](https://github.com/TTV-LOL/extensions) - currently down Alternatively: - `Video Ad-Block, for Twitch` (fork) - [chrome](https://chrome.google.com/webstore/detail/twitch-adblock/ljhnljhabgjcihjoihakgdiicdjncpkd) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/twitch-adblock/) / [code](https://github.com/cleanlock/VideoAdBlockForTwitch) - `Alternate Player for Twitch.tv` - [chrome](https://chrome.google.com/webstore/detail/alternate-player-for-twit/bhplkbgoehhhddaoolmakpocnenplmhf) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/twitch_5/) +- `Purple AdBlock` - [chrome](https://chrome.google.com/webstore/detail/purple-adblock/lkgcfobnmghhbhgekffaadadhmeoindg) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/purpleadblock/) / [code](https://github.com/arthurbolsoni/Purple-adblock/) - `ttv-ublock` - [chrome](https://chrome.google.com/webstore/detail/ttv-ad-block/kndhknfnihidhcfnaacnndbolonbimai) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/ttv-adblock/) / [code](https://github.com/odensc/ttv-ublock) - *(possible periodic adblocker warning)* - `vaft` - see below @@ -22,11 +22,11 @@ Alternatively: ## Scripts -**There are better / easier to use methods in the above** `Recommendations`. +**There are better / easier to use methods in the above recommendations.** - vaft - [ublock](https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft-ublock-origin.js) / [userscript](https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js) / [ublock (permalink)](https://github.com/pixeltris/TwitchAdSolutions/raw/e80025cbd1eef78f3c609eaff8d5f934abcc9cf8/vaft/vaft-ublock-origin.js) - `Video Ad-Block, for Twitch` (fork) as a script. - - *Uses a proxy during ad segments if the local ad-free solution fails. For more info see [#89](https://github.com/pixeltris/TwitchAdSolutions/issues/89).* + - *If the ad-free stream fails you'll see an adblocker warning. For more info see [#89](https://github.com/pixeltris/TwitchAdSolutions/issues/89).* *For the sake of security it's recommended to use a permalink when using uBlock Origin (permalinks do not auto update).* diff --git a/full-list.md b/full-list.md index b41db4a..d57bc44 100644 --- a/full-list.md +++ b/full-list.md @@ -2,12 +2,12 @@ - `TTV LOL` - [chrome](https://chrome.google.com/webstore/detail/ttv-lol/ofbbahodfeppoklmgjiokgfdgcndngjm) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/ttv-lol/) / [code](https://github.com/TTV-LOL/extensions) - Uses a proxy on the main m3u8 file to get a stream without ads. -- `Purple AdBlock` - [chrome](https://chrome.google.com/webstore/detail/purple-adblock/lkgcfobnmghhbhgekffaadadhmeoindg) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/purpleadblock/) / [code](https://github.com/arthurbolsoni/Purple-adblock/) - - Uses a proxy on the main m3u8 file to get a stream without ads. - `Video Ad-Block, for Twitch` (fork) - [chrome](https://chrome.google.com/webstore/detail/twitch-adblock/ljhnljhabgjcihjoihakgdiicdjncpkd) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/twitch-adblock/) / [code](https://github.com/cleanlock/VideoAdBlockForTwitch) - Replaces ad segments with ad-free segments. Opt-in proxy fallback during ad segments when the ad-free stream fails locally. - `Alternate Player for Twitch.tv` - [chrome](https://chrome.google.com/webstore/detail/alternate-player-for-twit/bhplkbgoehhhddaoolmakpocnenplmhf) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/twitch_5/) - Removes ad segments (no playback until ad-free stream). +- `Purple AdBlock` - [chrome](https://chrome.google.com/webstore/detail/purple-adblock/lkgcfobnmghhbhgekffaadadhmeoindg) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/purpleadblock/) / [code](https://github.com/arthurbolsoni/Purple-adblock/) + - Replaces ad segments with ad-free segments. Proxy fallback which is currently broken. - `ttv-ublock` - [chrome](https://chrome.google.com/webstore/detail/ttv-ad-block/kndhknfnihidhcfnaacnndbolonbimai) / [firefox](https://addons.mozilla.org/en-US/firefox/addon/ttv-adblock/) / [code](https://github.com/odensc/ttv-ublock) - Switches to the `embed` player at a network level. No ads but Twitch detects this and may display a purple screen every 10-15 mins asking the user to remove ad blockers (depends on time of day). - `ttv_adEraser` - [chrome](https://chrome.google.com/webstore/detail/ttv-aderaser/pjnopimdnmhiaanhjfficogijajbhjnc) / [firefox (manual install)](https://github.com/LeonHeidelbach/ttv_adEraser#mozilla-firefox) / [code](https://github.com/LeonHeidelbach/ttv_adEraser) diff --git a/vaft/vaft-ublock-origin.js b/vaft/vaft-ublock-origin.js index 50e49dd..4f95362 100644 --- a/vaft/vaft-ublock-origin.js +++ b/vaft/vaft-ublock-origin.js @@ -26,7 +26,7 @@ twitch-videoad.js application/javascript //This corrects the background tab buffer bug when switching to the background tab for the first time after an extended period. doTwitchPlayerTask(false, false, true, false, false); }; - document.addEventListener('visibilitychange', process, true); + document.addEventListener('visibilitychange', block, true); document.addEventListener('webkitvisibilitychange', block, true); document.addEventListener('mozvisibilitychange', block, true); document.addEventListener('hasFocus', block, true); @@ -71,7 +71,7 @@ twitch-videoad.js application/javascript scope.StreamInfosByUrl = []; scope.MainUrlByUrl = []; scope.EncodingCacheTimeout = 60000; - scope.DefaultProxyType = 'TTV LOL'; + scope.DefaultProxyType = null; scope.DefaultForcedQuality = null; scope.DefaultProxyQuality = null; } diff --git a/vaft/vaft.user.js b/vaft/vaft.user.js index 45dc336..0d67493 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 5.5.0 +// @version 5.5.1 // @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 @@ -37,7 +37,7 @@ //This corrects the background tab buffer bug when switching to the background tab for the first time after an extended period. doTwitchPlayerTask(false, false, true, false, false); }; - document.addEventListener('visibilitychange', process, true); + document.addEventListener('visibilitychange', block, true); document.addEventListener('webkitvisibilitychange', block, true); document.addEventListener('mozvisibilitychange', block, true); document.addEventListener('hasFocus', block, true); @@ -82,7 +82,7 @@ scope.StreamInfosByUrl = []; scope.MainUrlByUrl = []; scope.EncodingCacheTimeout = 60000; - scope.DefaultProxyType = 'TTV LOL'; + scope.DefaultProxyType = null; scope.DefaultForcedQuality = null; scope.DefaultProxyQuality = null; }