bump version

Merge pull request #1331 from mchangrh/updateDependencies
update dependencies & bump minimum node version
2025-12-12 22:47:18 +03:00 · 2022-05-25 14:16:45 -04:00 · 2022-05-25 00:01:10 -04:00 · 2022-05-24 23:54:05 -04:00 · 2022-05-24 23:31:43 -04:00 · 2022-05-24 21:23:05 -04:00
20 changed files with 3575 additions and 2921 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,34 +0,0 @@
-module.exports = {
-    env: {
-        browser: true,
-        es2021: true,
-        node: true,
-        jest: true,
-        jasmine: true,
-    },
-    extends: [
-        "eslint:recommended",
-        "plugin:react/recommended",
-        "plugin:@typescript-eslint/recommended",
-    ],
-    parser: "@typescript-eslint/parser",
-    parserOptions: {
-        ecmaFeatures: {
-            jsx: true,
-        },
-        ecmaVersion: 12,
-        sourceType: "module",
-    },
-    plugins: ["react", "@typescript-eslint"],
-    rules: {
-        // TODO: Remove warn rules when not needed anymore
-        "no-self-assign": "off",
-        "@typescript-eslint/no-empty-interface": "off",
-        "react/prop-types": [2, { ignore: ['children'] }]
-    },
-    settings: {
-        react: {
-            version: "detect",
-        },
-    },
-};
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -0,0 +1,33 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true,
+        "node": true,
+        "jest": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:react/recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaFeatures": {
+            "jsx": true
+        },
+        "ecmaVersion": 12,
+        "sourceType": "module"
+    },
+    "plugins": ["react", "@typescript-eslint"],
+    "rules": {
+        "@typescript-eslint/no-unused-vars": "error",
+        "no-self-assign": "off",
+        "@typescript-eslint/no-empty-interface": "off",
+        "react/prop-types": [2, { "ignore": ["children"] }]
+    },
+    "settings": {
+        "react": {
+            "version": "detect"
+        }
+    }
+}
--- a/jest.config.cjs
+++ b/jest.config.cjs
@@ -5,4 +5,5 @@ module.exports = {
    "transform": {
        "^.+\\.ts$": "ts-jest"
    },
+    "reporters": ["github-actions"]
 }; 
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
    "name": "__MSG_fullName__",
    "short_name": "SponsorBlock",
-    "version": "4.4.2",
+    "version": "4.4.5",
    "default_locale": "en",
    "description": "__MSG_Description__",
    "homepage_url": "https://sponsor.ajay.app",
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -3,39 +3,40 @@
  "version": "1.0.0",
  "description": "",
  "main": "background.js",
