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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Ajay Ramachandran
2020-05-15 21:12:31 -04:00
committed by GitHub
parent c046df7d18 3640463112
commit 02a9238869
5 changed files with 359 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/content.ts
View File

@@ -482,7 +482,7 @@ function startSponsorSchedule(includeIntersectingSegments: boolean = false, curr
return;
}
if (incorrectVideoIDCheck()) return;
if (incorrectVideoCheck()) return;
if (currentTime === undefined || currentTime === null) currentTime = video.currentTime;
@@ -502,7 +502,7 @@ function startSponsorSchedule(includeIntersectingSegments: boolean = false, curr
let forcedSkipTime: number = null;
let forcedIncludeIntersectingSegments = false;
if (incorrectVideoIDCheck(videoID)) return;
if (incorrectVideoCheck(videoID, currentSkip)) return;
if (video.currentTime >= skipTime[0] && video.currentTime < skipTime[1]) {
skipToTime(video, skipInfo.endIndex, skipInfo.array, skipInfo.openNotice);
@@ -527,13 +527,11 @@ function startSponsorSchedule(includeIntersectingSegments: boolean = false, curr
}
/**
* This makes sure the videoID is still correct
*
* TODO: Remove this bug catching if statement when the bug is found
* This makes sure the videoID is still correct and if the sponsorTime is included
*/
function incorrectVideoIDCheck(videoID?: string): boolean {
function incorrectVideoCheck(videoID?: string, sponsorTime?: SponsorTime): boolean {
let currentVideoID = getYouTubeVideoID(document.URL);
if (currentVideoID !== (videoID || sponsorVideoID)) {
if (currentVideoID !== (videoID || sponsorVideoID) || (sponsorTime && !sponsorTimes.includes(sponsorTime))) {
// Something has really gone wrong
console.error("[SponsorBlock] The videoID recorded when trying to skip is different than what it should be.");
console.error("[SponsorBlock] VideoID recorded: " + sponsorVideoID + ". Actual VideoID: " + currentVideoID);