external/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2024-11-11 09:30:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed formatting and removed whitelisting fix code.

Browse source 
Whitelisting was now fixed in a different way.
This commit is contained in:
Ajay Ramachandran 2019-12-19 00:36:35 -05:00
parent 5dc67a386c
commit 630b099fd6
2 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
content.js
View file

@ -474,14 +474,6 @@ function sponsorsLookup(id, channelIDPromise) {
sponsorLookupRetries++; sponsorLookupRetries++;
} }
// If the initial channel whitelist check finishes before
// the fetching of the sponsor times, then the sponsor times will be
// added again after the whitelist check clears them. Checking it here makes sure
// the whitelist will be applied (downside is `whitelistCheck()` gets called multiple times).
if (channelWhitelisted) {
whitelistCheck();
}
}); });
//add the event to run on the videos "ontimeupdate" //add the event to run on the videos "ontimeupdate"
@ -530,8 +522,7 @@ function getChannelID() {
channelContainers = document.getElementsByClassName("yt-user-info"); channelContainers = document.getElementsByClassName("yt-user-info");
if (channelContainers.length != 0) { if (channelContainers.length != 0) {
channelURLContainer = channelContainers[0].firstElementChild; channelURLContainer = channelContainers[0].firstElementChild;
} } else if (onInvidious) {
else if (onInvidious) {
// Unfortunately, the Invidious HTML doesn't have much in the way of element identifiers... // Unfortunately, the Invidious HTML doesn't have much in the way of element identifiers...
channelContainers = document.querySelector("body > div > div.pure-u-1.pure-u-md-20-24 div.pure-u-1.pure-u-lg-3-5 > div > a"); channelContainers = document.querySelector("body > div > div.pure-u-1.pure-u-md-20-24 div.pure-u-1.pure-u-lg-3-5 > div > a");
if (channelContainers.length != 0) { if (channelContainers.length != 0) {
@ -550,12 +541,10 @@ function getChannelID() {
let currentTitle = ""; let currentTitle = "";
if (titleInfoContainer != null) { if (titleInfoContainer != null) {
currentTitle = titleInfoContainer.firstElementChild.firstElementChild.querySelector(".title").firstElementChild.innerText; currentTitle = titleInfoContainer.firstElementChild.firstElementChild.querySelector(".title").firstElementChild.innerText;
} } else if (onInvidious) {
else if (onInvidious) {
// Unfortunately, the Invidious HTML doesn't have much in the way of element identifiers... // Unfortunately, the Invidious HTML doesn't have much in the way of element identifiers...
currentTitle = document.querySelector("body > div > div.pure-u-1.pure-u-md-20-24 div.pure-u-1.pure-u-lg-3-5 > div > a > div > span").textContent; currentTitle = document.querySelector("body > div > div.pure-u-1.pure-u-md-20-24 div.pure-u-1.pure-u-lg-3-5 > div > a > div > span").textContent;
} } else {
else {
//old YouTube theme //old YouTube theme
currentTitle = document.getElementById("eow-title").innerText; currentTitle = document.getElementById("eow-title").innerText;
} }
@ -760,8 +749,7 @@ function getControls() {
// The invidious video element's controls element // The invidious video element's controls element
controls = document.getElementsByClassName("vjs-control-bar"); controls = document.getElementsByClassName("vjs-control-bar");
return (!controls || controls.length === 0) ? false : controls[controls.length - 1]; return (!controls || controls.length === 0) ? false : controls[controls.length - 1];
} } else {
else {
return controls[controls.length - 1]; return controls[controls.length - 1];
} }
}; };

7
utils.js
View file

@ -32,11 +32,10 @@ function getYouTubeVideoID(url) {
} }
//Check if valid hostname //Check if valid hostname
if(!["www.youtube.com", "www.youtube-nocookie.com", ...supportedInvidiousInstances].includes(urlObject.host)) { if (supportedInvidiousInstances.includes(urlObject.host)) {
return false;
}
else if (supportedInvidiousInstances.includes(urlObject.host)) {
onInvidious = true; onInvidious = true;
} else if (!["www.youtube.com", "www.youtube-nocookie.com"].includes(urlObject.host)) {
return false
} }
//Get ID from searchParam //Get ID from searchParam