update translations

bump version
Make options page more compact
2025-12-06 11:37:02 +03:00 · 2024-11-10 15:51:30 -05:00 · 2024-11-10 15:50:52 -05:00 · 2024-10-30 13:53:55 -04:00 · 2024-10-29 16:59:27 -04:00 · 2024-10-28 13:54:12 -04:00
36 changed files with 1889 additions and 2091 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,10 +10,10 @@ jobs:

    steps:
      # Initialization
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: '18'
      - run: npm ci
@@ -27,7 +27,7 @@ jobs:
      # Create Chrome artifacts
      - name: Create Chrome artifacts
        run: npm run build:chrome
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: ChromeExtension
          path: dist
@@ -39,7 +39,7 @@ jobs:
      # Create Firefox artifacts
      - name: Create Firefox artifacts
        run: npm run build:firefox
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: FirefoxExtension
          path: dist
@@ -50,7 +50,7 @@ jobs:
      # Create Beta artifacts (Builds with the name changed to beta)
      - name: Create Chrome Beta artifacts
        run: npm run build:chrome -- --env stream=beta
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: ChromeExtensionBeta
          path: dist
@@ -60,7 +60,7 @@ jobs:

      - name: Create Firefox Beta artifacts
        run: npm run build:firefox -- --env stream=beta
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: FirefoxExtensionBeta
          path: dist
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,10 +12,10 @@ jobs:

    steps:
      # Initialization
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: '18'
      - name: Copy configuration
@@ -108,7 +108,7 @@ jobs:
      # Firefox Beta
      - name: Create Firefox Beta artifacts
        run: npm run build:firefox -- --env stream=beta
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: FirefoxExtensionBeta
          path: dist
@@ -125,7 +125,7 @@ jobs:
        run: sudo apt-get install rename
      - name: Rename signed file
        run: cd ./web-ext-artifacts ; rename 's/.*/FirefoxSignedInstaller.xpi/' *
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: FirefoxExtensionSigned.xpi
          path: ./web-ext-artifacts/FirefoxSignedInstaller.xpi
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,10 +9,10 @@ jobs:

    steps:
      # Initialization
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: '18'
      - run: npm ci
@@ -25,7 +25,7 @@ jobs:

      - name: Upload results on fail
        if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: Test Results
          path: ./test-results
--- a/.github/workflows/update-oss-attribution.yml
+++ b/.github/workflows/update-oss-attribution.yml
@@ -12,10 +12,10 @@ jobs:
  update-oss:
    runs-on: ubuntu-latest 
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
        with:
          node-version: '18'
      - name: Install and generate attribution
@@ -29,7 +29,7 @@ jobs:
          cd ci && npx ts-node prettify.ts

      - name: Create pull request to update list
-        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
+        uses: peter-evans/create-pull-request@v7
        # v4.2.3
        with:
          commit-message: Update OSS Attribution
--- a/.github/workflows/updateInvidous.yml
+++ b/.github/workflows/updateInvidous.yml
@@ -8,7 +8,7 @@ jobs:
  check-list:
    runs-on: ubuntu-latest 
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
      - name: Download instance lists
@@ -21,7 +21,7 @@ jobs:
        run: npm run ci:invidious

      - name: Create pull request to update list
-        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
+        uses: peter-evans/create-pull-request@v7
        # v4.2.3
        with:
          commit-message: Update Invidious List
--- a/ci/generateList.ts
+++ b/ci/generateList.ts
@@ -7,8 +7,7 @@ This file should not be shipped with the extension
 /*
 Criteria for inclusion:
 Invidious
- 30d uptime >= 90%
- available for at least 80/90 days
+- uptime >= 80%
 - must have been up for at least 90 days
 - HTTPS only
 - url includes name (this is to avoid redirects)
--- a/ci/invidiousCI.ts
+++ b/ci/invidiousCI.ts
@@ -1,31 +1,34 @@
-import { InvidiousInstance, instanceMap } from "./invidiousType"
+import { InvidiousInstance, monitor } from "./invidiousType"

 import * as data from "../ci/invidious_instances.json";

 // only https servers
-const mapped: instanceMap = data
-  .filter((i: InvidiousInstance) => i[1]?.type === "https")
-  .map((instance: InvidiousInstance) => {
+const mapped = (data as InvidiousInstance[])
+  .filter((i) =>
+    i[1]?.type === "https"
+    && i[1]?.monitor?.enabled
+  )
+  .map((instance) => {
+    const monitor = instance[1].monitor as monitor;
    return {
      name: instance[0],
      url: instance[1].uri,
-      dailyRatios: instance[1].monitor.dailyRatios,
-      thirtyDayUptime: instance[1]?.monitor["30dRatio"].ratio,
+      uptime: monitor.uptime || 0,
+      down: monitor.down ?? false,
+      created_at: monitor.created_at,
    }
  });

 // reliability and sanity checks
 const reliableCheck = mapped
  .filter(instance => {
-    // 30d uptime >= 90%
-    const thirtyDayUptime = Number(instance.thirtyDayUptime) >= 90;
-    // available for at least 80/90 days
-    const dailyRatioCheck = instance.dailyRatios.filter(status => status.label !== "black");
-    return thirtyDayUptime && dailyRatioCheck.length >= 80;
+    const uptime = instance.uptime > 80 && !instance.down;
+    const nameIncluded = instance.url.includes(instance.name);
+    const ninetyDays = 90 * 24 * 60 * 60 * 1000;
+    const ninetyDaysAgo = new Date(Date.now() - ninetyDays);
+    const createdAt = new Date(instance.created_at).getTime() < ninetyDaysAgo.getTime();
+    return uptime && nameIncluded && createdAt;
  })
-  // url includes name
-  .filter(instance => instance.url.includes(instance.name));

-export function getInvidiousList(): string[] {
-  return reliableCheck.map(instance => instance.name).sort()
-}
+export const getInvidiousList = (): string[] =>
+  reliableCheck.map(instance => instance.name).sort()
--- a/ci/invidiousType.ts
+++ b/ci/invidiousType.ts
@@ -1,54 +1,72 @@
-type ratio = {
-  ratio: string;
-  label: string;
-}
-
-export type instanceMap = {
-  name: string;
-  url: string;
-  dailyRatios: {ratio: string; label: string }[];
-  thirtyDayUptime: string;
-}[]
-
 export type InvidiousInstance = [
  string,
  {
    flag: string;
    region: string;
-    stats: null | {
-      version: string;
-      software: {
-        name: string;
-        version: string;
-        branch: string;
-      };
-      openRegistrations: boolean;
-      usage: {
-        users: {
-          total: number;
-          activeHalfyear: number;
-          activeMonth: number;
-        };
-      };
-      metadata: {
-        updatedAt: number;
-        lastChannelRefreshedAt: number;
-      };
-    };
-    cors: boolean | null;
-    api: boolean | null;
+    stats: null | ivStats;
+    cors: null | boolean;
+    api: null | boolean;
    type: "https" | "http" | "onion" | "i2p";
    uri: string;
-    monitor: null | {
-      monitorId: number;
-      createdAt: number;
-      statusClass: string;
-      name: string;
-      url: string | null;
-      type: "HTTP(s)";
-      dailyRatios: ratio[];
-      "90dRatio": ratio;
-      "30dRatio": ratio;
-    };
+    monitor: null | monitor;
  }
-]
+]
+
+export type monitor = {
+  token: string;
+  url: string;
+  alias: string;
+  last_status: number;
+  uptime: number;
+  down: boolean;
+  down_since: null | string;
+  up_since: null | string;
+  error: null | string;
+  period: number;
+  apdex_t: number;
+  string_match: string;
+  enabled: boolean;
+  published: boolean;
+  disabled_locations: string[];
+  recipients: string[];
+  last_check_at: string;
+  next_check_at: string;
+  created_at: string;
+  mute_until: null | string;
+  favicon_url: string;
+  custom_headers: Record<string, string>;
+  http_verb: string;
+  http_body: string;
+  ssl: {
+    tested_at: string;
+    expires_at: string;
+    valid: boolean;
+    error: null | string;
+  };
+}
+
+export type ivStats = {
+  version: string;
+  software: {
+    name: "invidious" | string;
+    version: string;
+    branch: "master" | string;
+  };
+  openRegistrations: boolean;
+  usage: {
+    users: {
+      total: number;
+      activeHalfyear: number;
+      activeMonth: number;
+    };
+  };
+  metadata: {
+    updatedAt: number;
+    lastChannelRefreshedAt: number;
+  };
+  playback: {
+    totalRequests: number;
+    successfulRequests: number;
+    ratio: number;
+  };
+}
--- a/ci/invidiouslist.json
+++ b/ci/invidiouslist.json
@@ -1 +1 @@
-["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"]
+["www.youtubekids.com","inv.nadeko.net","inv.tux.pizza","invidious.adminforge.de","invidious.jing.rocks","invidious.nerdvpn.de","invidious.perennialte.ch","invidious.privacyredirect.com","invidious.reallyaweso.me","invidious.yourdevice.ch","iv.ggtyler.dev","iv.nboeck.de","yewtu.be"]
--- a/manifest/chrome-manifest-extra.json
+++ b/manifest/chrome-manifest-extra.json
@@ -30,7 +30,7 @@
      "icons/close.png",
      "icons/skipIcon.svg",
      "icons/refresh.svg",
-      "icons/beep.ogg",
+      "icons/beep.oga",
      "icons/pause.svg",
      "icons/stop.svg",
      "icons/skip.svg",
--- a/manifest/firefox-manifest-extra.json
+++ b/manifest/firefox-manifest-extra.json
@@ -2,7 +2,7 @@
  "browser_specific_settings": {
    "gecko": {
      "id": "sponsorBlocker@ajay.app",
-      "strict_min_version": "56.0"
+      "strict_min_version": "102.0"
    },
    "gecko_android": {
      "strict_min_version": "113.0"
--- a/manifest/manifest-v2-extra.json
+++ b/manifest/manifest-v2-extra.json
@@ -22,7 +22,7 @@
        "icons/close.png",
        "icons/skipIcon.svg",
        "icons/refresh.svg",
-        "icons/beep.ogg",
+        "icons/beep.oga",
        "icons/pause.svg",
        "icons/stop.svg",
        "icons/skip.svg",
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
    "name": "__MSG_fullName__",
    "short_name": "SponsorBlock",
-    "version": "5.6.1",
+    "version": "5.9.6",
    "default_locale": "en",
    "description": "__MSG_Description__",
    "homepage_url": "https://sponsor.ajay.app",
--- a/2
+++ b/2
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -38,14 +38,14 @@
    "ts-loader": "^9.4.2",
    "ts-node": "^10.9.1",
    "typescript": "4.9",
-    "web-ext": "^7.10.0",
-    "webpack": "^5.75.0",
+    "web-ext": "^8.2.0",
+    "webpack": "^5.94.0",
    "webpack-cli": "^4.10.0",
    "webpack-merge": "^5.8.0"
  },
  "scripts": {
    "web-run": "npm run web-run:chrome",
-    "web-sign": "web-ext sign -s dist",
+    "web-sign": "web-ext sign --channel unlisted -s dist",
    "web-run:firefox": "cd dist && web-ext run --start-url https://addons.mozilla.org/firefox/addon/ublock-origin/",
    "web-run:firefox-android": "cd dist && web-ext run -t firefox-android --firefox-apk org.mozilla.fenix",
    "web-run:chrome": "cd dist && web-ext run --start-url https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm -t chromium",
--- a/public/_locales
+++ b/public/_locales
--- a/public/icons/beep.oga
+++ b/public/icons/beep.oga
--- a/public/options/options.css
+++ b/public/options/options.css
@@ -118,13 +118,13 @@ html, body {

 .option-group > div {
    min-height: 50px;
-    padding: 20px 0;
+    padding: 15px 0;
    border-bottom: 1px solid var(--border-color);
    border-image: linear-gradient(to right, var(--border-color), #00000000 80%)  1;
 }

 .categoryExtraOptions {
-    padding-bottom: 20px;
+    padding-bottom: 15px;
 }

 #music_offtopic_autoSkipOnMusicVideos {
@@ -271,11 +271,11 @@ input[type='number'] {

 .small-description {
    font-size: 13px;
-    padding: 15px 0 0 20px;
+    padding: 5px 0 0 20px;
 }

 .small-description td {
-    padding: 10px 0 20px 20px;
+    padding: 2.5px 0 10px 20px;
 }

 .indent {
@@ -283,7 +283,7 @@ input[type='number'] {
 }

 .categoryTableElement td {
-    padding-top: 10px;
+    padding-top: 5px;
    border-top: 1px solid var(--border-color);
 }

@@ -353,7 +353,8 @@ input[type='number'] {

    font-size: 14px;

-    display: table;
+    display: flex;
+    align-items: center;
 }

 .switch-container .switch-label {
--- a/public/popup.html
+++ b/public/popup.html
@@ -196,6 +196,8 @@
        <a href="https://discord.gg/SponsorBlock" target="_blank" rel="noopener">Discord</a>
        <a href="https://matrix.to/#/#sponsor:ajay.app?via=ajay.app&via=matrix.org&via=mozilla.org" target="_blank" rel="noopener">Matrix</a>
        <a href="https://sponsor.ajay.app/donate" target="_blank" rel="noopener" id="sbDonate">__MSG_Donate__</a>
+        <br />
+        <a id="debugLogs">__MSG_copyDebugLogs__</a>
      </footer>

      <button id="showNoticeAgain" style="display: none">__MSG_showNotice__</button>
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -15,6 +15,7 @@ import { downvoteButtonColor, SkipNoticeAction } from "../utils/noticeUtils";
 import { generateUserID } from "../../maze-utils/src/setup";
 import { keybindToString } from "../../maze-utils/src/config";
 import { getFormattedTime } from "../../maze-utils/src/formating";
+import { getCurrentTime, getVideo } from "../../maze-utils/src/video";

 enum SkipButtonState {
    Undo, // Unskip
@@ -685,7 +686,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
    getFullDurationCountdown(index: number): () => number {
        return () => {
            const sponsorTime = this.segments[index];
-            const duration = Math.round((sponsorTime.segment[1] - this.contentContainer().v.currentTime) * (1 / this.contentContainer().v.playbackRate));
+            const duration = Math.round((sponsorTime.segment[1] - getCurrentTime()) * (1 / getVideo().playbackRate));

            return Math.max(duration, Config.config.skipNoticeDuration);
        };
--- a/src/components/SponsorTimeEditComponent.tsx
+++ b/src/components/SponsorTimeEditComponent.tsx
@@ -9,6 +9,7 @@ import { DEFAULT_CATEGORY } from "../utils/categoryUtils";
 import { getFormattedTime, getFormattedTimeToSeconds } from "../../maze-utils/src/formating";
 import { asyncRequestToServer } from "../utils/requests";
 import { defaultPreviewTime } from "../utils/constants";
+import { getVideo, getVideoDuration } from "../../maze-utils/src/video";

 export interface SponsorTimeEditProps {
    index: number;
@@ -401,7 +402,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
    checkToShowFullVideoWarning(): void {
        const sponsorTime = this.props.contentContainer().sponsorTimesSubmitting[this.props.index];
        const segmentDuration = sponsorTime.segment[1] - sponsorTime.segment[0];
-        const videoPercentage = segmentDuration / this.props.contentContainer().v.duration;
+        const videoPercentage = segmentDuration / getVideoDuration();

        if (videoPercentage > 0.6 && !this.fullVideoWarningShown 
                && (sponsorTime.category === "sponsor" || sponsorTime.category === "selfpromo" || sponsorTime.category === "chooseACategory")) {
@@ -553,7 +554,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
    }

    setTimeToEnd(): void {
-        this.setTimeTo(1, this.props.contentContainer().v.duration);
+        this.setTimeTo(1, getVideoDuration());
    }

    /**
@@ -640,7 +641,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                sponsorTimesSubmitting[this.props.index].segment[0] = startTime;
            }
        } else if (this.state.sponsorTimeEdits[1] === null && category === "outro" && !sponsorTimesSubmitting[this.props.index].segment[1]) {
-            sponsorTimesSubmitting[this.props.index].segment[1] = this.props.contentContainer().v.duration;
+            sponsorTimesSubmitting[this.props.index].segment[1] = getVideoDuration();
            this.props.contentContainer().updateEditButtonsOnPlayer();
        }

@@ -683,7 +684,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
        const endTime = sponsorTimes[index].segment[1];

        // If segment starts at 0:00, start playback at the end of the segment
-        const skipTime = (startTime === 0 || skipToEndTime) ? endTime : (startTime - (seekTime * this.props.contentContainer().v.playbackRate));
+        const skipTime = (startTime === 0 || skipToEndTime) ? endTime : (startTime - (seekTime * getVideo().playbackRate));

        this.props.contentContainer().previewTime(skipTime, !skipToEndTime);
    }
--- a/src/components/SubmissionNoticeComponent.tsx
+++ b/src/components/SubmissionNoticeComponent.tsx
@@ -9,6 +9,7 @@ import NoticeTextSelectionComponent from "./NoticeTextSectionComponent";
 import SponsorTimeEditComponent from "./SponsorTimeEditComponent";
 import { getGuidelineInfo } from "../utils/constants";
 import { exportTimes } from "../utils/exporter";
+import { getVideo, isCurrentTimeWrong } from "../../maze-utils/src/video";

 export interface SubmissionNoticeProps { 
    // Contains functions and variables from the content script needed by the skip notice
@@ -66,7 +67,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
            this.forceUpdate();
        });

-        this.videoObserver.observe(this.contentContainer().v, {
+        this.videoObserver.observe(getVideo(), {
            attributes: true
        });

@@ -131,7 +132,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                {/* Sponsor Time List */}
                <tr id={"sponsorSkipNoticeMiddleRow" + this.state.idSuffix}
                    className="sponsorTimeMessagesRow"
