Fix conflicts with other solutions #282
This commit is contained in:
@@ -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;
|
||||||
|
|||||||
+5
-1
@@ -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;
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user