Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

getYouTubeVideoID() - support youtube-local pathnames #521

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

getYouTubeVideoID() - support youtube-local pathnames #521

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
512a373
getYouTubeVideoID() - support youtube-local pathnames
zrose584 Oct 18, 2020
7b5c780
Support all youtube tv URLs
ajayyy Dec 14, 2020
5dabcab
Add non capturing group
ajayyy Dec 14, 2020
4e76aad
Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into …
ajayyy Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/content.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,17 +801,14 @@ function getYouTubeVideoID(url: string) {
}

//Get ID from searchParam
if (urlObject.searchParams.has("v") && ["/watch", "/watch/"].includes(urlObject.pathname) || urlObject.pathname.startsWith("/tv/watch")) {
let m = null;
if (urlObject.searchParams.has("v") && urlObject.pathname.match(/^\/((youtube\.com\/)?watch\/?$|tv\/watch)/)) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is (youtube\.com\/)? for?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

youtube-local routes https://youtube.com/watch?v=<vid> to http://your-domain.org/youtube.com/watch?v=<vid>
It does this because it has to route multiple domains, and it probably makes things simpler.

So if youtube-local were to soon also support another video platform (e.g. dailymotion), and they also use /watch?v=, this addon will correctly not transmit the id.
Also note that only ^\/watch would not match youtube-local's routes.

let id = urlObject.searchParams.get("v");
return id.length == 11 ? id : false;
} else if (urlObject.pathname.startsWith("/embed/")) {
try {
return urlObject.pathname.substr(7, 11);
} catch (e) {
console.error("[SB] Video ID not valid for " + url);
return false;
}
}
}
else if (m = urlObject.pathname.match(/^\/(?:youtube.com\/)?(?:embed|youtu.be)\/([^/]{11})/)) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is youtu.be for?

Copy link
Author

@zrose584 zrose584 Dec 29, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see #521 (comment)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

youtu.be should never be a valid URL since it is always redirected

Copy link
Author

@zrose584 zrose584 Dec 30, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just tested it, and youtube-local does not redirect the /youtu.be/video_id path to /youtube.com/watch?v=video_id.
It just serves the video as if /youtube.com/watch?v=video_id was used.
Two ways:

  • Merge it as is. The allowance of /youtu.be/video_id is not "hurting" anoyne, right?
  • Remove youtu.be from the regex, and open a ticket on youtube-local. I believe that it should be a quick fix, but I am not 100% sure.. Maybe not being redirected is a feature (idk)?

return m[1];
}
return false;
}

Expand Down