bump version

Update Invidious List

ci/invidiouslist.json

@@ -1 +1 @@
-["www.youtubekids.com","anontube.lvkaszus.pl","inv.bp.projectsegfau.lt","inv.makerlab.tech","inv.pistasjis.net","inv.tux.pizza","inv.zzls.xyz","invidious.asir.dev","invidious.flokinet.to","invidious.io.lol","invidious.lunar.icu","invidious.no-logs.com","invidious.privacydev.net","invidious.private.coffee","invidious.protokolla.fi","invidious.slipfox.xyz","invidious.tiekoetter.com","iv.ggtyler.dev","iv.melmac.space","iv.nboeck.de","onion.tube","vid.priv.au","vid.puffyan.us","yewtu.be","yt.artemislena.eu","yt.drgnz.club","yt.oelrichsgarcia.de"]
+["www.youtubekids.com","anontube.lvkaszus.pl","inv.citw.lgbt","inv.in.projectsegfau.lt","inv.tux.pizza","inv.zzls.xyz","invidious.asir.dev","invidious.drgns.space","invidious.fdn.fr","invidious.flokinet.to","invidious.io.lol","invidious.lunar.icu","invidious.nerdvpn.de","invidious.no-logs.com","invidious.perennialte.ch","invidious.privacydev.net","invidious.private.coffee","invidious.projectsegfau.lt","invidious.protokolla.fi","invidious.slipfox.xyz","iv.datura.network","iv.ggtyler.dev","iv.melmac.space","iv.nboeck.de","onion.tube","vid.priv.au","vid.puffyan.us","yewtu.be","yt.artemislena.eu","yt.cdaut.de","yt.drgnz.club","yt.oelrichsgarcia.de"]

manifest/firefox-manifest-extra.json