+  "type": "module",
  "dependencies": {
    "react": "^17.0.2",
    "react-dom": "^17.0.2"
  },
  "devDependencies": {
-    "@types/chrome": "^0.0.180",
+    "@types/chrome": "^0.0.188",
    "@types/firefox-webext-browser": "^94.0.1",
-    "@types/jest": "^27.4.1",
+    "@types/jest": "^27.5.1",
    "@types/react": "^17.0.43",
    "@types/react-dom": "^17.0.14",
-    "@types/selenium-webdriver": "^4.0.18",
+    "@types/selenium-webdriver": "^4.1.0",
    "@types/wicg-mediasession": "^1.1.3",
-    "@typescript-eslint/eslint-plugin": "^5.17.0",
-    "@typescript-eslint/parser": "^5.17.0",
-    "chromedriver": "^100.0.0",
-    "concurrently": "^7.0.0",
-    "copy-webpack-plugin": "^10.2.4",
-    "eslint": "^8.12.0",
-    "eslint-plugin-react": "^7.29.4",
-    "fork-ts-checker-webpack-plugin": "^7.2.1",
-    "jest": "^27.5.1",
+    "@typescript-eslint/eslint-plugin": "^5.26.0",
+    "@typescript-eslint/parser": "^5.26.0",
+    "chromedriver": "^101.0.0",
+    "concurrently": "^7.2.1",
+    "copy-webpack-plugin": "^11.0.0",
+    "eslint": "^8.16.0",
+    "eslint-plugin-react": "^7.30.0",
+    "fork-ts-checker-webpack-plugin": "^7.2.11",
+    "jest": "^28.1.0",
    "rimraf": "^3.0.2",
    "schema-utils": "^4.0.0",
-    "selenium-webdriver": "^4.1.1",
+    "selenium-webdriver": "^4.1.2",
    "speed-measure-webpack-plugin": "^1.5.0",
-    "ts-jest": "^27.1.4",
-    "ts-loader": "^9.2.8",
-    "ts-node": "^10.7.0",
-    "typescript": "4.6",
+    "ts-jest": "^28.0.3",
+    "ts-loader": "^9.3.0",
+    "ts-node": "^10.8.0",
+    "typescript": "4.7",
    "web-ext": "^6.8.0",
-    "webpack": "^5.64.4",
+    "webpack": "^5.72.1",
    "webpack-cli": "^4.9.2",
-    "webpack-merge": "^4.2.2"
+    "webpack-merge": "^5.8.0"
  },
  "scripts": {
    "web-run": "npm run web-run:chrome",
@@ -65,7 +66,7 @@
    "lint:fix": "eslint src --fix"
  },
  "engines": {
-    "node": ">=12.20.0"
+    "node": ">=16"
  },
  "funding": [
    {
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -101,7 +101,7 @@
        "message": "It seems the server is down. Contact the dev immediately."
    },
    "connectionError": {
-        "message": "A connection error has occured. Error code: "
+        "message": "A connection error has occurred. Error code: "
    },
    "clearTimes": {
        "message": "Clear Segments"
@@ -356,7 +356,7 @@
        "message": "Show Time With Skips Removed"
    },
    "showTimeWithSkipsDescription": {
-        "message": "This time appears in brackets next to the current time on below the seekbar. This shows the total video duration minus any segments. This includes segments marked as only \"Show In Seekbar\"."
+        "message": "This time appears in brackets next to the current time on below the Seek Bar. This shows the total video duration minus any segments. This includes segments marked as only \"Show In Seek Bar\"."
    },
    "youHaveSkipped": {
        "message": "You've skipped "
@@ -410,7 +410,7 @@
        "message": "Supported Sites: "
    },
    "optionsInfo": {
-        "message": "Enable Invidious support, disable autoskip, hide buttons and more."
+        "message": "Enable Invidious support, disable auto skip, hide buttons and more."
    },
    "addInvidiousInstance": {
        "message": "Add 3rd-Party Client Instance"
@@ -499,7 +499,7 @@
    "incorrectlyFormattedOptions": {
        "message": "This JSON is not formatted correctly. Your options have not been changed."
    },
-    "confirmNoticeTitle" : {
+    "confirmNoticeTitle": {
        "message": "Submit Segment"
    },
    "submit": {
@@ -947,5 +947,11 @@
    },
    "openOptionsPage": {
        "message": "Open options page"
+    },
+    "resetToDefault": {
+        "message": "Reset settings to default"
+    },
+    "confirmResetToDefault": {
+        "message": "Are you sure you want to reset all settings to their default values? This cannot be undone."
    }
 }
--- a/public/_locales/sv/messages.json
+++ b/public/_locales/sv/messages.json
@@ -186,7 +186,7 @@
        "message": "Detta döljer knapparna på YouTube-spelaren som du kan skicka in segment med som ska hoppas över."
    },
    "showSkipButton": {
-        "message": "Behåll knappen hoppa till markerat på spelaren"
+        "message": "Behåll knappen hoppa till höjdpunkt på spelaren"
    },
    "showInfoButton": {
        "message": "Visa Infoknapp På YouTube-spelaren"
@@ -613,7 +613,7 @@
        "message": "Icke-musik"
    },
    "category_poi_highlight": {
-        "message": "Markera"
+        "message": "Höjdpunkt"
    },
    "category_poi_highlight_description": {
        "message": "Den del av videon som de flesta letar efter. Liknande kommentarer \"Video börjar på x\"."
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -368,6 +368,12 @@
 					</div>
 				</div>

+				<div data-type="button-press" data-sync="resetToDefault" data-confirm-message="confirmResetToDefault">
+					<div class="option-button trigger-button">
+						__MSG_resetToDefault__
+					</div>
+				</div>
+
 			</div>

 			<div id="advanced" class="option-group hidden">
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as CompileConfig from "../../config.json";
 import Config from "../config"
-import { Category, ContentContainer, SponsorHideType, SponsorTime, NoticeVisbilityMode, ActionType, SponsorSourceType, SegmentUUID } from "../types";
+import { Category, ContentContainer, SponsorTime, NoticeVisbilityMode, ActionType, SponsorSourceType, SegmentUUID } from "../types";
 import NoticeComponent from "./NoticeComponent";
 import NoticeTextSelectionComponent from "./NoticeTextSectionComponent";
 import Utils from "../utils";
@@ -72,7 +72,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta

    amountOfPreviousNotices: number;
    showInSecondSlot: boolean;
-    
+
    idSuffix: string;

    noticeRef: React.MutableRefObject<NoticeComponent>;
@@ -105,7 +105,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        if (this.segments.length > 1) {
            this.segments.sort((a, b) => a.segment[0] - b.segment[0]);
        }
-    
+
        // This is the suffix added at the end of every id
        for (const segment of this.segments) {
            this.idSuffix += segment.UUID;
@@ -168,7 +168,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
            noticeStyle.transform = "scale(0.8) translate(10%, 10%)";
        }

-        // If it started out as smaller, always keep the 
+        // If it started out as smaller, always keep the
        // skip button there
        const showFirstSkipButton = this.props.smaller || this.segments[0].actionType === ActionType.Mute;
        const firstColumn = showFirstSkipButton ? (
@@ -181,7 +181,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                showInSecondSlot={this.showInSecondSlot}
                idSuffix={this.idSuffix}
                fadeIn={true}
-                startFaded={Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAll 
+                startFaded={Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAll
                    || (Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAutoSkip && this.autoSkip)}
                timed={true}
                maxCountdownTime={this.state.maxCountdownTime}
@@ -205,7 +205,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                key={0}>

                {/* Vote Button Container */}
-                {!this.state.thanksForVotingText ? 
+                {!this.state.thanksForVotingText ?
                    <td id={"sponsorTimesVoteButtonsContainer" + this.idSuffix}
                        className="sponsorTimesVoteButtonsContainer">

@@ -268,7 +268,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                    ? this.getSkipButton(1) : null}

                {/* Never show button */}
-                {!this.autoSkip || this.props.startReskip ? "" : 
+                {!this.autoSkip || this.props.startReskip ? "" :
                    <td className="sponsorSkipNoticeRightSection"
                        key={1}>
                        <button className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton"
@@ -343,7 +343,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
    }

    getSkipButton(buttonIndex: number): JSX.Element {
-        if (this.state.showSkipButton[buttonIndex] && (this.segments.length > 1 
+        if (this.state.showSkipButton[buttonIndex] && (this.segments.length > 1
                || this.segments[0].actionType !== ActionType.Poi
                || this.props.unskipTime)) {

@@ -365,8 +365,8 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                            className="sponsorSkipObject sponsorSkipNoticeButton"
                            style={style}
                            onClick={() => this.prepAction(buttonIndex === 1 ? SkipNoticeAction.Unskip1 : SkipNoticeAction.Unskip0)}>
-                        {this.getSkipButtonText(buttonIndex, forceSeek ? ActionType.Skip : null) 
-                            + (!forceSeek && this.state.showKeybindHint 
+                        {this.getSkipButtonText(buttonIndex, forceSeek ? ActionType.Skip : null)
+                            + (!forceSeek && this.state.showKeybindHint
                                ? " (" + keybindToString(Config.config.skipKeybind) + ")" : "")}
                    </button>
                </span>
@@ -379,7 +379,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        for (let i = 0; i < this.segments.length; i++) {
            elements.push(
                <button className="sponsorSkipObject sponsorSkipNoticeButton"
-                        style={{opacity: this.getSubmissionChooserOpacity(i), 
+                        style={{opacity: this.getSubmissionChooserOpacity(i),
                                color: this.getSubmissionChooserColor(i)}}
                        onClick={() => this.performAction(i)}
                        key={"submission" + i + this.segments[i].category + this.idSuffix}>
@@ -404,7 +404,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
    getSubmissionChooserColor(index: number): string {
        const isDownvote = this.state.actionState == SkipNoticeAction.Downvote;
        const isCopyDownvote = this.state.actionState == SkipNoticeAction.CopyDownvote;
-        const shouldWarnUser = Config.config.isVip && (isDownvote || isCopyDownvote) 
+        const shouldWarnUser = Config.config.isVip && (isDownvote || isCopyDownvote)
                                        && this.segments[index].locked === 1;

        return shouldWarnUser ? this.lockedColor : this.unselectedColor;
@@ -480,8 +480,8 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta

    /**
     * Performs the action from the current state
-     * 
-     * @param index 
+     *
+     * @param index
     */
    performAction(index: number, action?: SkipNoticeAction): void {
        switch (action ?? this.state.actionState) {
@@ -620,7 +620,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
        // See if the title should be changed
        if (!this.autoSkip) {
            newState.noticeTitle = chrome.i18n.getMessage("noticeTitle");
-        }       
+        }

        //reset countdown
        this.setState(newState, () => {
@@ -723,7 +723,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
            messages
        });
    }
-    
+
    addVoteButtonInfo(message: string): void {
        this.setState({
            thanksForVotingText: message
@@ -786,7 +786,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
            case ActionType.Mute: {
                return chrome.i18n.getMessage("unmute");
            }
-            case ActionType.Skip: 
+            case ActionType.Skip:
            default: {
                return chrome.i18n.getMessage("unskip");
            }
@@ -799,7 +799,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
            case ActionType.Mute: {
                return chrome.i18n.getMessage("mute");
            }
-            case ActionType.Skip: 
+            case ActionType.Skip:
            default: {
                return chrome.i18n.getMessage("reskip");
            }
@@ -812,7 +812,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
            case ActionType.Mute: {
                return chrome.i18n.getMessage("mute");
            }
-            case ActionType.Skip: 
+            case ActionType.Skip:
            default: {
                return chrome.i18n.getMessage("skip");
            }
--- a/src/components/TooltipComponent.tsx
+++ b/src/components/TooltipComponent.tsx
@@ -1,6 +1,4 @@
 import * as React from "react";
-import Config from "../config";
-import { Category, SegmentUUID, SponsorTime } from "../types";

 export interface TooltipProps {
    text: string;
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,6 +1,6 @@
 import * as CompileConfig from "../config.json";
 import * as invidiousList from "../ci/invidiouslist.json";
-import { Category, CategorySelection, CategorySkipOption, NoticeVisbilityMode, PreviewBarOption, SponsorTime, StorageChangesObject, UnEncodedSegmentTimes as UnencodedSegmentTimes, Keybind, HashedValue, VideoID, SponsorHideType } from "./types";
+import { Category, CategorySelection, CategorySkipOption, NoticeVisbilityMode, PreviewBarOption, SponsorTime, StorageChangesObject, Keybind, HashedValue, VideoID, SponsorHideType } from "./types";
 import { keybindEquals } from "./utils/configUtils";

 interface SBConfig {
@@ -113,6 +113,7 @@ export interface SBObject {
    local: SBStorage;
    forceSyncUpdate(prop: string): void;
    forceLocalUpdate(prop: string): void;
+    resetToDefault(): void;
 }

 const Config: SBObject = {
@@ -289,7 +290,8 @@ const Config: SBObject = {
    config: null,
    local: null,
    forceSyncUpdate,
-    forceLocalUpdate
+    forceLocalUpdate,
+    resetToDefault
 };

 // Function setup
@@ -300,7 +302,7 @@ function configProxy(): { sync: SBConfig, local: SBStorage } {
            for (const key in changes) {
                Config.cachedSyncConfig[key] = changes[key].newValue;
            }
-    
+
            for (const callback of Config.configSyncListeners) {
                callback(changes);
            }
@@ -310,7 +312,7 @@ function configProxy(): { sync: SBConfig, local: SBStorage } {
            }
        }
    });
-	
+
    const syncHandler: ProxyHandler<SBConfig> = {
        set<K extends keyof SBConfig>(obj: SBConfig, prop: K, value: SBConfig[K]) {
            Config.cachedSyncConfig[prop] = value;
@@ -327,10 +329,10 @@ function configProxy(): { sync: SBConfig, local: SBStorage } {

            return obj[prop] || data;
        },
-	
+
        deleteProperty(obj: SBConfig, prop: keyof SBConfig) {
            chrome.storage.sync.remove(<string> prop);
-            
+
            return true;
        }

@@ -352,10 +354,10 @@ function configProxy(): { sync: SBConfig, local: SBStorage } {

            return obj[prop] || data;
        },
-	
+
        deleteProperty(obj: SBStorage, prop: keyof SBStorage) {
            chrome.storage.local.remove(<string> prop);
-            
+
            return true;
        }

@@ -379,7 +381,7 @@ function forceLocalUpdate(prop: string): void {
    });
 }

-async function fetchConfig(): Promise<void> { 
+async function fetchConfig(): Promise<void> {
    await Promise.all([new Promise<void>((resolve) => {
        chrome.storage.sync.get(null, function(items) {
            Config.cachedSyncConfig = <SBConfig> <unknown> items;
@@ -387,7 +389,7 @@ async function fetchConfig(): Promise<void> {
        });
    }), new Promise<void>((resolve) => {
        chrome.storage.local.get(null, function(items) {
-            Config.cachedLocalStorage = <SBStorage> <unknown> items; 
+            Config.cachedLocalStorage = <SBStorage> <unknown> items;
            resolve();
        });
    })]);
@@ -431,9 +433,9 @@ function migrateOldSyncFormats(config: SBConfig) {
    if (!config["autoSkipOnMusicVideosUpdate"]) {
        config["autoSkipOnMusicVideosUpdate"] = true;
        for (const selection of config.categorySelections) {
-            if (selection.name === "music_offtopic" 
+            if (selection.name === "music_offtopic"
                    && selection.option === CategorySkipOption.AutoSkip) {
-                
+
                config.autoSkipOnMusicVideos = true;
                break;
            }
@@ -522,6 +524,16 @@ function addDefaults() {
    }
 }

+function resetToDefault() {
+    chrome.storage.sync.set({
+        ...Config.syncDefaults,
+        userID: Config.config.userID,
+        minutesSaved: Config.config.minutesSaved,
+        skipCount: Config.config.skipCount,
+        sponsorTimesContributed: Config.config.sponsorTimesContributed
+    });
+}
+
 // Sync config
 setupConfig();

--- a/src/content.ts
+++ b/src/content.ts
@@ -276,6 +276,7 @@ function resetValues() {
        switchingVideos = false;
    } else {
        switchingVideos = true;
+        logDebug("Setting switching videos to true (reset data)");
    }

    firstEvent = true;
@@ -320,9 +321,6 @@ async function videoIDChange(id) {
        }
    }

-    // Get new video info
-    // getVideoInfo(); // Seems to have been replaced
-
    // Update whitelist data when the video data is loaded
    whitelistCheck();

@@ -482,14 +480,7 @@ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?:

    if (!video || video.paused) return;
    if (currentTime === undefined || currentTime === null) {
-        const virtualTime = lastTimeFromWaitingEvent ?? (lastKnownVideoTime.videoTime ?
-            (performance.now() - lastKnownVideoTime.preciseTime) / 1000 + lastKnownVideoTime.videoTime : null);
-        if ((lastTimeFromWaitingEvent || !utils.isFirefox()) 
-                && !isSafari() && virtualTime && Math.abs(virtualTime - video.currentTime) < 0.6){
-            currentTime = virtualTime;
-        } else {
-            currentTime = video.currentTime;
-        }
+        currentTime = getVirtualTime();
    }
    lastTimeFromWaitingEvent = null;

@@ -543,7 +534,7 @@ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?:
        let forcedIncludeNonIntersectingSegments = true;

        if (incorrectVideoCheck(videoID, currentSkip)) return;
-        forceVideoTime ||= video.currentTime;
+        forceVideoTime ||= Math.max(video.currentTime, getVirtualTime());

        if (forceVideoTime >= skipTime[0] && forceVideoTime < skipTime[1]) {
            skipToTime({
@@ -574,6 +565,8 @@ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?:
            // Use interval instead of timeout near the end to combat imprecise video time
            const startIntervalTime = performance.now();
            const startVideoTime = Math.max(currentTime, video.currentTime);
+            logDebug(`Starting setInterval skipping ${video.currentTime} to skip at ${skipTime[0]}`);
+
            currentSkipInterval = setInterval(() => {
                const intervalDuration = performance.now() - startIntervalTime;
                if (intervalDuration >= delayTime || video.currentTime >= skipTime[0]) {
@@ -588,12 +581,26 @@ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?:
                }
            }, 1);
        } else {
+            logDebug(`Starting timeout to skip ${video.currentTime} to skip at ${skipTime[0]}`);
+            
            // Schedule for right before to be more precise than normal timeout
-            currentSkipSchedule = setTimeout(skippingFunction, Math.max(0, delayTime - 100));
+            currentSkipSchedule = setTimeout(skippingFunction, Math.max(0, delayTime - 150));
        }
    }
 }

+function getVirtualTime(): number {
+    const virtualTime = lastTimeFromWaitingEvent ?? (lastKnownVideoTime.videoTime ?
+        (performance.now() - lastKnownVideoTime.preciseTime) / 1000 + lastKnownVideoTime.videoTime : null);
+
+    if ((lastTimeFromWaitingEvent || !utils.isFirefox())
+        && !isSafari() && virtualTime && Math.abs(virtualTime - video.currentTime) < 0.6) {
+        return virtualTime;
+    } else {
+        return video.currentTime;
+    }
+}
+
 function inMuteSegment(currentTime: number): boolean {
    const checkFunction = (segment) => segment.actionType === ActionType.Mute && segment.segment[0] <= currentTime && segment.segment[1] > currentTime;
    return sponsorTimes?.some(checkFunction) || sponsorTimesSubmitting.some(checkFunction);
@@ -677,6 +684,8 @@ function setupVideoListeners() {

            if (switchingVideos) {
                switchingVideos = false;
+                logDebug("Setting switching videos to false");
+
                // If already segments loaded before video, retry to skip starting segments
                if (sponsorTimes) startSkipScheduleCheckingForStartSponsors();
            }
@@ -935,12 +944,10 @@ function startSkipScheduleCheckingForStartSponsors() {
        // See if there are any starting sponsors
        let startingSegmentTime = getStartTimeFromUrl(document.URL) || -1;
        let found = false;
-        let startingSegment: SponsorTime = null;
        for (const time of sponsorTimes) {
            if (time.segment[0] <= video.currentTime && time.segment[0] > startingSegmentTime && time.segment[1] > video.currentTime
                    && time.actionType !== ActionType.Poi) {
                        startingSegmentTime = time.segment[0];
-                        startingSegment = time;
                        found = true;
                break;
            }
@@ -950,7 +957,6 @@ function startSkipScheduleCheckingForStartSponsors() {
                if (time.segment[0] <= video.currentTime && time.segment[0] > startingSegmentTime && time.segment[1] > video.currentTime
                        && time.actionType !== ActionType.Poi) {
                            startingSegmentTime = time.segment[0];
-                            startingSegment = time;
                            found = true;
                    break;
                }
@@ -988,26 +994,6 @@ function startSkipScheduleCheckingForStartSponsors() {
    }
 }

-/**
- * Get the video info for the current tab from YouTube
- *
- * TODO: Replace
- */
-async function getVideoInfo(): Promise<void> {
-    const result = await utils.asyncRequestToCustomServer("GET", "https://www.youtube.com/get_video_info?video_id=" + sponsorVideoID + "&html5=1&c=TVHTML5&cver=7.20190319");
-
-    if (result.ok) {
-        const decodedData = decodeURIComponent(result.responseText).match(/player_response=([^&]*)/)[1];
-        if (!decodedData) {
-            console.error("[SB] Failed at getting video info from YouTube.");
-            console.error("[SB] Data returned from YouTube: " + result.responseText);
-            return;
-        }
-
-        videoInfo = JSON.parse(decodedData);
-    }
-}
-
 function getYouTubeVideoID(document: Document): string | boolean {
    const url = document.URL;
    // clips should never skip, going from clip to full video has no indications.
@@ -1142,7 +1128,7 @@ async function whitelistCheck() {
        ?? document.querySelector("a.ytp-title-channel-logo") // YouTube Embed
        ?? document.querySelector(".channel-profile #channel-name")?.parentElement.parentElement // Invidious
        ?? document.querySelector("a.slim-owner-icon-and-title")) // Mobile YouTube
-            ?.getAttribute("href")?.match(/\/channel\/(UC[a-zA-Z0-9_-]{22})|\/c\/([a-zA-Z0-9_-]+)/)?.[1];
+            ?.getAttribute("href")?.match(/(?:\/c\/|\/channel\/)(UC[a-zA-Z0-9_-]{22}|[a-zA-Z0-9_-]+)/)?.[1];

    try {
        await utils.wait(() => !!getChannelID(), 6000, 20);
@@ -1150,14 +1136,12 @@ async function whitelistCheck() {
        channelIDInfo = {
            status: ChannelIDStatus.Found,
            id: getChannelID().match(/^\/?([^\s/]+)/)[0]
-        }
+        };
    } catch (e) {
        channelIDInfo = {
            status: ChannelIDStatus.Failed,
            id: null
-        }
-
-        return;
+        };
    }

    //see if this is a whitelisted channel
--- a/src/js-components/skipButtonControlBar.ts
+++ b/src/js-components/skipButtonControlBar.ts
@@ -2,10 +2,7 @@ import Config from "../config";
 import { SponsorTime } from "../types";
 import { getSkippingText } from "../utils/categoryUtils";
 import { keybindToString } from "../utils/configUtils";
-
-import Utils from "../utils";
 import { AnimationUtils } from "../utils/animationUtils";
-const utils = new Utils();

 export interface SkipButtonControlBarProps {
    skip: (segment: SponsorTime) => void;
@@ -53,7 +50,7 @@ export class SkipButtonControlBar {
        this.skipIcon.id = "sbSkipIconControlBarImage";

        this.textContainer = document.createElement("div");
-        
+
        this.container.appendChild(this.skipIcon);
        this.container.appendChild(this.textContainer);
        this.container.addEventListener("click", () => this.toggleSkip());
@@ -73,7 +70,7 @@ export class SkipButtonControlBar {
    attachToPage(): void {
        const mountingContainer = this.getMountingContainer();
        this.chapterText = document.querySelector(".ytp-chapter-container");
-    
+
        if (mountingContainer && !mountingContainer.contains(this.container)) {
            if (this.onMobileYouTube) {
                mountingContainer.appendChild(this.container);
@@ -220,4 +217,3 @@ export class SkipButtonControlBar {
        this.container.style.left = this.left + "px";
    }
 }
-
--- a/src/options.ts
+++ b/src/options.ts
@@ -232,12 +232,22 @@ async function init() {
            }
            case "button-press": {
                const actionButton = optionsElements[i].querySelector(".trigger-button");
+                const confirmMessage = optionsElements[i].getAttribute("data-confirm-message");

-                switch(optionsElements[i].getAttribute("data-sync")) {
-                    case "copyDebugInformation":
-                        actionButton.addEventListener("click", copyDebugOutputToClipboard);
-                        break;
-                }
+                actionButton.addEventListener("click", () => {
+                    if (confirmMessage !== null && !confirm(chrome.i18n.getMessage(confirmMessage))) {
+                        return;
+                    }
+                    switch (optionsElements[i].getAttribute("data-sync")) {
+                        case "copyDebugInformation":
+                            copyDebugOutputToClipboard();
+                            break;
+                        case "resetToDefault":
+                            Config.resetToDefault();
+                            window.location.reload();
+                            break;
+                    }
+                });

                break;
            }
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -4,9 +4,9 @@ window["SBLogs"] = {
 };

 export function logDebug(message: string) {
-    window["SBLogs"].debug.push(message);
+    window["SBLogs"].debug.push(`[${new Date().toISOString()}] ${message}`);
 }

 export function logWarn(message: string) {
-    window["SBLogs"].warn.push(message);
+    window["SBLogs"].warn.push(`[${new Date().toISOString()}] ${message}`);
 }
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -1,12 +1,15 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const webpack = require("webpack");
-const path = require('path');
-const CopyPlugin = require('copy-webpack-plugin');
-const BuildManifest = require('./webpack.manifest');
-const srcDir = '../src/';
-const fs = require("fs");
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+import webpack from "webpack"
+import path from "path"
+import { fileURLToPath } from "url"
+import CopyPlugin from "copy-webpack-plugin"
+import BuildManifest from "./webpack.manifest.cjs";
+const srcDir = "../src/";
+import fs from "fs";
+import ForkTsCheckerWebpackPlugin from "fork-ts-checker-webpack-plugin";
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)

 const edgeLanguages = [
    "de",
@@ -24,7 +27,7 @@ const edgeLanguages = [
    "zh_CN"
 ]

-module.exports = env => ({
+export default env => ({
    entry: {
        popup: path.join(__dirname, srcDir + 'popup.ts'),
        background: path.join(__dirname, srcDir + 'background.ts'),
--- a/webpack/webpack.dev.js
+++ b/webpack/webpack.dev.js
@@ -1,8 +1,7 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const merge = require('webpack-merge');
-const common = require('./webpack.common.js');
+import { merge } from "webpack-merge";
+import common from './webpack.common.js';

-module.exports = env => merge(common(env), {
+export default env => merge(common(env), {
    devtool: 'inline-source-map',
    mode: 'development'
 });
--- a/webpack/webpack.manifest.cjs
+++ b/webpack/webpack.manifest.cjs
--- a/webpack/webpack.prod.js
+++ b/webpack/webpack.prod.js
@@ -1,8 +1,7 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const merge = require('webpack-merge');
-const common = require('./webpack.common.js');
+import { merge } from "webpack-merge";
+import common from './webpack.common.js';

-module.exports = env => {
+export default env => {
    let mode = "production";
    env.mode = mode;
Author	SHA1	Message	Date
Ajay	c0f8f5e1d0	bump version	2022-05-25 14:16:45 -04:00
Ajay Ramachandran	e948e1e569	Merge pull request #1331 from mchangrh/updateDependencies update dependencies & bump minimum node version	2022-05-25 00:01:10 -04:00
Ajay	5289e62d43	Use virtual time for determining whether to skip and increase skip buffer Potentially fix recent issue with skips not triggering	2022-05-24 23:54:05 -04:00
Ajay	eda7aac5ef	Add time to log messages	2022-05-24 23:31:43 -04:00
Michael C	d9f4ab0d04	specify jest as cjs, change eslintrc to .json	2022-05-24 21:23:05 -04:00
Michael C	2665327729	update dependencies & bump minimum node version (#1329 ) - bump all dependences - add github-actions reporter to jest - convert (most) webpack configs to ESM - manifest.cjs cannot be converted since there is no native .json import until node 17	2022-05-24 21:14:36 -04:00
Ajay	4738c1897f	bump version	2022-05-24 14:05:13 -04:00
Ajay	cfbb194a61	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock	2022-05-24 14:04:54 -04:00
Ajay	9ad21e8ea1	Fix channel id regex	2022-05-24 14:04:53 -04:00
Ajay Ramachandran	941fc2985d	Merge pull request #1238 from AlecRust/fix-unused-vars-lint Fix @typescript-eslint/no-unused-vars lint warnings	2022-05-24 13:17:27 -04:00
Ajay Ramachandran	e2da071761	bump version	2022-05-24 13:16:04 -04:00
Ajay Ramachandran	c20c9ac64a	Merge pull request #1220 from tadwohlrapp/patch-1 Fix minor typos and inconsistencies	2022-05-24 13:12:20 -04:00
Ajay Ramachandran	2d59f3825c	New translations messages.json (Swedish) (#1326 )	2022-05-24 13:09:34 -04:00
Ajay Ramachandran	fb8b7a7d19	Merge pull request #1327 from Argn0/branch1 Add reset settings option	2022-05-24 12:56:50 -04:00
Ajay	d992cc7a3c	Don't reset everything	2022-05-24 12:55:17 -04:00
Ajay	f8fecf5174	Remove redundant explanation	2022-05-24 12:50:39 -04:00
Argn0	3007cddce9	add reset settings option	2022-05-24 10:04:56 +02:00
Ajay	2b3c812f8a	Some more debug logs	2022-05-23 21:41:35 -04:00
Ajay	61535fac95	Add more logging for catching skip issues	2022-05-23 01:14:46 -04:00
Ajay	4182595436	Don't stop skipping if channel id fetch fails	2022-05-21 16:54:02 -04:00
Alec Rust	463ce258bf	Fix @typescript-eslint/no-unused-vars lint warnings	2022-04-23 15:44:21 +01:00
Tad Wohlrapp	a64deb2e18	Fix minor typos and inconsistencies	2022-03-08 19:57:09 +01:00