Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into channelTrailer

manifest/manifest.json

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

public/content.css

@@ -26,6 +26,11 @@
 	height: 100%;
 }
 
+/* Make sure settings are upfront */
+.ytp-settings-menu {
+	z-index: 6000 !important;
+}
+
 /* Preview Bar page hacks */
 
 .ytp-tooltip:not(.sponsorCategoryTooltipVisible) .sponsorCategoryTooltip {

src/components/NoticeComponent.tsx

@@ -16,8 +16,6 @@ export interface NoticeProps {
     timed?: boolean,
     idSuffix?: string,
 
-    videoSpeed?: () => number,
-
     fadeIn?: boolean,
     startFaded?: boolean,
     firstColumn?: React.ReactElement,
@@ -51,7 +49,6 @@ export interface NoticeState {
 
 class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
     countdownInterval: NodeJS.Timeout;
-    intervalVideoSpeed: number;
 
     idSuffix: string;
 
@@ -259,10 +256,6 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
 
         const countdownTime = Math.min(this.state.countdownTime - 1, this.state.maxCountdownTime());
 
-        if (this.props.videoSpeed && this.intervalVideoSpeed != this.props.videoSpeed()) {
-            this.setupInterval();
-        }
-
         if (countdownTime <= 0) {
             //remove this from setInterval
             clearInterval(this.countdownInterval);
@@ -325,10 +318,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
     setupInterval(): void {
         if (this.countdownInterval) clearInterval(this.countdownInterval);
 
-        const intervalDuration = this.props.videoSpeed ? 1000 / this.props.videoSpeed() : 1000;
-        this.countdownInterval = setInterval(this.countdown.bind(this), intervalDuration);
-
-        if (this.props.videoSpeed) this.intervalVideoSpeed = this.props.videoSpeed();
+        this.countdownInterval = setInterval(this.countdown.bind(this), 1000);
     }
 
     resetCountdown(): void {

src/components/SkipNoticeComponent.tsx

@@ -177,7 +177,6 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                     || (Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAutoSkip && this.autoSkip)}
                 timed={true}
                 maxCountdownTime={this.state.maxCountdownTime}
-                videoSpeed={() => this.contentContainer().v?.playbackRate}
                 style={noticeStyle}
                 biggerCloseButton={this.contentContainer().onMobileYouTube}
                 ref={this.noticeRef}

src/components/SubmissionNoticeComponent.tsx

@@ -73,7 +73,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                 idSuffix={this.state.idSuffix}
                 ref={this.noticeRef}
                 closeListener={this.cancel.bind(this)}
-                zIndex={50000}>
+                zIndex={5000}>
 
                 {/* Text Boxes */}
                 {this.getMessageBoxes()}

src/popup.ts

@@ -739,7 +739,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
      */
     function getFormattedHours(minutes) {
         minutes = Math.round(minutes * 10) / 10;
-        const days = Math.floor(minutes / 3600);
+        const days = Math.floor(minutes / 1440);
         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);
     }

src/utils.ts

@@ -27,7 +27,10 @@ export default class Utils {
     /** Function that can be used to wait for a condition before returning. */
     async wait<T>(condition: () => T | false, timeout = 5000, check = 100): Promise<T> {
         return await new Promise((resolve, reject) => {
-            setTimeout(() => reject("TIMEOUT"), timeout);
+            setTimeout(() => {
+                clearInterval(interval);
+                reject("TIMEOUT");
+            }, timeout);
 
             const intervalCheck = () => {
                 const result = condition();