@@ -1,7 +1,11 @@
 {
   "browser_specific_settings": {
     "gecko": {
-      "id": "sponsorBlocker@ajay.app"
+      "id": "sponsorBlocker@ajay.app",
+      "strict_min_version": "48.0"
+    },
+    "gecko_android": {
+      "strict_min_version": "79.0"
     }
   },
   "background": {

manifest/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.4.22",
+    "version": "5.4.26",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",

public/content.css

@@ -7,7 +7,7 @@
 	--sb-dark-red-outline: rgb(130,0,0,0.9);
 }
 
-.hidden {
+.sbhidden {
 	display: none;
 }
 
@@ -151,7 +151,7 @@ div:hover > .sponsorBlockChapterBar {
 	vertical-align: top;
 }
 
-.playerButton.hidden:not(.autoHiding) {
+.playerButton.sbhidden:not(.autoHiding) {
 	display: none !important;
 }
 
@@ -169,13 +169,13 @@ div:hover > .sponsorBlockChapterBar {
 	overflow: visible !important;
 }
 
-.autoHiding:not(.hidden) {
+.autoHiding:not(.sbhidden) {
 	transform: translateX(0%) scale(1);
 	/* opacity is from YouTube page */
 	transition: transform 0.2s, width 0.2s, opacity .1s cubic-bezier(0.4,0.0,1,1) !important;
 }
 
-.autoHiding.hidden {
+.autoHiding.sbhidden {
 	transform: translateX(100%) scale(0);
 	/* opacity is from YouTube page */
 	transition: transform 0.2s, width 0.2s, opacity .1s cubic-bezier(0.4,0.0,1,1) !important;
@@ -183,7 +183,7 @@ div:hover > .sponsorBlockChapterBar {
 	width: 0px !important;
 }
 
-.autoHiding.hidden.autoHideLeft {
+.autoHiding.sbhidden.autoHideLeft {
 	transform: translateX(-100%) scale(0);
 }
 
@@ -272,7 +272,7 @@ div:hover > .sponsorBlockChapterBar {
 	max-width: calc(100% - 50px);
 }
 
-.sponsorSkipNotice .hidden {
+.sponsorSkipNotice .sbhidden {
 	display: none;
 }
 
@@ -691,7 +691,7 @@ input::-webkit-inner-spin-button {
     color: white;
 }
 
-.skipButtonControlBarContainer.hidden {
+.skipButtonControlBarContainer.sbhidden {
 	display: none !important;
 }
 

public/options/options.css

@@ -257,7 +257,7 @@ input[type='number'] {
     opacity: 0;
 }
 
-.hidden {
+.hidden, .sbhidden {
     display: none !important;
 }
 

public/permissions/styles.css

@@ -19,7 +19,7 @@ body {
     font-weight: bold;
 }
 
-.hidden {
+.hidden, .sbhidden {
     display: none !important;
 }
 

public/popup.css

@@ -27,7 +27,7 @@
   position: relative;
 }
 
-#sponsorBlockPopupBody .hidden {
+#sponsorBlockPopupBody .hidden, #sponsorBlockPopupBody .sbhidden {
   display: none !important;
 }
 
@@ -260,19 +260,6 @@
   text-align: right;
 }
 
-/*
- * Buttons that appear under a segment on click
- */
-.voteButton {
-  height: 20px;
-  padding: 0 5px;
-  cursor: pointer;
-}
-
-.voteButton:hover {
-  opacity: 0.8;
-}
-
 /*
  * "Voted!" text that appears after voting on a segment
  */

public/shared.css

@@ -36,7 +36,7 @@
 	max-width: calc(100% - 50px);
 }
 
-.sponsorSkipNotice .hidden {
+.sponsorSkipNotice .sbhidden {
 	display: none;
 }
 
@@ -217,3 +217,16 @@
 	display: flex;
 	align-items: center;
 }
+
+/*
+ * Buttons that appear under a segment on click
+ */
+.voteButton {
+	height: 20px;
+	padding: 0 5px;
+	cursor: pointer;
+}
+
+.voteButton:hover {
+	opacity: 0.8;
+}

src/components/ChapterVoteComponent.tsx

@@ -44,7 +44,7 @@ class ChapterVoteComponent extends React.Component<ChapterVoteProps, ChapterVote
             <>
                 {/* Upvote Button */}
                 <button id={"sponsorTimesDownvoteButtonsContainerUpvoteChapter"}
-                        className={"playerButton sbPlayerUpvote ytp-button " + (!this.state.show ? "hidden" : "")}
+                        className={"playerButton sbPlayerUpvote ytp-button " + (!this.state.show ? "sbhidden" : "")}
                         draggable="false"
                         title={chrome.i18n.getMessage("upvoteButtonInfo")}
                         onClick={(e) => this.vote(e, 1)}>
@@ -55,7 +55,7 @@ class ChapterVoteComponent extends React.Component<ChapterVoteProps, ChapterVote
 
                 {/* Downvote Button */}
                 <button id={"sponsorTimesDownvoteButtonsContainerDownvoteChapter"}
-                        className={"playerButton sbPlayerDownvote ytp-button " + (!this.state.show ? "hidden" : "")}
+                        className={"playerButton sbPlayerDownvote ytp-button " + (!this.state.show ? "sbhidden" : "")}
                         draggable="false"
                         title={chrome.i18n.getMessage("reportButtonInfo")}
                         onClick={(e) => {

src/components/NoticeComponent.tsx

@@ -196,21 +196,21 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
                     <span 
                         id={"skipNoticeTimerText" + this.idSuffix}
                         key="skipNoticeTimerText"
-                        className={this.state.countdownMode !== CountdownMode.Timer ? "hidden" : ""} >
+                        className={this.state.countdownMode !== CountdownMode.Timer ? "sbhidden" : ""} >
                             {chrome.i18n.getMessage("NoticeTimeAfterSkip").replace("{seconds}", this.state.countdownTime.toString())}
                     </span>
                 ),(
                     <img 
                         id={"skipNoticeTimerPaused" + this.idSuffix}
                         key="skipNoticeTimerPaused"
-                        className={this.state.countdownMode !== CountdownMode.Paused ? "hidden" : ""}
+                        className={this.state.countdownMode !== CountdownMode.Paused ? "sbhidden" : ""}
                         src={chrome.runtime.getURL("icons/pause.svg")}
                         alt={chrome.i18n.getMessage("paused")} />
                 ),(
                     <img 
                         id={"skipNoticeTimerStopped" + this.idSuffix}
                         key="skipNoticeTimerStopped"
-                        className={this.state.countdownMode !== CountdownMode.Stopped ? "hidden" : ""}
+                        className={this.state.countdownMode !== CountdownMode.Stopped ? "sbhidden" : ""}
                         src={chrome.runtime.getURL("icons/stop.svg")}
                         alt={chrome.i18n.getMessage("manualPaused")} />
         )];

src/components/SponsorTimeEditComponent.tsx

@@ -297,7 +297,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                 ): ""}
 
                 {(!isNaN(segment[1]) && ![ActionType.Poi, ActionType.Full].includes(sponsorTime.actionType)) ? (
-                    <span id={"sponsorTimePreviewButton" + this.idSuffix}
+                    <span id={"sponsorTimePreviewEndButton" + this.idSuffix}
                         className="sponsorTimeEditButton"
                         onClick={(e) => this.previewTime(e.ctrlKey, e.shiftKey, true)}>
                         {chrome.i18n.getMessage("End")}
@@ -590,7 +590,24 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
             getFormattedTime(sponsorTime.segment[1], true)];
     }
 
+    lastEditTime = 0;
+    editTimeTimeout: NodeJS.Timeout | null = null;
     saveEditTimes(): void {
+        // Rate limit edits
+        const timeSinceLastEdit = Date.now() - this.lastEditTime;
+        if (timeSinceLastEdit < 200) {
+            if (!this.editTimeTimeout) {
+                this.editTimeTimeout = setTimeout(() => {
+                    this.saveEditTimes();
+                }, timeSinceLastEdit)
+            }
+
+            return;
+        }
+
+        this.lastEditTime = Date.now();
+        this.editTimeTimeout = null;
+
         const sponsorTimesSubmitting = this.props.contentContainer().sponsorTimesSubmitting;
         const category = this.categoryOptionRef.current.value as Category
 

src/components/SubmissionNoticeComponent.tsx

@@ -38,6 +38,8 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
 
     guidelinesReminder: GenericNotice;
 
+    lastSegmentCount: number;
+
     constructor(props: SubmissionNoticeProps) {
         super(props);
         this.noticeRef = React.createRef();
@@ -47,12 +49,14 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
     
         const noticeTitle = chrome.i18n.getMessage("confirmNoticeTitle");
 
+        this.lastSegmentCount = this.props.contentContainer().sponsorTimesSubmitting.length;
+
         // Setup state
         this.state = {
             noticeTitle,
             messages: [],
             idSuffix: "SubmissionNotice"
-        }
+        };
     }
 
     componentDidMount(): void {
@@ -73,6 +77,18 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
         }
     }
 
+    componentDidUpdate() {
+        const currentSegmentCount = this.props.contentContainer().sponsorTimesSubmitting.length;
+        if (currentSegmentCount > this.lastSegmentCount) {
+            this.lastSegmentCount = currentSegmentCount;
+
+            const scrollElement = this.noticeRef.current.getElement().current.querySelector("#sponsorSkipNoticeMiddleRowSubmissionNotice");
+            scrollElement.scrollTo({
+                top: scrollElement.scrollHeight + 1000
+            });
+        }
+    }
+
     render(): React.ReactElement {
         const sortButton = 
             <img id={"sponsorSkipSortButton" + this.state.idSuffix} 

src/content.ts

@@ -98,6 +98,8 @@ utils.wait(() => Config.isReady(), 5000, 10).then(() => {
 });
 
 const skipBuffer = 0.003;
+// If this close to the end, skip to the end
+const endTimeSkipBuffer = 0.5;
 
 //was sponsor data found when doing SponsorsLookup
 let sponsorDataFound = false;
@@ -302,8 +304,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
             reskipSponsorTime(sponsorTimes.find((segment) => segment.UUID === request.UUID), true);
             break;
         case "selectSegment":
-            selectedSegment = request.UUID;
+            selectSegment(request.UUID);
-            updatePreviewBar();
             break;
         case "submitVote":
             vote(request.type, request.UUID).then((response) => sendResponse(response));
@@ -623,7 +624,8 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
 
     updateActiveSegment(currentTime);
 
-    if (getVideo().paused) return;
+    if (getVideo().paused 
+        || (getVideo().currentTime >= getVideo().duration - 0.01 && getVideo().duration > 1)) return;
     const skipInfo = getNextSkipIndex(currentTime, includeIntersectingSegments, includeNonIntersectingSegments);
 
     const currentSkip = skipInfo.array[skipInfo.index];
@@ -702,8 +704,12 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
                     forcedSkipTime = skipTime[0] + 0.001;
                 } else {
                     forcedSkipTime = skipTime[1];
-                    forcedIncludeIntersectingSegments = true;
                     forcedIncludeNonIntersectingSegments = false;
+
+                    // Only if not at the end of the video
+                    if (Math.abs(skipTime[1] - getVideo().duration) > endTimeSkipBuffer) {
+                        forcedIncludeIntersectingSegments = true;
+                    }
                 }
             } else {
                 forcedSkipTime = forceVideoTime + 0.001;
@@ -1071,6 +1077,7 @@ function setupSkipButtonControlBar() {
                 openNotice: true,
                 forceAutoSkip: true
             }),
+            selectSegment,
             onMobileYouTube: isOnMobileYouTube()
         });
     }
