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 conflicts with other solutions #282

Browse Source
This commit is contained in:
pixeltris 2024-09-24 14:25:32 +01:00
parent 055e1ad981
commit 69f098d882
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,12 +27,16 @@ twitch-videoad.js text/javascript
var IsPlayerAutoQuality = null; var IsPlayerAutoQuality = null;
const oldWorker = window.Worker; const oldWorker = window.Worker;
function hookWindowWorker() { function hookWindowWorker() {
window.Worker = class Worker extends oldWorker { var newWorker = window.Worker = class Worker extends oldWorker {
constructor(twitchBlobUrl, options) { constructor(twitchBlobUrl, options) {
var isTwitchWorker = false; var isTwitchWorker = false;
try { try {
isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv'); isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv');
} catch {} } catch {}
if (newWorker.toString() !== window.Worker.toString()) {
console.log('Multiple twitch adblockers installed. Skipping Worker hook (vaft)');
isTwitchWorker = false;
}
if (!isTwitchWorker) { if (!isTwitchWorker) {
super(twitchBlobUrl, options); super(twitchBlobUrl, options);
return; return;

6
vaft/vaft.user.js
View File

@ -39,12 +39,16 @@
var IsPlayerAutoQuality = null; var IsPlayerAutoQuality = null;
const oldWorker = window.Worker; const oldWorker = window.Worker;
function hookWindowWorker() { function hookWindowWorker() {
window.Worker = class Worker extends oldWorker { var newWorker = window.Worker = class Worker extends oldWorker {
constructor(twitchBlobUrl, options) { constructor(twitchBlobUrl, options) {
var isTwitchWorker = false; var isTwitchWorker = false;
try { try {
isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv'); isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv');
} catch {} } catch {}
if (newWorker.toString() !== window.Worker.toString()) {
console.log('Multiple twitch adblockers installed. Skipping Worker hook (vaft)');
isTwitchWorker = false;
}
if (!isTwitchWorker) { if (!isTwitchWorker) {
super(twitchBlobUrl, options); super(twitchBlobUrl, options);
return; return;

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

@ -26,12 +26,16 @@ twitch-videoad.js text/javascript
var twitchWorkers = []; var twitchWorkers = [];
const oldWorker = window.Worker; const oldWorker = window.Worker;
function hookWindowWorker() { function hookWindowWorker() {
window.Worker = class Worker extends oldWorker { var newWorker = window.Worker = class Worker extends oldWorker {
constructor(twitchBlobUrl, options) { constructor(twitchBlobUrl, options) {
var isTwitchWorker = false; var isTwitchWorker = false;
try { try {
isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv'); isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv');
} catch {} } catch {}
if (newWorker.toString() !== window.Worker.toString()) {
console.log('Multiple twitch adblockers installed. Skipping Worker hook (video-swap-new)');
isTwitchWorker = false;
}
if (!isTwitchWorker) { if (!isTwitchWorker) {
super(twitchBlobUrl, options); super(twitchBlobUrl, options);
return; return;

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

@ -38,12 +38,16 @@
var twitchWorkers = []; var twitchWorkers = [];
const oldWorker = window.Worker; const oldWorker = window.Worker;
function hookWindowWorker() { function hookWindowWorker() {
window.Worker = class Worker extends oldWorker { var newWorker = window.Worker = class Worker extends oldWorker {
constructor(twitchBlobUrl, options) { constructor(twitchBlobUrl, options) {
var isTwitchWorker = false; var isTwitchWorker = false;
try { try {
isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv'); isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv');
} catch {} } catch {}
if (newWorker.toString() !== window.Worker.toString()) {
console.log('Multiple twitch adblockers installed. Skipping Worker hook (video-swap-new)');
isTwitchWorker = false;
}
if (!isTwitchWorker) { if (!isTwitchWorker) {
super(twitchBlobUrl, options); super(twitchBlobUrl, options);
return; return;