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

Add hiding skip to highlight

Browse Source 
Fix #1530
This commit is contained in:
Ajay
2022-11-04 16:05:09 -04:00
parent 2c5db670a4
commit 1775835392
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/content.ts
View File

@@ -259,6 +259,11 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
utils.getSponsorTimeFromUUID(sponsorTimes, request.UUID).hidden = request.type; utils.getSponsorTimeFromUUID(sponsorTimes, request.UUID).hidden = request.type;
utils.addHiddenSegment(sponsorVideoID, request.UUID, request.type); utils.addHiddenSegment(sponsorVideoID, request.UUID, request.type);
updatePreviewBar(); updatePreviewBar();
if (skipButtonControlBar?.isEnabled()
&& sponsorTimesSubmitting.every((s) => s.hidden !== SponsorHideType.Visible || s.actionType !== ActionType.Poi)) {
skipButtonControlBar.disable();
}
break; break;
case "closePopup": case "closePopup":
closeInfoMenu(); closeInfoMenu();
@@ -1229,7 +1234,8 @@ function startSkipScheduleCheckingForStartSponsors() {
// For highlight category // For highlight category
const poiSegments = sponsorTimes const poiSegments = sponsorTimes
.filter((time) => time.segment[1] > video.currentTime && time.actionType === ActionType.Poi) .filter((time) => time.segment[1] > video.currentTime
&& time.actionType === ActionType.Poi && time.hidden === SponsorHideType.Visible)
.sort((a, b) => b.segment[0] - a.segment[0]); .sort((a, b) => b.segment[0] - a.segment[0]);
for (const time of poiSegments) { for (const time of poiSegments) {
const skipOption = utils.getCategorySelection(time.category)?.option; const skipOption = utils.getCategorySelection(time.category)?.option;

4
src/js-components/skipButtonControlBar.ts
View File

@@ -142,6 +142,10 @@ export class SkipButtonControlBar {
this.enabled = false; this.enabled = false;
} }
isEnabled(): boolean {
return this.enabled;
}
toggleSkip(): void { toggleSkip(): void {
this.skip(this.segment); this.skip(this.segment);
this.disableText(); this.disableText();

1
src/popup.ts
View File

@@ -698,6 +698,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
voteButtonsContainer.appendChild(downvoteButton); voteButtonsContainer.appendChild(downvoteButton);
voteButtonsContainer.appendChild(uuidButton); voteButtonsContainer.appendChild(uuidButton);
if (downloadedTimes[i].actionType === ActionType.Skip || downloadedTimes[i].actionType === ActionType.Mute if (downloadedTimes[i].actionType === ActionType.Skip || downloadedTimes[i].actionType === ActionType.Mute
|| downloadedTimes[i].actionType === ActionType.Poi
&& [SponsorHideType.Visible, SponsorHideType.Hidden].includes(downloadedTimes[i].hidden)) { && [SponsorHideType.Visible, SponsorHideType.Hidden].includes(downloadedTimes[i].hidden)) {
voteButtonsContainer.appendChild(hideButton); voteButtonsContainer.appendChild(hideButton);
} }