@@ -1349,6 +1356,11 @@ function updatePreviewBarPositionMobile(parent: HTMLElement) {
     }
 }
 
+function selectSegment(UUID: SegmentUUID): void {
+    selectedSegment = UUID;
+    updatePreviewBar();
+}
+
 function updatePreviewBar(): void {
     if (previewBar === null) return;
 
@@ -1660,6 +1672,9 @@ function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, u
                     // MacOS will loop otherwise #1027
                     // Sometimes playlists loop too #1804
                     v.currentTime = v.duration - 0.001;
+                } else if (v.duration > 1 && Math.abs(skipTime[1] - v.duration) < endTimeSkipBuffer
+                    && isFirefoxOrSafari() && !isSafari()) {
+                    v.currentTime = v.duration;
                 } else {
                     if (inMuteSegment(skipTime[1], true)) {
                         // Make sure not to mute if skipping into a mute segment

src/js-components/skipButtonControlBar.ts

@@ -1,11 +1,12 @@
 import Config from "../config";
-import { SponsorTime } from "../types";
+import { SegmentUUID, SponsorTime } from "../types";
 import { getSkippingText } from "../utils/categoryUtils";
 import { AnimationUtils } from "../utils/animationUtils";
 import { keybindToString } from "../../maze-utils/src/config";
 
 export interface SkipButtonControlBarProps {
     skip: (segment: SponsorTime) => void;
+    selectSegment: (UUID: SegmentUUID) => void;
     onMobileYouTube: boolean;
 }
 
@@ -41,7 +42,7 @@ export class SkipButtonControlBar {
 
         this.container = document.createElement("div");
         this.container.classList.add("skipButtonControlBarContainer");
-        this.container.classList.add("hidden");
+        this.container.classList.add("sbhidden");
         if (this.onMobileYouTube) this.container.classList.add("mobile");
 
         this.skipIcon = document.createElement("img");
@@ -54,8 +55,18 @@ export class SkipButtonControlBar {
         this.container.appendChild(this.skipIcon);
         this.container.appendChild(this.textContainer);
         this.container.addEventListener("click", () => this.toggleSkip());
-        this.container.addEventListener("mouseenter", () => this.stopTimer());
+        this.container.addEventListener("mouseenter", () => {
-        this.container.addEventListener("mouseleave", () => this.startTimer());
+            this.stopTimer();
+
+            if (this.segment) {
+                props.selectSegment(this.segment.UUID);
+            }
+        });
+        this.container.addEventListener("mouseleave", () => {
+            this.startTimer();
+
+            props.selectSegment(null);
+        });
         if (this.onMobileYouTube) {
             this.container.addEventListener("touchstart", (e) => this.handleTouchStart(e));
             this.container.addEventListener("touchmove", (e) => this.handleTouchMove(e));
@@ -103,7 +114,7 @@ export class SkipButtonControlBar {
 
         this.refreshText();
         this.container?.classList?.remove("textDisabled");
-        this.textContainer?.classList?.remove("hidden");
+        this.textContainer?.classList?.remove("sbhidden");
         AnimationUtils.disableAutoHideAnimation(this.skipIcon);
 
         this.startTimer();
@@ -111,8 +122,8 @@ export class SkipButtonControlBar {
 
     refreshText(): void {
         if (this.segment) {
-            this.chapterText?.classList?.add("hidden");
+            this.chapterText?.classList?.add("sbhidden");
-            this.container.classList.remove("hidden");
+            this.container.classList.remove("sbhidden");
             this.textContainer.innerText = this.getTitle();
             this.skipIcon.setAttribute("title", this.getTitle());
         }
@@ -134,10 +145,10 @@ export class SkipButtonControlBar {
     }
 
     disable(): void {
-        this.container.classList.add("hidden");
+        this.container.classList.add("sbhidden");
 
-        this.chapterText?.classList?.remove("hidden");
+        this.chapterText?.classList?.remove("sbhidden");
-        this.getChapterPrefix()?.classList?.remove("hidden");
+        this.getChapterPrefix()?.classList?.remove("sbhidden");
 
         this.enabled = false;
     }
@@ -160,10 +171,10 @@ export class SkipButtonControlBar {
         }
 
         this.container.classList.add("textDisabled");
-        this.textContainer?.classList?.add("hidden");
+        this.textContainer?.classList?.add("sbhidden");
-        this.chapterText?.classList?.remove("hidden");
+        this.chapterText?.classList?.remove("sbhidden");
 
-        this.getChapterPrefix()?.classList?.add("hidden");
+        this.getChapterPrefix()?.classList?.add("sbhidden");
 
         AnimationUtils.enableAutoHideAnimation(this.skipIcon);
         if (this.onMobileYouTube) {

src/popup.ts

@@ -1052,9 +1052,10 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
      */
     function getFormattedHours(minutes) {
         minutes = Math.round(minutes * 10) / 10;
-        const days = Math.floor(minutes / 1440);
+        const years = Math.floor(minutes / 525600); // Assumes 365.0 days in a year
+        const days = Math.floor(minutes / 1440) % 365;
         const hours = Math.floor(minutes / 60) % 24;
-        return (days > 0 ? days + chrome.i18n.getMessage("dayAbbreviation") + " " : "") + (hours > 0 ? hours + chrome.i18n.getMessage("hourAbbreviation") + " " : "") + (minutes % 60).toFixed(1);
+        return (years > 0 ? years + chrome.i18n.getMessage("yearAbbreviation") + " " : "") + (days > 0 ? days + chrome.i18n.getMessage("dayAbbreviation") + " " : "") + (hours > 0 ? hours + chrome.i18n.getMessage("hourAbbreviation") + " " : "") + (minutes % 60).toFixed(1);
     }
 
     function contentConfigUpdateListener(changes: StorageChangesObject) {

src/utils/animationUtils.ts

@@ -27,7 +27,7 @@ function applyLoadingAnimation(element: HTMLElement, time: number, callback?: ()
 
 function setupCustomHideAnimation(element: Element, container: Element, enabled = true, rightSlide = true): { hide: () => void; show: () => void } {
     if (enabled) element.classList.add("autoHiding");
-    element.classList.add("hidden");
+    element.classList.add("sbhidden");
     element.classList.add("animationDone");
     if (!rightSlide) element.classList.add("autoHideLeft");
 
@@ -37,7 +37,7 @@ function setupCustomHideAnimation(element: Element, container: Element, enabled
         hide: () => {
             mouseEntered = false;
             if (element.classList.contains("autoHiding")) {
-                element.classList.add("hidden");
+                element.classList.add("sbhidden");
             }
         },
         show: () => {
@@ -46,7 +46,7 @@ function setupCustomHideAnimation(element: Element, container: Element, enabled
 
             // Wait for next event loop
             setTimeout(() => {
-                if (mouseEntered) element.classList.remove("hidden")
+                if (mouseEntered) element.classList.remove("sbhidden")
             }, 10);
         }
     };
@@ -61,12 +61,12 @@ function setupAutoHideAnimation(element: Element, container: Element, enabled =
 
 function enableAutoHideAnimation(element: Element): void {
     element.classList.add("autoHiding");
-    element.classList.add("hidden");
+    element.classList.add("sbhidden");
 }
 
 function disableAutoHideAnimation(element: Element): void {
     element.classList.remove("autoHiding");
-    element.classList.remove("hidden");
+    element.classList.remove("sbhidden");
 }
 
 export const AnimationUtils = {