Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-08 12:37:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into add-invidious

Browse Source
This commit is contained in:
Ajay Ramachandran
2019-12-30 17:40:32 -05:00
parent bd8c67bc24 a80fbc1a04
commit fc033cb69d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utils.js
View File

@@ -22,13 +22,16 @@ async function wait(condition, timeout = 5000, check = 100) {
} }
function getYouTubeVideoID(url) { function getYouTubeVideoID(url) {
// For YouTube TV support
if(document.URL.startsWith("https://www.youtube.com/tv#/")) url = url.replace("#", "");
//Attempt to parse url //Attempt to parse url
let urlObject = null; let urlObject = null;
try { try {
urlObject = new URL(url); urlObject = new URL(url);
} catch (e) { } catch (e) {
console.error("[SB] Unable to parse URL: " + url); console.error("[SB] Unable to parse URL: " + url);
return false; return false;
} }
//Check if valid hostname //Check if valid hostname
@@ -39,8 +42,8 @@ function getYouTubeVideoID(url) {
} }
//Get ID from searchParam //Get ID from searchParam
if ((urlObject.pathname == "/watch" || urlObject.pathname == "/watch/") && urlObject.searchParams.has("v")) { if (urlObject.searchParams.has("v") && ["/watch", "/watch/"].includes(urlObject.pathname) || urlObject.pathname.startsWith("/tv/watch")) {
id = urlObject.searchParams.get("v"); id = urlObject.searchParams.get("v");
return id.length == 11 ? id : false; return id.length == 11 ? id : false;
} else if (urlObject.pathname.startsWith("/embed/")) { } else if (urlObject.pathname.startsWith("/embed/")) {
try { try {
@@ -49,8 +52,7 @@ function getYouTubeVideoID(url) {
console.error("[SB] Video ID not valid for " + url); console.error("[SB] Video ID not valid for " + url);
return false; return false;
} }
} }
return false; return false;
} }
@@ -122,4 +124,4 @@ function getErrorMessage(statusCode) {
} }
return errorMessage; return errorMessage;
} }