-                    style={{maxHeight: (this.contentContainer().v?.offsetHeight - 200) + "px"}}
+                    style={{maxHeight: (getVideo()?.offsetHeight - 200) + "px"}}
                    onMouseDown={(e) => e.stopPropagation()}>
                    <td style={{width: "100%"}}>
                        {this.getSponsorTimeMessages()}
@@ -215,6 +216,11 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
    }

    submit(): void {
+        if (isCurrentTimeWrong()) {
+            alert(chrome.i18n.getMessage("submissionFailedServerSideAds"));
+            return;
+        }
+
        // save all items
        for (const ref of this.timeEditRefs) {
            ref.current.saveEditTimes();
@@ -283,7 +289,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
    categoryChangeListener(index: number, category: Category): void {
        const dialogWidth = this.noticeRef?.current?.getElement()?.current?.offsetWidth;
        if (category !== "chooseACategory" && Config.config.showCategoryGuidelines
-                && this.contentContainer().v.offsetWidth > dialogWidth * 2) {
+                && getVideo().offsetWidth > dialogWidth * 2) {
            const options = {
                title:  chrome.i18n.getMessage(`category_${category}`),
                textBoxes: getGuidelineInfo(category),
--- a/src/config.ts
+++ b/src/config.ts
@@ -477,4 +477,26 @@ const localDefaults = {
 };

 const Config = new ConfigClass(syncDefaults, localDefaults, migrateOldSyncFormats);
-export default Config;
+export default Config;
+
+export function generateDebugDetails(): string {
+    // Build output debug information object
+    const output = {
+        debug: {
+            userAgent: navigator.userAgent,
+            platform: navigator.platform,
+            language: navigator.language,
+            extensionVersion: chrome.runtime.getManifest().version
+        },
+        config: JSON.parse(JSON.stringify(Config.cachedSyncConfig)) // Deep clone config object
+    };
+
+    // Sanitise sensitive user config values
+    delete output.config.userID;
+    output.config.serverAddress = (output.config.serverAddress === CompileConfig.serverAddress)
+        ? "Default server address" : "Custom server address";
+    output.config.invidiousInstances = output.config.invidiousInstances.length;
+    output.config.whitelistedChannels = output.config.whitelistedChannels.length;
+
+    return JSON.stringify(output, null, 4);
+}
--- a/src/content.ts
+++ b/src/content.ts
@@ -34,7 +34,7 @@ import { ChapterVote } from "./render/ChapterVote";
 import { openWarningDialog } from "./utils/warnings";
 import { isFirefoxOrSafari, waitFor } from "../maze-utils/src";
 import { getErrorMessage, getFormattedTime } from "../maze-utils/src/formating";
-import { getChannelIDInfo, getVideo, getIsAdPlaying, getIsLivePremiere, setIsAdPlaying, checkVideoIDChange, getVideoID, getYouTubeVideoID, setupVideoModule, checkIfNewVideoID, isOnInvidious, isOnMobileYouTube, getLastNonInlineVideoID, triggerVideoIDChange, triggerVideoElementChange, getIsInline } from "../maze-utils/src/video";
+import { getChannelIDInfo, getVideo, getIsAdPlaying, getIsLivePremiere, setIsAdPlaying, checkVideoIDChange, getVideoID, getYouTubeVideoID, setupVideoModule, checkIfNewVideoID, isOnInvidious, isOnMobileYouTube, getLastNonInlineVideoID, triggerVideoIDChange, triggerVideoElementChange, getIsInline, getCurrentTime, setCurrentTime, getVideoDuration, verifyCurrentTime } from "../maze-utils/src/video";
 import { Keybind, StorageChangesObject, isSafari, keybindEquals, keybindToString } from "../maze-utils/src/config";
 import { findValidElement } from "../maze-utils/src/dom"
 import { getHash, HashedValue } from "../maze-utils/src/hash";
@@ -50,6 +50,7 @@ import { asyncRequestToServer } from "./utils/requests";
 import { isMobileControlsOpen } from "./utils/mobileUtils";
 import { defaultPreviewTime } from "./utils/constants";
 import { onVideoPage } from "../maze-utils/src/pageInfo";
+import { getSegmentsForVideo } from "./utils/segmentData";

 cleanPage();

@@ -74,7 +75,6 @@ let sponsorTimes: SponsorTime[] = [];
 let existingChaptersImported = false;
 let importingChaptersWaitingForFocus = false;
 let importingChaptersWaiting = false;
-let triedImportingChapters = false;
 // List of open skip notices
 const skipNotices: SkipNotice[] = [];
 let activeSkipKeybindElement: ToggleSkippable = null;
@@ -139,6 +139,9 @@ let switchingVideos = null;
 let lastCheckTime = 0;
 let lastCheckVideoTime = -1;

+// To determine if a video resolution change is happening
+let firstPlay = true;
+
 //is this channel whitelised from getting sponsors skipped
 let channelWhitelisted = false;

@@ -177,7 +180,6 @@ const skipNoticeContentContainer: ContentContainer = () => ({
    sponsorTimes,
    sponsorTimesSubmitting,
    skipNotices,
-    v: getVideo(),
    sponsorVideoID: getVideoID(),
    reskipSponsorTime,
    updatePreviewBar,
@@ -218,7 +220,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
                found: sponsorDataFound,
                status: lastResponseStatus,
                sponsorTimes: sponsorTimes,
-                time: getVideo()?.currentTime ?? 0,
+                time: getCurrentTime() ?? 0,
                onMobileYouTube: isOnMobileYouTube()
            });

@@ -265,7 +267,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
            sendResponse({ hasVideo: getVideoID() != null });
            // fetch segments
            if (getVideoID()) {
-                sponsorsLookup(false);
+                sponsorsLookup(false, true);
            }

            break;
@@ -298,7 +300,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
            navigator.clipboard.writeText(request.text);
            break;
        case "importSegments": {
-            const importedSegments = importTimes(request.data, getVideo().duration);
+            const importedSegments = importTimes(request.data, getVideoDuration());
            let addedSegments = false;
            for (const segment of importedSegments) {
                if (!sponsorTimesSubmitting.some(
@@ -343,6 +345,12 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
                metaKey: request.metaKey
            }));
            break;
+        case "getLogs":
+            sendResponse({
+                debug: window["SBLogs"].debug,
+                warn: window["SBLogs"].warn
+            });
+            break;
    }

    sendResponse({});
@@ -360,7 +368,7 @@ function contentConfigUpdateListener(changes: StorageChangesObject) {
                updateVisibilityOfPlayerControlsButton()
                break;
            case "categorySelections":
-                sponsorsLookup();
+                sponsorsLookup(true, true);
                break;
            case "barTypes":
                setCategoryColorCSSVariables();
@@ -382,10 +390,10 @@ function resetValues() {
    lastCheckVideoTime = -1;
    retryCount = 0;
    previewedSegment = false;
+    firstPlay = true;

    sponsorTimes = [];
    existingChaptersImported = false;
-    triedImportingChapters = false;
    sponsorSkipped = [];
    lastResponseStatus = 0;
    shownSegmentFailedToFetchWarning = false;
@@ -502,12 +510,8 @@ function handleMobileControlsMutations(): void {

 function getPreviewBarAttachElement(): HTMLElement | null {
    const progressElementOptions = [{
-            // For new mobile YouTube (#1287)
-            selector: ".progress-bar-line",
-            isVisibleCheck: true
-        }, {
-            // For newer mobile YouTube (Jan 2024)
-            selector: ".YtProgressBarProgressBarLine",
+            // For newer mobile YouTube (Sept 2024)
+            selector: ".YtProgressBarLineHost, .YtChapteredProgressBarHost",
            isVisibleCheck: true
        }, {
            // For newer mobile YouTube (May 2024)
@@ -634,8 +638,8 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current

    updateActiveSegment(currentTime);

-    if (getVideo().paused 
-        || (getVideo().currentTime >= getVideo().duration - 0.01 && getVideo().duration > 1)) return;
+    if ((getVideo().paused && getCurrentTime() !== 0) // Allow autoplay disabled videos to skip before playing
+        || (getCurrentTime() >= getVideoDuration() - 0.01 && getVideoDuration() > 1)) return;
    const skipInfo = getNextSkipIndex(currentTime, includeIntersectingSegments, includeNonIntersectingSegments);

    const currentSkip = skipInfo.array[skipInfo.index];
@@ -685,7 +689,7 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
        let forcedIncludeNonIntersectingSegments = true;

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

        if ((shouldSkip(currentSkip) || sponsorTimesSubmitting?.some((segment) => segment.segment === currentSkip.segment))) {
            if (forceVideoTime >= skipTime[0] - skipBuffer && forceVideoTime < skipTime[1]) {
@@ -717,7 +721,7 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
                    forcedIncludeNonIntersectingSegments = false;

                    // Only if not at the end of the video
-                    if (Math.abs(skipTime[1] - getVideo().duration) > endTimeSkipBuffer) {
+                    if (Math.abs(skipTime[1] - getVideoDuration()) > endTimeSkipBuffer) {
                        forcedIncludeIntersectingSegments = true;
                    }
                }
@@ -748,38 +752,38 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current

            // Use interval instead of timeout near the end to combat imprecise video time
            const startIntervalTime = forceStartIntervalTime || performance.now();
-            const startVideoTime = Math.max(currentTime, getVideo().currentTime);
+            const startVideoTime = Math.max(currentTime, getCurrentTime());
            delayTime = (skipTime?.[0] - startVideoTime) * 1000 * (1 / getVideo().playbackRate);

            let startWaitingForReportedTimeToChange = true;
-            const reportedVideoTimeAtStart = getVideo().currentTime;
-            logDebug(`Starting setInterval skipping ${getVideo().currentTime} to skip at ${skipTime[0]}`);
+            const reportedVideoTimeAtStart = getCurrentTime();
+            logDebug(`Starting setInterval skipping ${getCurrentTime()} to skip at ${skipTime[0]}`);

            if (currentSkipInterval !== null) clearInterval(currentSkipInterval);
            currentSkipInterval = setInterval(() => {
                // Estimate delay, but only take the current time right after a change
                // Current time remains the same for many "frames" on Firefox
                if (isFirefoxOrSafari() && !lastKnownVideoTime.fromPause && startWaitingForReportedTimeToChange
-                        && reportedVideoTimeAtStart !== getVideo().currentTime) {
+                        && reportedVideoTimeAtStart !== getCurrentTime()) {
                    startWaitingForReportedTimeToChange = false;
-                    const delay = getVirtualTime() - getVideo().currentTime;
+                    const delay = getVirtualTime() - getCurrentTime();
                    if (delay > 0) lastKnownVideoTime.approximateDelay = delay;
                }

                const intervalDuration = performance.now() - startIntervalTime;
-                if (intervalDuration + skipBuffer * 1000 >= delayTime || getVideo().currentTime >= skipTime[0]) {
+                if (intervalDuration + skipBuffer * 1000 >= delayTime || getCurrentTime() >= skipTime[0]) {
                    clearInterval(currentSkipInterval);
-                    if (!isFirefoxOrSafari() && !getVideo().muted && !inMuteSegment(getVideo().currentTime, true)) {
+                    if (!isFirefoxOrSafari() && !getVideo().muted && !inMuteSegment(getCurrentTime(), true)) {
                        // Workaround for more accurate skipping on Chromium
                        getVideo().muted = true;
                        getVideo().muted = false;
                    }

-                    skippingFunction(Math.max(getVideo().currentTime, startVideoTime + getVideo().playbackRate * Math.max(delayTime, intervalDuration) / 1000));
+                    skippingFunction(Math.max(getCurrentTime(), startVideoTime + getVideo().playbackRate * Math.max(delayTime, intervalDuration) / 1000));
                }
            }, 0);
        } else {
-            logDebug(`Starting timeout to skip ${getVideo().currentTime} to skip at ${skipTime[0]}`);
+            logDebug(`Starting timeout to skip ${getCurrentTime()} to skip at ${skipTime[0]}`);

            const offset = (isFirefoxOrSafari() && !isSafari() ? 600 : 150);
            // Schedule for right before to be more precise than normal timeout
@@ -803,10 +807,10 @@ function getVirtualTime(): number {
        (performance.now() - lastKnownVideoTime.preciseTime) * getVideo().playbackRate / 1000 + lastKnownVideoTime.videoTime : null);

    if (Config.config.useVirtualTime && !isSafari() && virtualTime
-            && Math.abs(virtualTime - getVideo().currentTime) < 0.2 && getVideo().currentTime !== 0) {
-        return Math.max(virtualTime, getVideo().currentTime);
+            && Math.abs(virtualTime - getCurrentTime()) < 0.2 && getCurrentTime() !== 0) {
+        return Math.max(virtualTime, getCurrentTime());
    } else {
-        return getVideo().currentTime;
+        return getCurrentTime();
    }
 }

@@ -848,6 +852,7 @@ let lastPlaybackSpeed = 1;
 let setupVideoListenersFirstTime = true;
 function setupVideoListeners() {
    const video = getVideo();
+    if (!video) return; // Maybe video became invisible

    //wait until it is loaded
    video.addEventListener('loadstart', videoOnReadyListener)
@@ -865,6 +870,7 @@ function setupVideoListeners() {

        let startedWaiting = false;
        let lastPausedAtZero = true;
+        let lastVideoDataChange = 0;

        const rateChangeListener = () => {
            updateVirtualTime();
@@ -877,13 +883,10 @@ function setupVideoListeners() {
        video.addEventListener('videoSpeed_ratechange', rateChangeListener);

        const playListener = () => {
-            // If it is not the first event, then the only way to get to 0 is if there is a seek event
-            // This check makes sure that changing the video resolution doesn't cause the extension to think it
-            // gone back to the begining
-            if (video.readyState <= HTMLMediaElement.HAVE_CURRENT_DATA
-                    && video.currentTime === 0) return;
+            // Prevent video resolution changes from causing skips
+            if (!firstPlay && Date.now() - lastVideoDataChange < 200 && video.currentTime === 0) return;

-                    
+            firstPlay = false;
            updateVirtualTime();
            checkForMiniplayerPlaying();

@@ -973,15 +976,15 @@ function setupVideoListeners() {
                clearWaitingTime();

                // Sometimes looped videos loop back to almost zero, but not quite
-                if (video.loop && video.currentTime < 0.2) {
+                if (video.loop && video.currentTime < 0.2 && getCurrentTime() < 0.2) {
                    startSponsorSchedule(false, 0);
                } else {
                    startSponsorSchedule();
                }
            } else {
-                updateActiveSegment(video.currentTime);
+                updateActiveSegment(getCurrentTime());

-                if (video.currentTime === 0) {
+                if (getCurrentTime() === 0) {
                    lastPausedAtZero = true;
                }
            }
@@ -1015,6 +1018,24 @@ function setupVideoListeners() {
        };
        video.addEventListener('waiting', waitingListener);

+        // When video data is changed
+        const emptyListener = () => {
+            lastVideoDataChange = Date.now();
+
+            if (firstPlay && video.currentTime === 0) {
+                playListener();
+            }
+        }
+        video.addEventListener('emptied', emptyListener);
+
+        // For when autoplay is off to skip before starting playback
+        const metadataLoadedListener = () => {
+            if (firstPlay && getCurrentTime() === 0) {
+                playListener();
+            }
+        }
+        video.addEventListener('loadedmetadata', metadataLoadedListener)
+
        startSponsorSchedule();

        if (setupVideoListenersFirstTime) {
@@ -1026,6 +1047,8 @@ function setupVideoListeners() {
                video.removeEventListener('videoSpeed_ratechange', rateChangeListener);
                video.removeEventListener('pause', pauseListener);
                video.removeEventListener('waiting', waitingListener);
+                video.removeEventListener('empty', emptyListener);
+                video.removeEventListener('loadedmetadata', metadataLoadedListener);

                if (playbackRateCheckInterval) clearInterval(playbackRateCheckInterval);
            });
@@ -1038,7 +1061,7 @@ function setupVideoListeners() {
 function updateVirtualTime() {
    if (currentVirtualTimeInterval) clearInterval(currentVirtualTimeInterval);

-    lastKnownVideoTime.videoTime = getVideo().currentTime;
+    lastKnownVideoTime.videoTime = getCurrentTime();
    lastKnownVideoTime.preciseTime = performance.now();

    // If on Firefox, wait for the second time change (time remains fixed for many "frames" for privacy reasons)
@@ -1050,21 +1073,21 @@ function updateVirtualTime() {

        currentVirtualTimeInterval = setInterval(() => {
            const frameTime = performance.now() - lastPerformanceTime;
-            if (lastTime !== getVideo().currentTime) {
+            if (lastTime !== getCurrentTime()) {
                rawCount++;

                // If there is lag, give it another shot at finding a good change time
                if (frameTime < 20 || rawCount > 30) {
                    count++;
                }
-                lastTime = getVideo().currentTime;
+                lastTime = getCurrentTime();
            }

            if (count > 1) {
                const delay = lastKnownVideoTime.fromPause && lastKnownVideoTime.approximateDelay ?
                    lastKnownVideoTime.approximateDelay : 0;

-                lastKnownVideoTime.videoTime = getVideo().currentTime + delay;
+                lastKnownVideoTime.videoTime = getCurrentTime() + delay;
                lastKnownVideoTime.preciseTime = performance.now();

                clearInterval(currentVirtualTimeInterval);
@@ -1110,38 +1133,23 @@ function setupCategoryPill() {
    categoryPill.attachToPage(isOnMobileYouTube(), isOnInvidious(), voteAsync);
 }

-async function sponsorsLookup(keepOldSubmissions = true) {
-    const categories: string[] = Config.config.categorySelections.map((category) => category.name);
-
-    const extraRequestData: Record<string, unknown> = {};
-    const hashParams = getHashParams();
-    if (hashParams.requiredSegment) extraRequestData.requiredSegment = hashParams.requiredSegment;
-
-    const videoID = getVideoID()
+async function sponsorsLookup(keepOldSubmissions = true, ignoreCache = false) {
+    const videoID = getVideoID();
    if (!videoID) {
        console.error("[SponsorBlock] Attempted to fetch segments with a null/undefined videoID.");
        return;
    }
-    const hashPrefix = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
-    const response = await asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
-        categories,
-        actionTypes: getEnabledActionTypes(),
-        userAgent: `${chrome.runtime.id}`,
-        ...extraRequestData
-    });
+
+    const segmentData = await getSegmentsForVideo(videoID, ignoreCache);
+
+    // Make sure an old pending request doesn't get used.
+    if (videoID !== getVideoID()) return;

    // store last response status
-    lastResponseStatus = response?.status;
+    lastResponseStatus = segmentData.status;
+    if (segmentData.status === 200) {
+        const receivedSegments = segmentData.segments;

-    if (response?.ok) {
-        const receivedSegments: SponsorTime[] = JSON.parse(response.responseText)
-                    ?.filter((video) => video.videoID === getVideoID())
-                    ?.map((video) => video.segments)?.[0]
-                    ?.map((segment) => ({
-                        ...segment,
-                        source: SponsorSourceType.Server
-                    }))
-                    ?.sort((a, b) => a.segment[0] - b.segment[0]);
        if (receivedSegments && receivedSegments.length) {
            sponsorDataFound = true;

@@ -1181,6 +1189,7 @@ async function sponsorsLookup(keepOldSubmissions = true) {
            }

            // See if some segments should be hidden
+            const hashPrefix = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
            const downvotedData = Config.local.downvotedSegments[hashPrefix];
            if (downvotedData) {
                for (const segment of sponsorTimes) {
@@ -1199,7 +1208,7 @@ async function sponsorsLookup(keepOldSubmissions = true) {

            startSkipScheduleCheckingForStartSponsors();

-            if (!isNaN(getVideo().duration)) {
+            if (!isNaN(getVideoDuration())) {
                updatePreviewBar();
            }
        } else {
@@ -1217,7 +1226,7 @@ async function sponsorsLookup(keepOldSubmissions = true) {
        found: sponsorDataFound,
        status: lastResponseStatus,
        sponsorTimes: sponsorTimes,
-        time: getVideo()?.currentTime ?? 0,
+        time: getCurrentTime() ?? 0,
        onMobileYouTube: isOnMobileYouTube()
    });

@@ -1227,8 +1236,8 @@ async function sponsorsLookup(keepOldSubmissions = true) {
 }

 function importExistingChapters(wait: boolean) {
-    if (!existingChaptersImported && !importingChaptersWaiting && !triedImportingChapters && onVideoPage() && !isOnMobileYouTube()) {
-        const waitCondition = () => getVideo()?.duration && getExistingChapters(getVideoID(), getVideo().duration);
+    if (!existingChaptersImported && !importingChaptersWaiting && onVideoPage() && !isOnMobileYouTube()) {
+        const waitCondition = () => getVideoDuration() && getExistingChapters(getVideoID(), getVideoDuration());

        if (wait && !document.hasFocus() && !importingChaptersWaitingForFocus && !waitCondition()) {
            importingChaptersWaitingForFocus = true;
@@ -1248,23 +1257,11 @@ function importExistingChapters(wait: boolean) {
                        existingChaptersImported = true;
                        updatePreviewBar();
                    }
-                }).catch(() => { importingChaptersWaiting = false; triedImportingChapters = true; }); // eslint-disable-line @typescript-eslint/no-empty-function
+                }).catch(() => { importingChaptersWaiting = false; }); // eslint-disable-line @typescript-eslint/no-empty-function
        }
    }
 }

-function getEnabledActionTypes(forceFullVideo = false): ActionType[] {
-    const actionTypes = [ActionType.Skip, ActionType.Poi, ActionType.Chapter];
-    if (Config.config.muteSegments) {
-        actionTypes.push(ActionType.Mute);
-    }
-    if (Config.config.fullVideoSegments || forceFullVideo) {
-        actionTypes.push(ActionType.Full);
-    }
-
-    return actionTypes;
-}
-
 async function lockedCategoriesLookup(): Promise<void> {
    const hashPrefix = (await getHash(getVideoID(), 1)).slice(0, 4);
    const response = await asyncRequestToServer("GET", "/api/lockCategories/" + hashPrefix);
@@ -1312,7 +1309,7 @@ function startSkipScheduleCheckingForStartSponsors() {
        let startingSegmentTime = getStartTimeFromUrl(document.URL) || -1;
        let found = false;
        for (const time of sponsorTimes) {
-            if (time.segment[0] <= getVideo().currentTime && time.segment[0] > startingSegmentTime && time.segment[1] > getVideo().currentTime
+            if (time.segment[0] <= getCurrentTime() && time.segment[0] > startingSegmentTime && time.segment[1] > getCurrentTime()
                    && time.actionType !== ActionType.Poi) {
                        startingSegmentTime = time.segment[0];
                        found = true;
@@ -1321,7 +1318,7 @@ function startSkipScheduleCheckingForStartSponsors() {
        }
        if (!found) {
            for (const time of sponsorTimesSubmitting) {
-                if (time.segment[0] <= getVideo().currentTime && time.segment[0] > startingSegmentTime && time.segment[1] > getVideo().currentTime
+                if (time.segment[0] <= getCurrentTime() && time.segment[0] > startingSegmentTime && time.segment[1] > getCurrentTime()
                        && time.actionType !== ActionType.Poi) {
                            startingSegmentTime = time.segment[0];
                            found = true;
@@ -1332,7 +1329,7 @@ function startSkipScheduleCheckingForStartSponsors() {

        // For highlight category
        const poiSegments = sponsorTimes
-            .filter((time) => time.segment[1] > getVideo().currentTime
+            .filter((time) => time.segment[1] > getCurrentTime()
                && time.actionType === ActionType.Poi && time.hidden === SponsorHideType.Visible)
            .sort((a, b) => b.segment[0] - a.segment[0]);
        for (const time of poiSegments) {
@@ -1343,7 +1340,7 @@ function startSkipScheduleCheckingForStartSponsors() {
                    skipTime: time.segment,
                    skippingSegments: [time],
                    openNotice: true,
-                    unskipTime: getVideo().currentTime
+                    unskipTime: getCurrentTime()
                });
                if (skipOption === CategorySkipOption.AutoSkip) break;
            }
@@ -1410,8 +1407,8 @@ function updatePreviewBar(): void {
        });
    });

-    previewBar.set(previewBarSegments.filter((segment) => segment.actionType !== ActionType.Full), getVideo()?.duration)
-    if (getVideo()) updateActiveSegment(getVideo().currentTime);
+    previewBar.set(previewBarSegments.filter((segment) => segment.actionType !== ActionType.Full), getVideoDuration())
+    if (getVideo()) updateActiveSegment(getCurrentTime());

    if (Config.config.showTimeWithSkips) {
        const skippedDuration = utils.getTimestampsDuration(previewBarSegments
@@ -1638,7 +1635,7 @@ function getStartTimes(sponsorTimes: SponsorTime[], includeIntersectingSegments:
 */
 function previewTime(time: number, unpause = true) {
    previewedSegment = true;
-    getVideo().currentTime = time;
+    setCurrentTime(time);

    // Unpause the video if needed
    if (unpause && getVideo().paused){
@@ -1684,22 +1681,22 @@ function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, u
    const isSubmittingSegment = sponsorTimesSubmitting.some((time) => time.segment === skippingSegments[0].segment);

    if ((autoSkip || isSubmittingSegment)
-            && v.currentTime !== skipTime[1]) {
+            && getCurrentTime() !== skipTime[1]) {
        switch(skippingSegments[0].actionType) {
            case ActionType.Poi:
            case ActionType.Skip: {
                // Fix for looped videos not working when skipping to the end #426
                // for some reason you also can't skip to 1 second before the end
-                if (v.loop && v.duration > 1 && skipTime[1] >= v.duration - 1) {
-                    v.currentTime = 0;
-                } else if (v.duration > 1 && skipTime[1] >= v.duration
+                if (v.loop && getVideoDuration() > 1 && skipTime[1] >= getVideoDuration() - 1) {
+                    setCurrentTime(0);
+                } else if (getVideoDuration() > 1 && skipTime[1] >= getVideoDuration()
                        && (navigator.vendor === "Apple Computer, Inc." || isPlayingPlaylist())) {
                    // 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
+                    setCurrentTime(getVideoDuration() - 0.001);
+                } else if (getVideoDuration() > 1 && Math.abs(skipTime[1] - getVideoDuration()) < endTimeSkipBuffer
                    && isFirefoxOrSafari() && !isSafari()) {
-                    v.currentTime = v.duration;
+                    setCurrentTime(getVideoDuration());
                } else {
                    if (inMuteSegment(skipTime[1], true)) {
                        // Make sure not to mute if skipping into a mute segment
@@ -1707,7 +1704,7 @@ function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, u
                        videoMuted = true;
                    }

-                    v.currentTime = skipTime[1];
+                    setCurrentTime(skipTime[1]);
                }

                break;
@@ -1722,8 +1719,9 @@ function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, u
        }
    }

-    if (autoSkip && Config.config.audioNotificationOnSkip) {
-        const beep = new Audio(chrome.runtime.getURL("icons/beep.ogg"));
+    if (autoSkip && Config.config.audioNotificationOnSkip
+            && !isSubmittingSegment && !getVideo()?.muted) {
+        const beep = new Audio(chrome.runtime.getURL("icons/beep.oga"));
        beep.volume = getVideo().volume * 0.1;
        const oldMetadata = navigator.mediaSession.metadata
        beep.play();
@@ -1792,7 +1790,7 @@ function unskipSponsorTime(segment: SponsorTime, unskipTime: number = null, forc

    if (forceSeek || segment.actionType === ActionType.Skip) {
        //add a tiny bit of time to make sure it is not skipped again
-        getVideo().currentTime = unskipTime ?? segment.segment[0] + 0.001;
+        setCurrentTime(unskipTime ?? segment.segment[0] + 0.001);
    }

 }
@@ -1802,11 +1800,11 @@ function reskipSponsorTime(segment: SponsorTime, forceSeek = false) {
        getVideo().muted = true;
        videoMuted = true;
    } else {
-        const skippedTime = Math.max(segment.segment[1] - getVideo().currentTime, 0);
+        const skippedTime = Math.max(segment.segment[1] - getCurrentTime(), 0);
        const segmentDuration = segment.segment[1] - segment.segment[0];
        const fullSkip = skippedTime / segmentDuration > manualSkipPercentCount;

-        getVideo().currentTime = segment.segment[1];
+        setCurrentTime(segment.segment[1]);
        sendTelemetryAndCount([segment], segment.actionType !== ActionType.Chapter ? skippedTime : 0, fullSkip);
        startSponsorSchedule(true, segment.segment[1], false);
    }
@@ -1956,13 +1954,14 @@ function getRealCurrentTime(): number {

    if (playButtonSVGData === replaceSVGData) {
        // At the end of the video
-        return getVideo()?.duration;
+        return getVideoDuration();
    } else {
-        return getVideo().currentTime;
+        return getCurrentTime();
    }
 }

 function startOrEndTimingNewSegment() {
+    verifyCurrentTime();
    const roundedTime = Math.round((getRealCurrentTime() + Number.EPSILON) * 1000) / 1000;
    if (!isSegmentCreationInProgress()) {
        sponsorTimesSubmitting.push({
@@ -1987,7 +1986,7 @@ function startOrEndTimingNewSegment() {
    Config.forceLocalUpdate("unsubmittedSegments");

    // Make sure they know if someone has already submitted something it while they were watching
-    sponsorsLookup();
+    sponsorsLookup(true, true);

    updateEditButtonsOnPlayer();
    updateSponsorTimesSubmitting(false);
@@ -2337,7 +2336,7 @@ async function sendSubmitMessage(): Promise<boolean> {
    if (!previewedSegment 
            && !sponsorTimesSubmitting.every((segment) => 
                [ActionType.Full, ActionType.Chapter, ActionType.Poi].includes(segment.actionType) 
-                    || segment.segment[1] >= getVideo()?.duration
+                    || segment.segment[1] >= getVideoDuration()
                    || segment.segment[0] === 0)) {
        alert(`${chrome.i18n.getMessage("previewSegmentRequired")} ${keybindToString(Config.config.previewKeybind)}`);
        return false;
@@ -2349,8 +2348,8 @@ async function sendSubmitMessage(): Promise<boolean> {

    //check if a sponsor exceeds the duration of the video
    for (let i = 0; i < sponsorTimesSubmitting.length; i++) {
-        if (sponsorTimesSubmitting[i].segment[1] > getVideo().duration) {
-            sponsorTimesSubmitting[i].segment[1] = getVideo().duration;
+        if (sponsorTimesSubmitting[i].segment[1] > getVideoDuration()) {
+            sponsorTimesSubmitting[i].segment[1] = getVideoDuration();
        }
    }

@@ -2375,7 +2374,7 @@ async function sendSubmitMessage(): Promise<boolean> {
        videoID: getVideoID(),
        userID: Config.config.userID,
        segments: sponsorTimesSubmitting,
-        videoDuration: getVideo()?.duration,
+        videoDuration: getVideoDuration(),
        userAgent: `${chrome.runtime.id}/v${chrome.runtime.getManifest().version}`
    });

@@ -2468,38 +2467,38 @@ function nextChapter(): void {
    const chapters = previewBar.unfilteredChapterGroups?.filter((time) => [ActionType.Chapter, null].includes(time.actionType));
    if (!chapters || chapters.length <= 0) return;

-    lastNextChapterKeybind.time = getVideo().currentTime;
+    lastNextChapterKeybind.time = getCurrentTime();
    lastNextChapterKeybind.date = Date.now();

-    const nextChapter = chapters.findIndex((time) => time.segment[0] > getVideo().currentTime);
+    const nextChapter = chapters.findIndex((time) => time.segment[0] > getCurrentTime());
    if (nextChapter !== -1) {
-        getVideo().currentTime = chapters[nextChapter].segment[0];
+        setCurrentTime(chapters[nextChapter].segment[0]);
    } else {
-        getVideo().currentTime = getVideo().duration;
+        setCurrentTime(getVideoDuration());
    }
 }

 function previousChapter(): void {
    if (Date.now() - lastNextChapterKeybind.date < 3000) {
-        getVideo().currentTime = lastNextChapterKeybind.time;
+        setCurrentTime(lastNextChapterKeybind.time);
        lastNextChapterKeybind.date = 0;
        return;
    }

    const chapters = previewBar.unfilteredChapterGroups?.filter((time) => [ActionType.Chapter, null].includes(time.actionType));
    if (!chapters || chapters.length <= 0) {
-        getVideo().currentTime = 0;
+        setCurrentTime(0);
        return;
    }

    // subtract 5 seconds to allow skipping back to the previous chapter if close to start of
    // the current one
-    const nextChapter = chapters.findIndex((time) => time.segment[0] > getVideo().currentTime - Math.min(5, time.segment[1] - time.segment[0]));
+    const nextChapter = chapters.findIndex((time) => time.segment[0] > getCurrentTime() - Math.min(5, time.segment[1] - time.segment[0]));
    const previousChapter = nextChapter !== -1 ? (nextChapter - 1) : (chapters.length - 1);
    if (previousChapter !== -1) {
-        getVideo().currentTime = chapters[previousChapter].segment[0];
+        setCurrentTime(chapters[previousChapter].segment[0]);
    } else {
-        getVideo().currentTime = 0;
+        setCurrentTime(0);
    }
 }

@@ -2524,8 +2523,10 @@ function addHotkeyListener(): void {
 }

 function hotkeyListener(e: KeyboardEvent): void {
-    if (["textarea", "input"].includes(document.activeElement?.tagName?.toLowerCase())
-        || document.activeElement?.id?.toLowerCase()?.includes("editable")) return;
+    if ((["textarea", "input"].includes(document.activeElement?.tagName?.toLowerCase())
+        || (document.activeElement as HTMLElement)?.isContentEditable
+        || document.activeElement?.id?.toLowerCase()?.match(/editable|input/))
+            && document.hasFocus()) return;

    const key: Keybind = {
        key: e.key,
@@ -2570,6 +2571,8 @@ function hotkeyListener(e: KeyboardEvent): void {
        submitSegments();
        return;
    } else if (keybindEquals(key, openSubmissionMenuKey)) {
+        e.preventDefault();
+
        openSubmissionMenu();
        return;
    } else if (keybindEquals(key, previewKey)) {
@@ -2584,16 +2587,6 @@ function hotkeyListener(e: KeyboardEvent): void {
        previousChapter();
        return;
    }
-
-    //legacy - to preserve keybinds for skipKey, startSponsorKey and submitKey for people who set it before the update. (shouldn't be changed for future keybind options)
-    if (key.key == skipKey?.key && skipKey.code == null && !keybindEquals(Config.syncDefaults.skipKeybind, skipKey)) {
-        if (activeSkipKeybindElement)
-            activeSkipKeybindElement.toggleSkip.call(activeSkipKeybindElement);
-    } else if (key.key == startSponsorKey?.key && startSponsorKey.code == null && !keybindEquals(Config.syncDefaults.startSponsorKeybind, startSponsorKey)) {
-        startOrEndTimingNewSegment();
-    } else if (key.key == submitKey?.key && submitKey.code == null && !keybindEquals(Config.syncDefaults.submitKeybind, submitKey)) {
-        openSubmissionMenu();
-    }
 }

 /**
@@ -2641,11 +2634,11 @@ function showTimeWithoutSkips(skippedDuration: number): void {
    }

    // YouTube player time display
-    const displayClass =
-        isOnInvidious()     ? "vjs-duration" :
-        isOnMobileYouTube() ? "ytm-time-display" :
-                              "ytp-time-display.notranslate";
-    const display = document.querySelector(`.${displayClass}`);
+    const selector =
+        isOnInvidious()     ? ".vjs-duration" :
+        isOnMobileYouTube() ? ".YtwPlayerTimeDisplayContent" :
+                              ".ytp-time-display.notranslate .ytp-time-wrapper";
+    const display = document.querySelector(selector);
    if (!display) return;

    const durationID = "sponsorBlockDurationAfterSkips";
@@ -2655,12 +2648,16 @@ function showTimeWithoutSkips(skippedDuration: number): void {
    if (duration === null) {
        duration = document.createElement('span');
        duration.id = durationID;
-        if (!isOnInvidious()) duration.classList.add(displayClass);

-        display.appendChild(duration);
+        if (isOnMobileYouTube()) {
+            duration.style.paddingLeft = "4px";
+            display.insertBefore(duration, display.lastChild);
+        } else {
+            display.appendChild(duration);
+        }
    }

-    const durationAfterSkips = getFormattedTime(getVideo()?.duration - skippedDuration);
+    const durationAfterSkips = getFormattedTime(getVideoDuration() - skippedDuration);

    duration.innerText = (durationAfterSkips == null || skippedDuration <= 0) ? "" : " (" + durationAfterSkips + ")";
 }
--- a/src/js-components/previewBar.ts
+++ b/src/js-components/previewBar.ts
@@ -197,7 +197,6 @@ class PreviewBar {

        if (this.onMobileYouTube) {
            this.container.style.transform = "none";
-            this.container.style.height = "var(--yt-progress-bar-height)";
        } else if (!this.onInvidious) {
            this.container.classList.add("sbNotInvidious");
        }
@@ -648,8 +647,21 @@ class PreviewBar {
                        if (changedData.scale !== null) {
                            const transformScale = (changedData.scale) / progressBar.clientWidth;

+                            const scale = Math.max(0, Math.min(1 - calculatedLeft, (transformScale - cursor) / fullSectionWidth - calculatedLeft));
                            customChangedElement.style.transform =
-                                `scaleX(${Math.max(0, Math.min(1 - calculatedLeft, (transformScale - cursor) / fullSectionWidth - calculatedLeft))}`;
+                                `scaleX(${scale})`;
+                            if (customChangedElement.style.backgroundSize) {
+                                const backgroundSize = Math.max(changedData.scale / scale, fullSectionWidth * progressBar.clientWidth);
+                                customChangedElement.style.backgroundSize = `${backgroundSize}px`;
+
+                                if (changedData.scale < (cursor + fullSectionWidth) * progressBar.clientWidth) {
+                                    customChangedElement.style.backgroundPosition = `-${backgroundSize - fullSectionWidth * progressBar.clientWidth}px`;
+                                } else {
+                                    // Passed this section
+                                    customChangedElement.style.backgroundPosition = `-${cursor * progressBar.clientWidth}px`;
+                                }
+                            }
+
                            if (firstUpdate) {
                                customChangedElement.style.transition = "none";
                                setTimeout(() => customChangedElement.style.removeProperty("transition"), 50);
--- a/src/messageTypes.ts
+++ b/src/messageTypes.ts
@@ -17,7 +17,8 @@ interface DefaultMessage {
        | "isChannelWhitelisted"
        | "submitTimes"
        | "refreshSegments"
-        | "closePopup";
+        | "closePopup"
+        | "getLogs";
 }

 interface BoolValueMessage {
@@ -104,7 +105,8 @@ export type MessageResponse =
    | Record<string, never> // empty object response {}
    | VoteResponse
    | ImportSegmentsResponse
-    | RefreshSegmentsResponse;
+    | RefreshSegmentsResponse
+    | LogResponse;

 export interface VoteResponse {
    successType: number;
@@ -120,6 +122,11 @@ export interface RefreshSegmentsResponse {
    hasVideo: boolean;
 }

+export interface LogResponse {
+    debug: string[];
+    warn: string[];
+}
+
 export interface TimeUpdateMessage {
    message: "time";
    time: number;
--- a/src/options.ts
+++ b/src/options.ts
@@ -1,8 +1,7 @@
 import * as React from "react";
 import { createRoot } from 'react-dom/client';

-import Config from "./config";
-import * as CompileConfig from "../config.json";
+import Config, { generateDebugDetails } from "./config";
 import * as invidiousList from "../ci/invidiouslist.json";

 // Make the config public for debugging purposes
@@ -698,32 +697,14 @@ function validateServerAddress(input: string): string {
 }

 function copyDebugOutputToClipboard() {
-    // Build output debug information object
-    const output = {
-        debug: {
-            userAgent: navigator.userAgent,
-            platform: navigator.platform,
-            language: navigator.language,
-            extensionVersion: chrome.runtime.getManifest().version
-        },
-        config: JSON.parse(JSON.stringify(Config.cachedSyncConfig)) // Deep clone config object
-    };
-
-    // Sanitise sensitive user config values
-    delete output.config.userID;
-    output.config.serverAddress = (output.config.serverAddress === CompileConfig.serverAddress)
-        ? "Default server address" : "Custom server address";
-    output.config.invidiousInstances = output.config.invidiousInstances.length;
-    output.config.whitelistedChannels = output.config.whitelistedChannels.length;
-
    // Copy object to clipboard
-    navigator.clipboard.writeText(JSON.stringify(output, null, 4))
-      .then(() => {
+    navigator.clipboard.writeText(generateDebugDetails())
+    .then(() => {
        alert(chrome.i18n.getMessage("copyDebugInformationComplete"));
-      })
-      .catch(() => {
+    })
+    .catch(() => {
        alert(chrome.i18n.getMessage("copyDebugInformationFailed"));
-      });
+    });
 }

 function isIncognitoAllowed(): Promise<boolean> {
--- a/src/popup.ts
+++ b/src/popup.ts
@@ -1,4 +1,4 @@
-import Config from "./config";
+import Config, { generateDebugDetails } from "./config";

 import Utils from "./utils";
 import {
@@ -12,6 +12,7 @@ import {
    GetChannelIDResponse,
    IsChannelWhitelistedResponse,
    IsInfoFoundMessageResponse,
+    LogResponse,
    Message,
    MessageResponse,
    PopupMessage,
@@ -184,7 +185,8 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        "exportSegmentsButton",
        "importSegmentsMenu",
        "importSegmentsText",
-        "importSegmentsSubmit"
+        "importSegmentsSubmit",
+        "debugLogs"

    ].forEach(id => PageElements[id] = document.getElementById(id));

@@ -255,6 +257,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
    PageElements.helpButton.addEventListener("click", openHelp);
    PageElements.refreshSegmentsButton.addEventListener("click", refreshSegments);
    PageElements.sbPopupIconCopyUserID.addEventListener("click", async () => copyToClipboard(await getHash(Config.config.userID)));
+    PageElements.debugLogs.addEventListener("click", copyDebgLogs);

    // Forward click events
    if (window !== window.top) {
@@ -303,7 +306,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        PageElements.showNoticeAgain.style.display = "unset";
    }

-    const values = ["userName", "viewCount", "minutesSaved", "vip", "permissions"];
+    const values = ["userName", "viewCount", "minutesSaved", "vip", "permissions", "segmentCount"];

    asyncRequestToServer("GET", "/api/userInfo", {
        publicUserID: await getHash(Config.config.userID),
@@ -336,16 +339,18 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                PageElements.sponsorTimesOthersTimeSavedDisplay.innerText = getFormattedHours(minutesSaved);
            }

+            //get the amount of times this user has contributed and display it to thank them
+            PageElements.sponsorTimesContributionsDisplay.innerText = Math.max(Config.config.sponsorTimesContributed ?? 0, userInfo.segmentCount).toLocaleString();
+            PageElements.sponsorTimesContributionsContainer.classList.remove("hidden");
+
+            PageElements.sponsorTimesOthersTimeSavedEndWord.innerText = chrome.i18n.getMessage("minsLower");
+
            Config.config.isVip = userInfo.vip;
            Config.config.permissions = userInfo.permissions;
        }
    });

-    //get the amount of times this user has contributed and display it to thank them
-    if (Config.config.sponsorTimesContributed != undefined) {
-        PageElements.sponsorTimesContributionsDisplay.innerText = Config.config.sponsorTimesContributed.toLocaleString();
-        PageElements.sponsorTimesContributionsContainer.classList.remove("hidden");
-    }
+    

    //get the amount of times this user has skipped a sponsor
    if (Config.config.skipCount != undefined) {
@@ -1141,6 +1146,12 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        }
    }

+    function copyDebgLogs() {
+        sendTabMessage({ message: "getLogs" }, (logs: LogResponse) => {
+            copyToClipboard(`${generateDebugDetails()}\n\nWarn:\n${logs.warn.join("\n")}\n\nDebug:\n${logs.debug.join("\n")}`);
+        });
+    }
+
    function onMessage(msg: PopupMessage) {
        switch (msg.message) {
            case "time":
--- a/src/render/GenericNotice.tsx
+++ b/src/render/GenericNotice.tsx
@@ -8,6 +8,7 @@ const utils = new Utils();
 import { ContentContainer } from "../types";
 import NoticeTextSelectionComponent from "../components/NoticeTextSectionComponent";
 import { ButtonListener } from "../../maze-utils/src/components/component-types";
+import { getVideo } from "../../maze-utils/src/video";

 export interface TextBox {
    icon: string;
@@ -75,7 +76,7 @@ export default class GenericNotice {
                    {options.textBoxes?.length > 0 ?
                        <tr id={"sponsorSkipNoticeMiddleRow" + this.idSuffix}
                            className="sponsorTimeMessagesRow"
-                            style={{maxHeight: this.contentContainer ? (this.contentContainer().v.offsetHeight - 200) + "px" : null}}>
+                            style={{maxHeight: getVideo() ? (getVideo().offsetHeight - 200) + "px" : null}}>
                            <td style={{width: "100%"}}>
                                {this.getMessageBoxes(this.idSuffix, options.textBoxes)}
                            </td>
--- a/src/types.ts
+++ b/src/types.ts
@@ -10,7 +10,6 @@ export interface ContentContainer {
        sponsorTimes: SponsorTime[];
        sponsorTimesSubmitting: SponsorTime[];
        skipNotices: SkipNotice[];
-        v: HTMLVideoElement;
        sponsorVideoID;
        reskipSponsorTime: (segment: SponsorTime, forceSeek?: boolean) => void;
        updatePreviewBar: () => void;
@@ -57,7 +56,13 @@ export enum ActionType {
    Poi = "poi"
 }

-export const ActionTypes = [ActionType.Skip, ActionType.Mute];
+export const ActionTypes = [
+    ActionType.Skip,
+    ActionType.Mute,
+    ActionType.Chapter,
+    ActionType.Full,
+    ActionType.Poi
+];

 export type SegmentUUID = string  & { __segmentUUIDBrand: unknown };
 export type Category = string & { __categoryBrand: unknown };
--- a/src/utils/pageUtils.ts
+++ b/src/utils/pageUtils.ts
@@ -55,7 +55,7 @@ export function getHashParams(): Record<string, unknown> {

 export function getExistingChapters(currentVideoID: VideoID, duration: number): SponsorTime[] {
    const chaptersBox = document.querySelector("ytd-macro-markers-list-renderer");
-    const title = document.querySelector("[target-id=engagement-panel-macro-markers-auto-chapters] #title-text");
+    const title = chaptersBox?.closest("ytd-engagement-panel-section-list-renderer")?.querySelector("#title-text.ytd-engagement-panel-title-header-renderer");
    if (title?.textContent?.includes("Key moment")) return [];

    const chapters: SponsorTime[] = [];
--- a/src/utils/requests.ts
+++ b/src/utils/requests.ts
@@ -9,8 +9,8 @@ import { FetchResponse, sendRequestToCustomServer } from "../../maze-utils/src/b
 * @param address The address to add to the SponsorBlock server address
 * @param callback 
 */    
-export function asyncRequestToCustomServer(type: string, url: string, data = {}): Promise<FetchResponse> {
-    return sendRequestToCustomServer(type, url, data);
+export function asyncRequestToCustomServer(type: string, url: string, data = {}, headers = {}): Promise<FetchResponse> {
+    return sendRequestToCustomServer(type, url, data, headers);
 }

 /**
@@ -20,10 +20,10 @@ export function asyncRequestToCustomServer(type: string, url: string, data = {})
 * @param address The address to add to the SponsorBlock server address
 * @param callback 
 */    
-export async function asyncRequestToServer(type: string, address: string, data = {}): Promise<FetchResponse> {
+export async function asyncRequestToServer(type: string, address: string, data = {}, headers = {}): Promise<FetchResponse> {
    const serverAddress = Config.config.testingServer ? CompileConfig.testingServerAddress : Config.config.serverAddress;

-    return await (asyncRequestToCustomServer(type, serverAddress + address, data));
+    return await (asyncRequestToCustomServer(type, serverAddress + address, data, headers));
 }

 /**
--- a/src/utils/segmentData.ts
+++ b/src/utils/segmentData.ts
@@ -0,0 +1,104 @@
+import { DataCache } from "../../maze-utils/src/cache";
+import { getHash, HashedValue } from "../../maze-utils/src/hash";
+import Config from "../config";
+import * as CompileConfig from "../../config.json";
+import { ActionType, ActionTypes, SponsorSourceType, SponsorTime, VideoID } from "../types";
+import { getHashParams } from "./pageUtils";
+import { asyncRequestToServer } from "./requests";
+
+const segmentDataCache = new DataCache<VideoID, SegmentResponse>(() => {
+    return {
+        segments: null,
+        status: 200
+    };
+}, 5);
+
+const pendingList: Record<VideoID, Promise<SegmentResponse>> = {};
+
+export interface SegmentResponse {
+    segments: SponsorTime[] | null;
+    status: number;
+}
+
+export async function getSegmentsForVideo(videoID: VideoID, ignoreCache: boolean): Promise<SegmentResponse> {
+    if (!ignoreCache) {
+        const cachedData = segmentDataCache.getFromCache(videoID);
+        if (cachedData) {
+            segmentDataCache.cacheUsed(videoID);
+            return cachedData;
+        }
+    }
+
+    if (pendingList[videoID]) {
+        return await pendingList[videoID];
+    }
+
+    const pendingData = fetchSegmentsForVideo(videoID);
+    pendingList[videoID] = pendingData;
+
+    const result = await pendingData;
+    delete pendingList[videoID];
+
+    return result;
+}
+
+async function fetchSegmentsForVideo(videoID: VideoID): Promise<SegmentResponse> {
+    const categories: string[] = Config.config.categorySelections.map((category) => category.name);
+
+    const extraRequestData: Record<string, unknown> = {};
+    const hashParams = getHashParams();
+    if (hashParams.requiredSegment) extraRequestData.requiredSegment = hashParams.requiredSegment;
+    
+    const hashPrefix = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
+    const response = await asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
+        categories: CompileConfig.categoryList,
+        actionTypes: ActionTypes,
+        ...extraRequestData
+    }, {
+        "X-CLIENT-NAME": `${chrome.runtime.id}/v${chrome.runtime.getManifest().version}`
+    });
+
+    if (response.ok) {
+        const enabledActionTypes = getEnabledActionTypes();
+
+        const receivedSegments: SponsorTime[] = JSON.parse(response.responseText)
+                    ?.filter((video) => video.videoID === videoID)
+                    ?.map((video) => video.segments)?.[0]
+                    ?.filter((segment) => enabledActionTypes.includes(segment.actionType) && categories.includes(segment.category))
+                    ?.map((segment) => ({
+                        ...segment,
+                        source: SponsorSourceType.Server
+                    }))
+                    ?.sort((a, b) => a.segment[0] - b.segment[0]);
+
+        if (receivedSegments && receivedSegments.length) {
+            const result = {
+                segments: receivedSegments,
+                status: response.status
+            };
+
+            segmentDataCache.setupCache(videoID).segments = result.segments;
+            return result;
+        } else {
+            // Setup with null data
+            segmentDataCache.setupCache(videoID);
+        }
+    }
+
+    return {
+        segments: null,
+        status: response.status
+    };
+}
+
+function getEnabledActionTypes(forceFullVideo = false): ActionType[] {
+    const actionTypes = [ActionType.Skip, ActionType.Poi, ActionType.Chapter];
+    if (Config.config.muteSegments) {
+        actionTypes.push(ActionType.Mute);
+    }
+    if (Config.config.fullVideoSegments || forceFullVideo) {
+        actionTypes.push(ActionType.Full);
+    }
+
+    return actionTypes;
+}
--- a/src/utils/thumbnails.ts
+++ b/src/utils/thumbnails.ts
@@ -1,10 +1,15 @@
 import { isOnInvidious, parseYouTubeVideoIDFromURL } from "../../maze-utils/src/video";
 import Config from "../config";
 import { getVideoLabel } from "./videoLabels";
-import { setThumbnailListener } from "../../maze-utils/src/thumbnailManagement";
+import { getThumbnailSelector, setThumbnailListener } from "../../maze-utils/src/thumbnailManagement";
+import { VideoID } from "../types";
+import { getSegmentsForVideo } from "./segmentData";

-export async function labelThumbnails(thumbnails: HTMLImageElement[]): Promise<void> {
-    await Promise.all(thumbnails.map((t) => labelThumbnail(t)));
+export async function handleThumbnails(thumbnails: HTMLImageElement[]): Promise<void> {
+    await Promise.all(thumbnails.map((t) => {
+        labelThumbnail(t);
+        setupThumbnailHover(t);
+    }));
 }

 export async function labelThumbnail(thumbnail: HTMLImageElement): Promise<HTMLElement | null> {
@@ -13,9 +18,7 @@ export async function labelThumbnail(thumbnail: HTMLImageElement): Promise<HTMLE
        return null;
    }
    
-    const link = (isOnInvidious() ? thumbnail.parentElement : thumbnail.querySelector("#thumbnail")) as HTMLAnchorElement
-    if (!link || link.nodeName !== "A" || !link.href) return null; // no link found
-    const videoID = parseYouTubeVideoIDFromURL(link.href)?.videoID;
+    const videoID = extractVideoID(thumbnail);
    if (!videoID) {
        hideThumbnailLabel(thumbnail);
        return null;
@@ -37,6 +40,47 @@ export async function labelThumbnail(thumbnail: HTMLImageElement): Promise<HTMLE
    return overlay;
 }

+export async function setupThumbnailHover(thumbnail: HTMLImageElement): Promise<void> {
+    // Cache would be reset every load due to no SPA
+    if (isOnInvidious()) return;
+
+    const mainElement = thumbnail.closest("#dismissible") as HTMLElement;
+    if (mainElement) {
+        mainElement.removeEventListener("mouseenter", thumbnailHoverListener);
+        mainElement.addEventListener("mouseenter", thumbnailHoverListener);
+    }
+}
+
+function thumbnailHoverListener(e: MouseEvent) {
+    if (!chrome.runtime?.id) return;
+
+    const thumbnail = (e.target as HTMLElement).querySelector(getThumbnailSelector()) as HTMLImageElement;
+    if (!thumbnail) return;
+
+    // Pre-fetch data for this video
+    const videoID = extractVideoID(thumbnail);
+    if (videoID) {
+        void getSegmentsForVideo(videoID, false);
+    }
+}
+
+function getLink(thumbnail: HTMLImageElement): HTMLAnchorElement | null {
+    if (isOnInvidious()) {
+        return thumbnail.parentElement as HTMLAnchorElement | null;
+    } else if (thumbnail.nodeName.toLowerCase() === "yt-thumbnail-view-model") {
+        return thumbnail.closest("yt-lockup-view-model")?.querySelector("a.yt-lockup-metadata-view-model-wiz__title");
+    } else {
+        return thumbnail.querySelector("#thumbnail");
+    }
+}
+
+function extractVideoID(thumbnail: HTMLImageElement): VideoID | null {
+    const link = getLink(thumbnail);
+    if (!link || link.nodeName !== "A" || !link.href) return null; // no link found
+
+    return parseYouTubeVideoIDFromURL(link.href)?.videoID;
+}
+
 function getOldThumbnailLabel(thumbnail: HTMLImageElement): HTMLElement | null {
    return thumbnail.querySelector(".sponsorThumbnailLabel") as HTMLElement | null;
 }   
@@ -109,7 +153,7 @@ function insertSBIconDefinition() {
 }

 export function setupThumbnailListener(): void {
-    setThumbnailListener(labelThumbnails, () => {
+    setThumbnailListener(handleThumbnails, () => {
        insertSBIconDefinition();
    }, () => Config.isReady());
 }
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -170,6 +170,13 @@ module.exports = env => {
                                        parsed.Description.message = parsed.Description.message.slice(0, 77) + "...";
                                    }
                                }
+
+                                if (env.browser.toLowerCase() === "edge") {
+                                    parsed.Description.message = parsed.Description.message.match(/^.+(?=\. )/)?.[0] || parsed.Description.message;
+                                    if (parsed.Description.message.length > 132) {
+                                        parsed.Description.message = parsed.Description.message.slice(0, 129) + "...";
+                                    }
+                                }
                
                                return Buffer.from(JSON.stringify(parsed));
                            }
@@ -185,6 +192,12 @@ module.exports = env => {
                stream: env.stream
            }),
            new configDiffPlugin()
-        ]
+        ],
+        performance: {
+            hints: false,
+            maxEntrypointSize: 512000,
+            maxAssetSize: 512000
+        }
+
    };
 };
Author	SHA1	Message	Date
Ajay	9c4946a3fe	update translations	2024-11-10 15:51:30 -05:00
Ajay	7d2e4c8515	bump version	2024-11-10 15:50:52 -05:00
Ajay	3b2fe51973	Make options page more compact	2024-10-30 13:53:55 -04:00
Ajay Ramachandran	b2ac881b9b	Merge pull request #2135 from calledude/master Fix skip audio notification not working on firefox	2024-10-29 16:59:27 -04:00
Ajay	4a134d7604	Add a document body check to garbage collector	2024-10-28 13:54:12 -04:00
Ajay	ad7d3a320b	Update for new related videos layout	2024-10-23 20:14:37 -04:00
calledude	0c3aa922ca	Fix skip audio notification not working on firefox	2024-10-18 22:47:45 +02:00
Ajay	875ec357d9	Make gradiant display for chapter seek bar follow the same UI as YouTube	2024-10-18 05:05:03 -04:00
Ajay	510c3723ad	bump version	2024-10-18 04:35:47 -04:00
Ajay	f5910407ba	Simple implementation to fix seekbar rendering on gradiant layout Fixes #2099	2024-10-18 04:27:23 -04:00
Ajay	2691dc5df5	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock	2024-10-02 03:05:38 -04:00
Ajay	31ef4f39bf	bump version	2024-10-02 03:05:37 -04:00
Ajay Ramachandran	4044a22e04	Merge pull request #2124 from Choromanski/feature/node-20-deprecated Node deprecated versions	2024-10-01 23:15:22 -04:00
Ajay	3c2c140eb5	Fix preview bar on mobile Fixes #2116	2024-10-01 23:14:12 -04:00
Ajay	5cdbc233e4	Fix time without skips on mobile	2024-10-01 23:12:56 -04:00
Ajay	86f8809de7	Fix time without skips on new YouTube design	2024-10-01 23:07:16 -04:00
Brian Choromanski	5163b3362f	Missed one checkout	2024-10-01 22:46:24 -04:00
Brian Choromanski	443fb1f448	Updated peter-evans/create-pull-request to v7	2024-10-01 22:43:30 -04:00
Brian Choromanski	7cd7089980	Updated upload-artifact to v4	2024-10-01 22:34:11 -04:00
Brian Choromanski	61f5d7a902	Updated setup-node to v4	2024-10-01 22:32:28 -04:00
Brian Choromanski	6ab88e9fa0	Updated checkout to v4	2024-10-01 22:31:43 -04:00
Ajay	3bddd0405c	Improve content editable check	2024-09-27 16:12:35 -04:00
Ajay	e4b05a316a	bump version	2024-09-27 15:50:18 -04:00
Ajay	451ceb370b	Fix keybinds not working at all	2024-09-27 15:50:10 -04:00
Ajay	ab5291702a	bump version	2024-09-27 02:06:20 -04:00
Ajay	bec183d595	Fix not allowing you to type ' in live chats	2024-09-27 02:06:08 -04:00
Ajay	a2f4f34dfe	bump version	2024-09-26 19:27:30 -04:00
Ajay	7ba6fee9e5	Add more room for server-side rendering check	2024-09-26 19:26:01 -04:00
Ajay	9d9713ee82	Attempt to fix issue with autoplay disabled on some browser breaking skipping Fix #2074 and Fix #2078	2024-09-26 19:18:30 -04:00
Ajay	91556f981a	Remove unnecessary log Fix #2111	2024-09-23 16:00:17 -04:00
Ajay	9f86aa6740	bump version	2024-09-23 04:07:50 -04:00
Ajay	466573e2a4	update translations	2024-09-23 04:07:36 -04:00
Ajay	4c417b10fe	Make sure old segment fetch request doesn't get used May fix #2101 See `dbf80b4929 (r147058589)`	2024-09-23 04:05:20 -04:00
Ajay	36549e7898	Fix chapter box title selector	2024-09-23 03:58:11 -04:00
Ajay	0d2d5f2eb0	try to improve chapters importing	2024-09-23 03:46:19 -04:00
Ajay	e089b83797	Improve timeout waiting error	2024-09-23 03:32:33 -04:00
Ajay	dbd0d157a8	Fix preview bar not appearing on mobile due to new layout Fixes #2109	2024-09-23 01:37:11 -04:00
Ajay	aef2b113f8	Remove legacy keybdind check	2024-09-12 19:45:35 -04:00
Ajay	e610e03e46	Make submission menu keyboard of ff not open find menu	2024-09-12 19:44:35 -04:00
Ajay	17cbd068b9	Add size limit to description for edge	2024-09-08 01:32:58 -04:00
Ajay	7064d3fe82	bump version	2024-09-08 01:30:09 -04:00
Ajay	abfe0b3f38	Fix minimum firefox version in manifest Failing web-ext linter	2024-09-08 01:29:55 -04:00
Ajay	045607b146	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock	2024-09-08 01:24:48 -04:00
Ajay	be90af7440	bump version	2024-09-08 01:24:47 -04:00
Ajay Ramachandran	0a7497be27	Merge pull request #1886 from Choromanski/master Overriding default webpack performance config to reduce warnings	2024-09-08 01:23:19 -04:00
Ajay	fcf096c66d	Fix lint issue	2024-09-08 01:21:59 -04:00
Ajay	12e8c7aad8	Add way to copy debug logs from popup	2024-09-08 01:20:25 -04:00
Ajay Ramachandran	2a2896786c	Merge pull request #2095 from mchangrh/inv-ci fully typed updown response	2024-09-07 01:00:23 -04:00
Michael C	20d538b6e9	fully typed updown response	2024-09-07 00:17:03 -04:00
Ajay Ramachandran	36a5bc105b	Merge pull request #2040 from ajayyy/dependabot/npm_and_yarn/braces-3.0.3 Bump braces from 3.0.2 to 3.0.3	2024-09-06 16:32:37 -04:00
Ajay Ramachandran	e6c39c099c	Merge pull request #2091 from ajayyy/ci/update_invidious_list Update Invidious List	2024-09-06 02:48:56 -04:00
github-actions[bot]	d74ece2785	Update Invidious List	2024-09-06 06:46:40 +00:00
Ajay	e7eeee1b9d	Fix invidious CI	2024-09-06 02:45:32 -04:00
Ajay Ramachandran	c0a579e84b	Merge pull request #2083 from ajayyy/dependabot/npm_and_yarn/webpack-5.94.0 Bump webpack from 5.75.0 to 5.94.0	2024-09-06 02:23:51 -04:00
Ajay	e0a602eaf4	Fix compatibility with Vinegar extension on Safari Also fixes miniplayer detection	2024-09-06 02:16:35 -04:00
dependabot[bot]	536ac01476	Bump webpack from 5.75.0 to 5.94.0 Bumps [webpack](https://github.com/webpack/webpack) from 5.75.0 to 5.94.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.75.0...v5.94.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>	2024-09-06 02:53:06 +00:00
Ajay Ramachandran	18a0cf2953	Merge pull request #2089 from ajayyy/dependabot/npm_and_yarn/multi-4c1fdd2521 Bump ws and web-ext	2024-09-05 22:51:48 -04:00
Ajay Ramachandran	7ae29f967b	Merge pull request #2088 from ajayyy/dependabot/npm_and_yarn/axios-1.7.7 Bump axios from 1.6.1 to 1.7.7	2024-09-05 22:51:42 -04:00
Ajay Ramachandran	2509cf9919	Merge pull request #2090 from ajayyy/dependabot/npm_and_yarn/multi-bc3fc687d2 Bump tough-cookie and web-ext	2024-09-05 22:51:34 -04:00
dependabot[bot]	e8c65fb21b	Bump tough-cookie and web-ext Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) to 4.1.4 and updates ancestor dependency [web-ext](https://github.com/mozilla/web-ext). These dependencies need to be updated together. Updates `tough-cookie` from 4.1.2 to 4.1.4 - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](https://github.com/salesforce/tough-cookie/compare/v4.1.2...v4.1.4) Updates `web-ext` from 7.10.0 to 8.2.0 - [Release notes](https://github.com/mozilla/web-ext/releases) - [Commits](https://github.com/mozilla/web-ext/compare/7.10.0...8.2.0) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect - dependency-name: web-ext dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>	2024-09-06 02:38:48 +00:00
dependabot[bot]	5d155f6c74	Bump ws and web-ext Bumps [ws](https://github.com/websockets/ws) to 8.17.1 and updates ancestor dependency [web-ext](https://github.com/mozilla/web-ext). These dependencies need to be updated together. Updates `ws` from 8.13.0 to 8.17.1 - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/8.13.0...8.17.1) Updates `web-ext` from 7.10.0 to 8.2.0 - [Release notes](https://github.com/mozilla/web-ext/releases) - [Commits](https://github.com/mozilla/web-ext/compare/7.10.0...8.2.0) --- updated-dependencies: - dependency-name: ws dependency-type: indirect - dependency-name: web-ext dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>	2024-09-06 02:38:40 +00:00
dependabot[bot]	dca6780979	Bump axios from 1.6.1 to 1.7.7 Bumps [axios](https://github.com/axios/axios) from 1.6.1 to 1.7.7. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.6.1...v1.7.7) --- updated-dependencies: - dependency-name: axios dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-09-06 02:38:38 +00:00
Ajay Ramachandran	65b7d6589a	Fix web ext signing	2024-09-05 22:37:33 -04:00
Ajay	dbf80b4929	Add pre-fetching on hover with a small segment data cache	2024-09-02 03:22:33 -04:00
Ajay	e181c64775	Use consistent request url for better caching	2024-09-02 02:04:32 -04:00
Ajay	ac9b2d12fe	Decrease sponsor frame flashing when skipping segments at the start	2024-09-01 03:51:37 -04:00
Ajay	3738b180dd	Don't play notification if video is muted Fixes #1888	2024-07-17 13:17:50 -04:00
Ajay	3ec1e85712	Don't play audio notification when previewing	2024-07-17 13:14:52 -04:00
Ajay	e9a77355bb	bump version	2024-06-23 00:33:39 +05:30
Ajay	116190f2b3	Warn if server-side ad wasn't detected and submitting a segment	2024-06-23 00:31:11 +05:30
Ajay	4bbd59b988	Support server side rendered ads Fixes #2035	2024-06-23 00:03:03 +05:30
Ajay	5c279d80df	Show submission count from server	2024-06-22 17:42:48 +05:30
Ajay	f177b95a5a	Fix submission menu after video ends and unskip button after video ends	2024-06-22 17:06:29 +05:30
Ajay Ramachandran	d86dd37ec0	Merge pull request #2046 from ajayyy/mv3 Support mv3	2024-06-22 16:29:43 +05:30
dependabot[bot]	3c2bf20321	Bump braces from 3.0.2 to 3.0.3 Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-06-18 01:45:58 +00:00
Brian Choromanski	2a5b76ddfb	Overriding default webpack performance config to reduce warnings	2023-10-19 15:09:19 -04:00