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

Reverse segments to skip content

Browse Source
This commit is contained in:
Ajay
2022-03-27 14:25:53 -04:00
parent 5d72498aac
commit d2c50d2562
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/content.ts
View File

@@ -789,6 +789,27 @@ async function sponsorsLookup(id: string, keepOldSubmissions = true) {
const oldSegments = sponsorTimes || [];
sponsorTimes = recievedSegments;
if (sponsorTimes) {
// Reverse times so that it only watches the skipped info
const newTimes: SponsorTime[] = [];
const oldTimes = sponsorTimes.sort((a, b) => a.segment[0] - b.segment[0]);
let cursor = 0;
for (const time of oldTimes) {
if (time.segment[0] > cursor) {
newTimes.push({
segment: [cursor, time.segment[0]],
source: SponsorSourceType.Local,
actionType: ActionType.Skip,
category: "sponsor" as Category,
UUID: null
});
}
cursor = Math.max(cursor, time.segment[1]);
}
sponsorTimes = newTimes;
}
// Hide all submissions smaller than the minimum duration
if (Config.config.minDuration !== 0) {
for (const segment of sponsorTimes) {
@@ -1472,21 +1493,10 @@ function shouldSkip(segment: SponsorTime): boolean {
async function createButtons(): Promise<void> {
if (onMobileYouTube) return;
controls = await utils.wait(getControls).catch();
// Add button if does not already exist in html
createButton("startSegment", "sponsorStart", () => closeInfoMenuAnd(() => startOrEndTimingNewSegment()), "PlayerStartIconSponsorBlocker.svg");
createButton("cancelSegment", "sponsorCancel", () => closeInfoMenuAnd(() => cancelCreatingSegment()), "PlayerCancelSegmentIconSponsorBlocker.svg");
createButton("delete", "clearTimes", () => closeInfoMenuAnd(() => clearSponsorTimes()), "PlayerDeleteIconSponsorBlocker.svg");
createButton("submit", "SubmitTimes", submitSponsorTimes, "PlayerUploadIconSponsorBlocker.svg");
createButton("info", "openPopup", openInfoMenu, "PlayerInfoIconSponsorBlocker.svg");
const controlsContainer = getControls();
if (Config.config.autoHideInfoButton && !onInvidious && controlsContainer
&& playerButtons["info"]?.button && !controlsWithEventListeners.includes(controlsContainer)) {
controlsWithEventListeners.push(controlsContainer);
AnimationUtils.setupAutoHideAnimation(playerButtons["info"].button, controlsContainer);
}
}