TwitchAdSolutions
Code Issues

Unlist "dyn-skip-midroll" and disable reloading in "dyn-skip-midroll-alt"

Browse Source
This commit is contained in:
pixeltris
2020-12-30 01:11:34 +00:00
parent 8e87d53987
commit 6791c44de3
16 changed files with 63 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dyn/dyn-ublock-origin.js
+4 -3
View File
@@ -75,6 +75,7 @@ twitch-videoad.js application/javascript
this.onmessage = function(e) {
if (e.data.key == 'UboShowAdBanner') {
if (adDiv == null) { adDiv = getAdDiv(); }
adDiv.P.textContent = 'Waiting for' + (e.data.isMidroll ? ' midroll' : '') + ' ads to finish...';
adDiv.style.display = 'block';
}
else if (e.data.key == 'UboHideAdBanner') {
@@ -89,7 +90,6 @@ twitch-videoad.js application/javascript
}
}
function getAdDiv() {
var msg = 'Waiting for ads to finish...';
var playerRootDiv = document.querySelector('.video-player');
var adDiv = null;
if (playerRootDiv != null) {
@@ -97,8 +97,9 @@ twitch-videoad.js application/javascript
if (adDiv == null) {
adDiv = document.createElement('div');
adDiv.className = 'ubo-overlay';
adDiv.innerHTML = '<div class="player-ad-notice" style="color: white; background-color: rgba(0, 0, 0, 0.8); position: absolute; top: 0px; left: 0px; padding: 10px;"><p>' + msg + '</p></div>';
adDiv.innerHTML = '<div class="player-ad-notice" style="color: white; background-color: rgba(0, 0, 0, 0.8); position: absolute; top: 0px; left: 0px; padding: 10px;"><p></p></div>';
adDiv.style.display = 'none';
adDiv.P = adDiv.querySelector('p');
playerRootDiv.appendChild(adDiv);
}
}
@@ -139,7 +140,7 @@ twitch-videoad.js application/javascript
}
// NOTE: midroll ads are intertwined with live segments, always display the banner on midroll ads
if (haveAdTags && (!textStr.includes(LIVE_SIGNIFIER) || textStr.includes('MIDROLL'))) {
postMessage({key:'UboShowAdBanner'});
postMessage({key:'UboShowAdBanner',isMidroll:textStr.includes('MIDROLL')});
} else if ((LastAdUrl && LastAdUrl == url) || LastAdTime < Date.now() - 10000) {
postMessage({key:'UboHideAdBanner'});
LastAdTime = 0;
dyn/dyn.user.js
+4 -3
View File
@@ -84,6 +84,7 @@
this.onmessage = function(e) {
if (e.data.key == 'UboShowAdBanner') {
if (adDiv == null) { adDiv = getAdDiv(); }
adDiv.P.textContent = 'Waiting for' + (e.data.isMidroll ? ' midroll' : '') + ' ads to finish...';
adDiv.style.display = 'block';
}
else if (e.data.key == 'UboHideAdBanner') {
@@ -98,7 +99,6 @@
}
}
function getAdDiv() {
var msg = 'Waiting for ads to finish...';
var playerRootDiv = document.querySelector('.video-player');
var adDiv = null;
if (playerRootDiv != null) {
@@ -106,8 +106,9 @@
if (adDiv == null) {
adDiv = document.createElement('div');
adDiv.className = 'ubo-overlay';
adDiv.innerHTML = '<div class="player-ad-notice" style="color: white; background-color: rgba(0, 0, 0, 0.8); position: absolute; top: 0px; left: 0px; padding: 10px;"><p>' + msg + '</p></div>';
adDiv.innerHTML = '<div class="player-ad-notice" style="color: white; background-color: rgba(0, 0, 0, 0.8); position: absolute; top: 0px; left: 0px; padding: 10px;"><p></p></div>';
adDiv.style.display = 'none';
adDiv.P = adDiv.querySelector('p');
playerRootDiv.appendChild(adDiv);
}
}
@@ -148,7 +149,7 @@
}
// NOTE: midroll ads are intertwined with live segments, always display the banner on midroll ads
if (haveAdTags && (!textStr.includes(LIVE_SIGNIFIER) || textStr.includes('MIDROLL'))) {
postMessage({key:'UboShowAdBanner'});
postMessage({key:'UboShowAdBanner',isMidroll:textStr.includes('MIDROLL')});
} else if ((LastAdUrl && LastAdUrl == url) || LastAdTime < Date.now() - 10000) {
postMessage({key:'UboHideAdBanner'});
LastAdTime = 0;