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

Made zero second skips not skip when the video starts at a non zero time.

Browse Source
This commit is contained in:
Ajay Ramachandran
2019-08-02 22:37:12 -04:00
parent fcf7141733
commit 8ffab867e1
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
content.js
View File

@@ -7,6 +7,9 @@ var UUIDs = null;
//what video id are these sponsors for //what video id are these sponsors for
var sponsorVideoID = null; var sponsorVideoID = null;
//the time this video is starting at when first played, if not zero
var youtubeVideoStartTime = null;
if(id = getYouTubeVideoID(document.URL)){ // Direct Links if(id = getYouTubeVideoID(document.URL)){ // Direct Links
videoIDChange(id); videoIDChange(id);
} }
@@ -167,6 +170,9 @@ function videoIDChange(id) {
UUIDs = null; UUIDs = null;
sponsorVideoID = id; sponsorVideoID = id;
//see if there is a video start time
youtubeVideoStartTime = getYouTubeVideoStartTime(document.URL);
//reset sponsor data found check //reset sponsor data found check
sponsorDataFound = false; sponsorDataFound = false;
sponsorsLookup(id); sponsorsLookup(id);
@@ -316,9 +322,9 @@ function checkIfTimeToSkip(currentVideoTime, startTime) {
//If the sponsor time is in between these times, skip it //If the sponsor time is in between these times, skip it
//Checks if the last time skipped to is not too close to now, to make sure not to get too many //Checks if the last time skipped to is not too close to now, to make sure not to get too many
// sponsor times in a row (from one troll) // sponsor times in a row (from one troll)
//the last term makes 0 second start times possible //the last term makes 0 second start times possible only if the video is not setup to start at a different time from zero
return (Math.abs(currentVideoTime - startTime) < 0.3 && startTime >= lastTime && startTime <= currentVideoTime && return (Math.abs(currentVideoTime - startTime) < 0.3 && startTime >= lastTime && startTime <= currentVideoTime &&
(lastUnixTimeSkipped == -1 || currentTime - lastUnixTimeSkipped > 500)) || (lastTime == -1 && startTime == 0); (lastUnixTimeSkipped == -1 || currentTime - lastUnixTimeSkipped > 500)) || (lastTime == -1 && startTime == 0 && youtubeVideoStartTime == null)
} }
//skip fromt he start time to the end time for a certain index sponsor time //skip fromt he start time to the end time for a certain index sponsor time
@@ -1046,3 +1052,14 @@ function getYouTubeVideoID(url) { // Returns with video id else returns false
return (match && match[7].length == 11) ? id : false; return (match && match[7].length == 11) ? id : false;
} }
//returns the start time of the video if there was one specified (ex. ?t=5s)
function getYouTubeVideoStartTime(url) {
let searchParams = new URL(url).searchParams;
var startTime = searchParams.get("t");
if (startTime == null) {
startTime = searchParams.get("time_continue");
}
return startTime;
}