Fix german title not being shortened

.github/workflows/ci.yml

@@ -10,10 +10,10 @@ jobs:
 
     steps:
       # Initialization
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         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@v4
+      - uses: actions/upload-artifact@v3
         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@v4
+      - uses: actions/upload-artifact@v3
         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@v4
+      - uses: actions/upload-artifact@v3
         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@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: FirefoxExtensionBeta
           path: dist

.github/workflows/release.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
       # Initialization
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
           node-version: '18'
       - name: Copy configuration
@@ -35,11 +35,24 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - run: npm ci
+      
+      # Create Chrome artifacts
+      - name: Create Chrome artifacts
+        run: npm run build:chrome
+      - run: mkdir ./builds
+      - name: Zip Artifacts
+        run: cd ./dist ; zip -r ../builds/ChromeExtension.zip *
+      - name: Upload ChromeExtension to release
+        uses: Shopify/upload-to-release@07611424e04f1475ddf550e1c0dd650b867d5467
+        with:
+          args: builds/ChromeExtension.zip
+          name: ChromeExtension.zip
+          path: ./builds/ChromeExtension.zip
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       # Create Firefox artifacts
       - name: Create Firefox artifacts
         run: npm run build:firefox
-      - run: mkdir ./builds
       - name: Zip Artifacts
         run: cd ./dist ; zip -r ../builds/FirefoxExtension.zip *
       - name: Upload FirefoxExtension to release
@@ -49,18 +62,32 @@ jobs:
           name: FirefoxExtension.zip
           path: ./builds/FirefoxExtension.zip
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      
-      # Create Chrome artifacts
-      - name: Create Chrome artifacts
-        run: npm run build:chrome
+
+      # Create Beta artifacts (Builds with the name changed to beta)
+      - name: Create Chrome Beta artifacts
+        run: npm run build:chrome -- --env stream=beta
       - name: Zip Artifacts
-        run: cd ./dist ; zip -r ../builds/ChromeExtension.zip *
-      - name: Upload ChromeExtension to release
+        run: cd ./dist ; zip -r ../builds/ChromeExtensionBeta.zip *
+      - name: Upload ChromeExtensionBeta to release
         uses: Shopify/upload-to-release@07611424e04f1475ddf550e1c0dd650b867d5467
         with:
-          args: builds/ChromeExtension.zip
-          name: ChromeExtension.zip
-          path: ./builds/ChromeExtension.zip
+          args: builds/ChromeExtensionBeta.zip
+          name: ChromeExtensionBeta.zip
+          path: ./builds/ChromeExtensionBeta.zip
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+
+      # Create Safari artifacts
+      - name: Create Safari artifacts
+        run: npm run build:safari
+      - name: Zip Artifacts
+        run: cd ./dist ; zip -r ../builds/SafariExtension.zip *
+      - name: Upload SafariExtension to release
+        uses: Shopify/upload-to-release@07611424e04f1475ddf550e1c0dd650b867d5467
+        with:
+          args: builds/SafariExtension.zip
+          name: SafariExtension.zip
+          path: ./builds/SafariExtension.zip
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       # Create Edge artifacts
@@ -78,36 +105,10 @@ jobs:
           path: ./builds/EdgeExtension.zip
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-      # Create Safari artifacts
-      - name: Create Safari artifacts
-        run: npm run build:safari
-      - name: Zip Artifacts
-        run: cd ./dist ; zip -r ../builds/SafariExtension.zip *
-      - name: Upload SafariExtension to release
-        uses: Shopify/upload-to-release@07611424e04f1475ddf550e1c0dd650b867d5467
-        with:
-          args: builds/SafariExtension.zip
-          name: SafariExtension.zip
-          path: ./builds/SafariExtension.zip
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      # Create Beta artifacts (Builds with the name changed to beta)
-      - name: Create Chrome Beta artifacts
-        run: npm run build:chrome -- --env stream=beta
-      - name: Zip Artifacts
-        run: cd ./dist ; zip -r ../builds/ChromeExtensionBeta.zip *
-      - name: Upload ChromeExtensionBeta to release
-        uses: Shopify/upload-to-release@07611424e04f1475ddf550e1c0dd650b867d5467
-        with:
-          args: builds/ChromeExtensionBeta.zip
-          name: ChromeExtensionBeta.zip
-          path: ./builds/ChromeExtensionBeta.zip
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
       # Firefox Beta
       - name: Create Firefox Beta artifacts
         run: npm run build:firefox -- --env stream=beta
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: FirefoxExtensionBeta
           path: dist
@@ -124,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@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: FirefoxExtensionSigned.xpi
           path: ./web-ext-artifacts/FirefoxSignedInstaller.xpi

.github/workflows/tests.yml

@@ -9,10 +9,10 @@ jobs:
 
     steps:
       # Initialization
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
           node-version: '18'
       - run: npm ci
@@ -25,7 +25,7 @@ jobs:
 
       - name: Upload results on fail
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: Test Results
           path: ./test-results

.github/workflows/update-oss-attribution.yml

@@ -12,10 +12,10 @@ jobs:
   update-oss:
     runs-on: ubuntu-latest 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         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@v7
+        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
         # v4.2.3
         with:
           commit-message: Update OSS Attribution

.github/workflows/updateInvidous.yml

@@ -8,7 +8,7 @@ jobs:
   check-list:
     runs-on: ubuntu-latest 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         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@v7
+        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
         # v4.2.3
         with:
           commit-message: Update Invidious List

README.md

@@ -75,4 +75,4 @@ Icons made by:
 
 ### License
 
-This project is licensed under GNU GPL v3 or any later version
+This project is licensed under GNU LGPL v3 or any later version

ci/generateList.ts

@@ -7,7 +7,8 @@ This file should not be shipped with the extension
 /*
 Criteria for inclusion:
 Invidious
-- uptime >= 80%
+- 30d uptime >= 90%
+- available for at least 80/90 days
 - must have been up for at least 90 days
 - HTTPS only
 - url includes name (this is to avoid redirects)

ci/invidiousCI.ts

@@ -1,34 +1,31 @@
-import { InvidiousInstance, monitor } from "./invidiousType"
+import { InvidiousInstance, instanceMap } from "./invidiousType"
 
 import * as data from "../ci/invidious_instances.json";
 
 // only https servers
-const mapped = (data as InvidiousInstance[])
-  .filter((i) =>
-    i[1]?.type === "https"
-    && i[1]?.monitor?.enabled
-  )
-  .map((instance) => {
-    const monitor = instance[1].monitor as monitor;
+const mapped: instanceMap = data
+  .filter((i: InvidiousInstance) => i[1]?.type === "https")
+  .map((instance: InvidiousInstance) => {
     return {
       name: instance[0],
       url: instance[1].uri,
-      uptime: monitor.uptime || 0,
-      down: monitor.down ?? false,
-      created_at: monitor.created_at,
+      dailyRatios: instance[1].monitor.dailyRatios,
+      thirtyDayUptime: instance[1]?.monitor["30dRatio"].ratio,
     }
   });
 
 // reliability and sanity checks
 const reliableCheck = mapped
   .filter(instance => {
-    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;
+    // 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;
   })
+  // url includes name
+  .filter(instance => instance.url.includes(instance.name));
 
-export const getInvidiousList = (): string[] =>
-  reliableCheck.map(instance => instance.name).sort()
+export function getInvidiousList(): string[] {
+  return reliableCheck.map(instance => instance.name).sort()
+}

ci/invidiousType.ts

@@ -1,72 +1,54 @@
+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 | ivStats;
-    cors: null | boolean;
-    api: null | boolean;
+    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;
     type: "https" | "http" | "onion" | "i2p";
     uri: string;
-    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;
+    monitor: null | {
+      monitorId: number;
+      createdAt: number;
+      statusClass: string;
+      name: string;
+      url: string | null;
+      type: "HTTP(s)";
+      dailyRatios: ratio[];
+      "90dRatio": ratio;
+      "30dRatio": ratio;
     };
-  };
-  metadata: {
-    updatedAt: number;
-    lastChannelRefreshedAt: number;
-  };
-  playback: {
-    totalRequests: number;
-    successfulRequests: number;
-    ratio: number;
-  };
-}
+  }
+]

ci/invidiouslist.json

@@ -1 +1 @@
-["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"]
+["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"]

config.json.example

@@ -24,7 +24,7 @@
         "intro": "https://wiki.sponsor.ajay.app/w/Intermission/Intro_Animation",
         "outro": "https://wiki.sponsor.ajay.app/w/Endcards/Credits",
         "preview": "https://wiki.sponsor.ajay.app/w/Preview/Recap",
-        "filler": "https://wiki.sponsor.ajay.app/w/Tangents/Jokes",
+        "filler": "https://wiki.sponsor.ajay.app/w/Filler_Tangent",
         "music_offtopic": "https://wiki.sponsor.ajay.app/w/Music:_Non-Music_Section",
         "poi_highlight": "https://wiki.sponsor.ajay.app/w/Highlight",
         "guidelines": "https://wiki.sponsor.ajay.app/w/Guidelines",

manifest/chrome-manifest-extra.json

@@ -1,156 +1,12 @@
 {
-  "host_permissions": [
-    "https://*.youtube.com/*",
-    "https://sponsor.ajay.app/*"
+  "optional_permissions": [
+    "declarativeContent",
+    "webNavigation"
   ],
-  "optional_host_permissions": [
-    "*://*/*"
-  ],
-  "web_accessible_resources": [{
-    "resources": [
-      "icons/LogoSponsorBlocker256px.png",
-      "icons/IconSponsorBlocker256px.png",
-      "icons/PlayerStartIconSponsorBlocker.svg",
-      "icons/PlayerStopIconSponsorBlocker.svg",
-      "icons/PlayerUploadIconSponsorBlocker.svg",
-      "icons/PlayerUploadFailedIconSponsorBlocker.svg",
-      "icons/PlayerCancelSegmentIconSponsorBlocker.svg",
-      "icons/clipboard.svg",
-      "icons/settings.svg",
-      "icons/pencil.svg",
-      "icons/check.svg",
-      "icons/check-smaller.svg",
-      "icons/upvote.png",
-      "icons/downvote.png",
-      "icons/thumbs_down.svg",
-      "icons/thumbs_down_locked.svg",
-      "icons/thumbs_up.svg",
-      "icons/help.svg",
-      "icons/report.png",
-      "icons/close.png",
-      "icons/skipIcon.svg",
-      "icons/refresh.svg",
-      "icons/beep.oga",
-      "icons/pause.svg",
-      "icons/stop.svg",
-      "icons/skip.svg",
-      "icons/heart.svg",
-      "icons/visible.svg",
-      "icons/not_visible.svg",
-      "icons/sort.svg",
-      "icons/money.svg",
-      "icons/segway.png",
-      "icons/close-smaller.svg",
-      "icons/right-arrow.svg",
-      "icons/campaign.svg",
-      "icons/star.svg",
-      "icons/lightbulb.svg",
-      "icons/bolt.svg",
-      "icons/stopwatch.svg",
-      "icons/music-note.svg",
-      "icons/import.svg",
-      "icons/export.svg",
-      "icons/PlayerInfoIconSponsorBlocker.svg",
-      "icons/PlayerDeleteIconSponsorBlocker.svg",
-      "icons/dearrow.svg",
-      "popup.html",
-      "popup.css",
-      "content.css",
-      "shared.css",
-      "js/document.js",
-      "libs/Source+Sans+Pro.css",
-      "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2",
-      "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2",
-      "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2",
-      "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2"
-    ],
-    "matches": ["<all_urls>"]
-  }],
-  "content_scripts": [
-    {
-        "world": "MAIN",
-        "js": [
-            "./js/document.js"
-        ],
-        "matches": [
-            "https://*.youtube.com/*",
-            "https://www.youtube-nocookie.com/embed/*"
-        ],
-        "exclude_matches": [
-          "https://accounts.youtube.com/RotateCookiesPage*"
-      ],
-        "all_frames": true,
-        "run_at": "document_start"
-    },
-    {
-      "world": "ISOLATED",
-      "js": [
-          "./js/content.js"
-      ],
-      "css": [
-        "content.css",
-        "shared.css"
-      ],
-      "matches": [
-          "https://*.youtube.com/*",
-          "https://www.youtube-nocookie.com/embed/*"
-      ],
-      "exclude_matches": [
-        "https://accounts.youtube.com/RotateCookiesPage*"
-      ],
-      "all_frames": true,
-      "run_at": "document_start"
-  }
-  ],
-  "action": {
-    "default_title": "SponsorBlock",
-    "default_popup": "popup.html",
-    "default_icon": {
-        "16": "icons/IconSponsorBlocker16px.png",
-        "32": "icons/IconSponsorBlocker32px.png",
-        "64": "icons/IconSponsorBlocker64px.png",
-        "128": "icons/IconSponsorBlocker128px.png"
-    },
-    "theme_icons": [
-        {
-            "light": "icons/IconSponsorBlocker16px.png",
-            "dark": "icons/IconSponsorBlocker16px.png",
-            "size": 16
-        },
-        {
-            "light": "icons/IconSponsorBlocker32px.png",
-            "dark": "icons/IconSponsorBlocker32px.png",
-            "size": 32
-        },
-        {
-            "light": "icons/IconSponsorBlocker64px.png",
-            "dark": "icons/IconSponsorBlocker64px.png",
-            "size": 64
-        },
-        {
-            "light": "icons/IconSponsorBlocker128px.png",
-            "dark": "icons/IconSponsorBlocker128px.png",
-            "size": 128
-        },
-        {
-            "light": "icons/IconSponsorBlocker256px.png",
-            "dark": "icons/IconSponsorBlocker256px.png",
-            "size": 256
-        },
-        {
-            "light": "icons/IconSponsorBlocker512px.png",
-            "dark": "icons/IconSponsorBlocker512px.png",
-            "size": 512
-        },
-        {
-            "light": "icons/IconSponsorBlocker1024px.png",
-            "dark": "icons/IconSponsorBlocker1024px.png",
-            "size": 1024
-        }
-    ]
-  },
   "background": {
-    "service_worker": "./js/background.js"
+    "persistent": false
   },
-  "manifest_version": 3
+  "permissions": [
+    "https://*.youtube.com/*"
+  ]
 }

manifest/firefox-manifest-extra.json

@@ -2,7 +2,7 @@
   "browser_specific_settings": {
     "gecko": {
       "id": "sponsorBlocker@ajay.app",
-      "strict_min_version": "102.0"
+      "strict_min_version": "56.0"
     },
     "gecko_android": {
       "strict_min_version": "113.0"
@@ -11,6 +11,9 @@
   "background": {
     "persistent": false
   },
+  "permissions": [
+    "scripting"
+  ],
   "browser_action": {
     "default_area": "navbar"
   }

manifest/manifest-v2-extra.json

@@ -1,136 +0,0 @@
-{
-    "web_accessible_resources": [
-        "icons/LogoSponsorBlocker256px.png",
-        "icons/IconSponsorBlocker256px.png",
-        "icons/PlayerStartIconSponsorBlocker.svg",
-        "icons/PlayerStopIconSponsorBlocker.svg",
-        "icons/PlayerUploadIconSponsorBlocker.svg",
-        "icons/PlayerUploadFailedIconSponsorBlocker.svg",
-        "icons/PlayerCancelSegmentIconSponsorBlocker.svg",
-        "icons/clipboard.svg",
-        "icons/settings.svg",
-        "icons/pencil.svg",
-        "icons/check.svg",
-        "icons/check-smaller.svg",
-        "icons/upvote.png",
-        "icons/downvote.png",
-        "icons/thumbs_down.svg",
-        "icons/thumbs_down_locked.svg",
-        "icons/thumbs_up.svg",
-        "icons/help.svg",
-        "icons/report.png",
-        "icons/close.png",
-        "icons/skipIcon.svg",
-        "icons/refresh.svg",
-        "icons/beep.oga",
-        "icons/pause.svg",
-        "icons/stop.svg",
-        "icons/skip.svg",
-        "icons/heart.svg",
-        "icons/visible.svg",
-        "icons/not_visible.svg",
-        "icons/sort.svg",
-        "icons/money.svg",
-        "icons/segway.png",
-        "icons/close-smaller.svg",
-        "icons/right-arrow.svg",
-        "icons/campaign.svg",
-        "icons/star.svg",
-        "icons/lightbulb.svg",
-        "icons/bolt.svg",
-        "icons/stopwatch.svg",
-        "icons/music-note.svg",
-        "icons/import.svg",
-        "icons/export.svg",
-        "icons/PlayerInfoIconSponsorBlocker.svg",
-        "icons/PlayerDeleteIconSponsorBlocker.svg",
-        "icons/dearrow.svg",
-        "popup.html",
-        "popup.css",
-        "content.css",
-        "shared.css",
-        "js/document.js",
-        "libs/Source+Sans+Pro.css",
-        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2",
-        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2",
-        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2",
-        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2"
-    ],
-    "permissions": [
-        "https://sponsor.ajay.app/*"
-    ],
-    "optional_permissions": [
-        "*://*/*"
-    ],
-    "browser_action": {
-        "default_title": "SponsorBlock",
-        "default_popup": "popup.html",
-        "default_icon": {
-            "16": "icons/IconSponsorBlocker16px.png",
-            "32": "icons/IconSponsorBlocker32px.png",
-            "64": "icons/IconSponsorBlocker64px.png",
-            "128": "icons/IconSponsorBlocker128px.png"
-        },
-        "theme_icons": [
-            {
-                "light": "icons/IconSponsorBlocker16px.png",
-                "dark": "icons/IconSponsorBlocker16px.png",
-                "size": 16
-            },
-            {
-                "light": "icons/IconSponsorBlocker32px.png",
-                "dark": "icons/IconSponsorBlocker32px.png",
-                "size": 32
-            },
-            {
-                "light": "icons/IconSponsorBlocker64px.png",
-                "dark": "icons/IconSponsorBlocker64px.png",
-                "size": 64
-            },
-            {
-                "light": "icons/IconSponsorBlocker128px.png",
-                "dark": "icons/IconSponsorBlocker128px.png",
-                "size": 128
-            },
-            {
-                "light": "icons/IconSponsorBlocker256px.png",
-                "dark": "icons/IconSponsorBlocker256px.png",
-                "size": 256
-            },
-            {
-                "light": "icons/IconSponsorBlocker512px.png",
-                "dark": "icons/IconSponsorBlocker512px.png",
-                "size": 512
-            },
-            {
-                "light": "icons/IconSponsorBlocker1024px.png",
-                "dark": "icons/IconSponsorBlocker1024px.png",
-                "size": 1024
-            }
-        ]
-    },
-    "background": {
-        "scripts":[
-            "./js/background.js"
-        ]
-    },
-    "content_scripts": [{
-        "run_at": "document_start",
-        "matches": [
-            "https://*.youtube.com/*",
-            "https://www.youtube-nocookie.com/embed/*"
-        ],
-        "exclude_matches": [
-            "https://accounts.youtube.com/RotateCookiesPage*"
-        ],
-        "all_frames": true,
-        "js": [
-            "./js/content.js"
-        ],
-        "css": [
-            "content.css",
-            "shared.css"
-        ]
-    }],
-    "manifest_version": 2
-}  

manifest/manifest.json

@@ -1,10 +1,141 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.11.2",
+    "version": "5.5",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",
+    "content_scripts": [{
+        "run_at": "document_start",
+        "matches": [
+            "https://*.youtube.com/*",
+            "https://www.youtube-nocookie.com/embed/*"
+        ],
+        "all_frames": true,
+        "js": [
+            "./js/content.js"
+        ],
+        "css": [
+            "content.css",
+            "shared.css"
+        ]
+    }],
+    "web_accessible_resources": [
+        "icons/LogoSponsorBlocker256px.png",
+        "icons/IconSponsorBlocker256px.png",
+        "icons/PlayerStartIconSponsorBlocker.svg",
+        "icons/PlayerStopIconSponsorBlocker.svg",
+        "icons/PlayerUploadIconSponsorBlocker.svg",
+        "icons/PlayerUploadFailedIconSponsorBlocker.svg",
+        "icons/PlayerCancelSegmentIconSponsorBlocker.svg",
+        "icons/clipboard.svg",
+        "icons/settings.svg",
+        "icons/pencil.svg",
+        "icons/check.svg",
+        "icons/check-smaller.svg",
+        "icons/upvote.png",
+        "icons/downvote.png",
+        "icons/thumbs_down.svg",
+        "icons/thumbs_down_locked.svg",
+        "icons/thumbs_up.svg",
+        "icons/help.svg",
+        "icons/report.png",
+        "icons/close.png",
+        "icons/skipIcon.svg",
+        "icons/refresh.svg",
+        "icons/beep.ogg",
+        "icons/pause.svg",
+        "icons/stop.svg",
+        "icons/skip.svg",
+        "icons/heart.svg",
+        "icons/visible.svg",
+        "icons/not_visible.svg",
+        "icons/sort.svg",
+        "icons/money.svg",
+        "icons/segway.png",
+        "icons/close-smaller.svg",
+        "icons/right-arrow.svg",
+        "icons/campaign.svg",
+        "icons/star.svg",
+        "icons/lightbulb.svg",
+        "icons/bolt.svg",
+        "icons/stopwatch.svg",
+        "icons/music-note.svg",
+        "icons/import.svg",
+        "icons/export.svg",
+        "icons/PlayerInfoIconSponsorBlocker.svg",
+        "icons/PlayerDeleteIconSponsorBlocker.svg",
+        "icons/dearrow.svg",
+        "popup.html",
+        "popup.css",
+        "content.css",
+        "shared.css",
+        "js/document.js",
+        "libs/Source+Sans+Pro.css",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2"
+    ],
+    "permissions": [
+        "storage",
+        "https://sponsor.ajay.app/*"
+    ],
+    "optional_permissions": [
+        "*://*/*"
+    ],
+    "browser_action": {
+        "default_title": "SponsorBlock",
+        "default_popup": "popup.html",
+        "default_icon": {
+            "16": "icons/IconSponsorBlocker16px.png",
+            "32": "icons/IconSponsorBlocker32px.png",
+            "64": "icons/IconSponsorBlocker64px.png",
+            "128": "icons/IconSponsorBlocker128px.png"
+        },
+        "theme_icons": [
+            {
+                "light": "icons/IconSponsorBlocker16px.png",
+                "dark": "icons/IconSponsorBlocker16px.png",
+                "size": 16
+            },
+            {
+                "light": "icons/IconSponsorBlocker32px.png",
+                "dark": "icons/IconSponsorBlocker32px.png",
+                "size": 32
+            },
+            {
+                "light": "icons/IconSponsorBlocker64px.png",
+                "dark": "icons/IconSponsorBlocker64px.png",
+                "size": 64
+            },
+            {
+                "light": "icons/IconSponsorBlocker128px.png",
+                "dark": "icons/IconSponsorBlocker128px.png",
+                "size": 128
+            },
+            {
+                "light": "icons/IconSponsorBlocker256px.png",
+                "dark": "icons/IconSponsorBlocker256px.png",
+                "size": 256
+            },
+            {
+                "light": "icons/IconSponsorBlocker512px.png",
+                "dark": "icons/IconSponsorBlocker512px.png",
+                "size": 512
+            },
+            {
+                "light": "icons/IconSponsorBlocker1024px.png",
+                "dark": "icons/IconSponsorBlocker1024px.png",
+                "size": 1024
+            }
+        ]
+    }, 
+    "background": {
+        "scripts":[
+        "./js/background.js"
+        ]
+    },
     "icons": {
         "16": "icons/IconSponsorBlocker16px.png",
         "32": "icons/IconSponsorBlocker32px.png",
@@ -14,12 +145,9 @@
         "512": "icons/IconSponsorBlocker512px.png",
         "1024": "icons/IconSponsorBlocker1024px.png"
     },
-    "permissions": [
-        "storage",
-        "scripting"
-    ],
     "options_ui": {
         "page": "options/options.html",
         "open_in_tab": true
-    }
+    },
+    "manifest_version": 2
 }  

manifest/safari-manifest-extra.json

@@ -2,15 +2,10 @@
   "background": {
     "persistent": false
   },
+  "permissions": [
+    "scripting"
+  ],
   "optional_permissions": [
     "webNavigation"
-  ],
-  "browser_action": {
-    "default_icon": {
-      "16": "icons/SafariIconSponsorBlocker16px.png",
-      "32": "icons/SafariIconSponsorBlocker32px.png",
-      "64": "icons/SafariIconSponsorBlocker64px.png",
-      "128": "icons/SafariIconSponsorBlocker128px.png"
-    }
-  }
+  ]
 }

package.json

@@ -38,14 +38,14 @@
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "typescript": "4.9",
-    "web-ext": "^8.2.0",
-    "webpack": "^5.94.0",
+    "web-ext": "^7.6.2",
+    "webpack": "^5.75.0",
     "webpack-cli": "^4.10.0",
     "webpack-merge": "^5.8.0"
   },
   "scripts": {
     "web-run": "npm run web-run:chrome",
-    "web-sign": "web-ext sign --channel unlisted -s dist",
+    "web-sign": "web-ext sign -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",

public/content.css

@@ -11,11 +11,6 @@
 	display: none;
 }
 
-/* Vorapi compatibility */
-#player-api_VORAPI_ELEMENT_ID #previewbar {
-	z-index: 999;
-}
-
 #previewbar {
     overflow: visible;
     padding: 0;
@@ -31,11 +26,6 @@
 	transition: transform .1s cubic-bezier(0,0,0.2,1);
 }
 
-/* May 2024 hover preview */
-.YtPlayerProgressBarProgressBar #previewbar {
-	transform: none;
-}
-
 .ytp-big-mode #previewbar {
 	transform: scaleY(0.625) translateY(-30%) translateY(1.5px);
 }
@@ -49,16 +39,7 @@
 }
 
 div:hover > #previewbar.sbNotInvidious {
-	transform: scaleY(1);
-}
-
-/* Vorapis */
-.v3 #previewbar.sbNotInvidious {
-	transform: scaleY(1);
-}
-.sponsorCategoryTooltipVisible.ytp-progress-tooltip {
-	width: 216px !important;
-  	/* left: 264.308px !important; */
+	transform: scaleY(1)
 }
 
 .previewbar {
@@ -88,7 +69,7 @@ div:hover > #previewbar.sbNotInvidious {
 	display: none !important;
 }
 
-.ytp-tooltip.sponsorCategoryTooltipVisible:not(.sponsorTooltipHasYTChapters) {
+.ytp-tooltip.sponsorCategoryTooltipVisible {
 	transform: translateY(-1em) !important;
 }
 
@@ -232,11 +213,6 @@ div:hover > .sponsorBlockChapterBar {
 	from { opacity: 0; }
 }
 
-@keyframes fadeInToFaded {
-	from { opacity: 0; }
-	to { opacity: 0.5; }
-}
-
 @keyframes fadeOut {
 	to { opacity: 0; }
 }
@@ -309,10 +285,6 @@ div:hover > .sponsorBlockChapterBar {
 	animation: fadeIn 0.5s ease-out;
 }
 
-.sponsorSkipNoticeFadeIn.sponsorSkipNoticeFaded {
-	animation: fadeInToFaded 0.5s ease-out;
-}
-
 .exportCopiedNotice .sponsorSkipNoticeFadeIn {
 	animation: none;
 }
@@ -808,18 +780,6 @@ input::-webkit-inner-spin-button {
     line-height: 1.5em;
 }
 
-/* Description on right layout */
-#title > #categoryPillParent {
-	font-size: 2rem;
-	font-weight: bold;
-	display: flex;
-	justify-content: center;
-	line-height: 2.8rem;
-}
-#title > #categoryPillParent > #categoryPill.cbPillOpen {
-	margin-bottom: 5px;
-}
-
 #categoryPillParent {
 	height: fit-content;
     margin-top: auto;
@@ -849,15 +809,6 @@ input::-webkit-inner-spin-button {
 	white-space: nowrap;
 }
 
-/* Vorapis V3 support */
-#watch7-content .sponsorBlockCategoryPill {
-	padding-top: 5px;
-	padding-bottom: 5px;
-}
-#watch7-content .sponsorBlockCategoryPillTitle {
-	font-size: 15px;
-}
-
 .categoryPillClose {
 	display: none;
 	height: 10px;

public/options/options.css

@@ -118,13 +118,13 @@ html, body {
 
 .option-group > div {
     min-height: 50px;
-    padding: 15px 0;
+    padding: 20px 0;
     border-bottom: 1px solid var(--border-color);
     border-image: linear-gradient(to right, var(--border-color), #00000000 80%)  1;
 }
 
 .categoryExtraOptions {
-    padding-bottom: 15px;
+    padding-bottom: 20px;
 }
 
 #music_offtopic_autoSkipOnMusicVideos {
@@ -271,11 +271,11 @@ input[type='number'] {
 
 .small-description {
     font-size: 13px;
-    padding: 5px 0 0 20px;
+    padding: 15px 0 0 20px;
 }
 
 .small-description td {
-    padding: 2.5px 0 10px 20px;
+    padding: 10px 0 20px 20px;
 }
 
 .indent {
@@ -283,7 +283,7 @@ input[type='number'] {
 }
 
 .categoryTableElement td {
-    padding-top: 5px;
+    padding-top: 10px;
     border-top: 1px solid var(--border-color);
 }
 
@@ -353,8 +353,7 @@ input[type='number'] {
 
     font-size: 14px;
 
-    display: flex;
-    align-items: center;
+    display: table;
 }
 
 .switch-container .switch-label {
@@ -373,7 +372,6 @@ input[type='number'] {
     display: inline-block;
     width: 40px;
     height: 24px;
-    min-width: 40px;
 }
 
 .switch input { 

public/options/options.html

@@ -154,6 +154,20 @@
 					<div class="small-description">__MSG_whatForceChannelCheck__</div>
 				</div>
 
+				<div data-type="toggle" data-sync="refetchWhenNotFound">
+					<div class="switch-container">
+						<label class="switch">
+							<input id="refetchWhenNotFound" type="checkbox" checked>
+							<span class="slider round"></span>
+						</label>
+						<label class="switch-label" for="refetchWhenNotFound">
+							__MSG_enableRefetchWhenNotFound__
+						</label>
+					</div>
+	
+					<div class="small-description">__MSG_whatRefetchWhenNotFound__</div>
+				</div>
+
 				<div data-type="toggle" data-sync="showCategoryWithoutPermission">
 					<div class="switch-container">
 						<label class="switch">
@@ -195,48 +209,30 @@
 					<div class="small-description">__MSG_skipNoticeDurationDescription__</div>
 				</div>
 	
-				<div>
-					<div data-type="toggle" data-sync="showUpcomingNotice">
-						<div class="switch-container">
-							<label class="switch">
-								<input id="showUpcomingNotice" type="checkbox" checked>
-								<span class="slider round"></span>
-							</label>
-							<label class="switch-label" for="showUpcomingNotice">
-								__MSG_showUpcomingNotice__
-							</label>
-						</div>
-					</div>
-
-					<br/>
-
-					<div data-type="toggle" data-toggle-type="reverse" data-sync="dontShowNotice">
-						<div class="switch-container">
-							<label class="switch">
-								<input id="dontShowNotice" type="checkbox" checked>
-								<span class="slider round"></span>
-							</label>
-							<label class="switch-label" for="dontShowNotice">
-								__MSG_showSkipNotice__
-							</label>
-						</div>
-					</div>
-
-					<div data-type="selector" data-sync="noticeVisibilityMode" data-dependent-on="dontShowNotice">
-						<br/>
-						
-						<label class="optionLabel" for="noticeVisibilityMode">__MSG_noticeVisibilityLabel__:</label>
-	
-						<select id="noticeVisibilityMode" class="selector-element optionsSelector" >
-							<option value="0">__MSG_noticeVisibilityMode0__</option>
-							<option value="1">__MSG_noticeVisibilityMode1__</option>
-							<option value="2">__MSG_noticeVisibilityMode2__</option>
-							<option value="3">__MSG_noticeVisibilityMode3__</option>
-							<option value="4">__MSG_noticeVisibilityMode4__</option>
-						</select>
+				<div data-type="toggle" data-toggle-type="reverse" data-sync="dontShowNotice">
+					<div class="switch-container">
+						<label class="switch">
+							<input id="dontShowNotice" type="checkbox" checked>
+							<span class="slider round"></span>
+						</label>
+						<label class="switch-label" for="dontShowNotice">
+							__MSG_showSkipNotice__
+						</label>
 					</div>
 				</div>
 	
+				<div data-type="selector" data-sync="noticeVisibilityMode">
+					<label class="optionLabel" for="noticeVisibilityMode">__MSG_noticeVisibilityLabel__:</label>
+
+					<select id="noticeVisibilityMode" class="selector-element optionsSelector" >
+						<option value="0">__MSG_noticeVisibilityMode0__</option>
+						<option value="1">__MSG_noticeVisibilityMode1__</option>
+						<option value="2">__MSG_noticeVisibilityMode2__</option>
+						<option value="3">__MSG_noticeVisibilityMode3__</option>
+						<option value="4">__MSG_noticeVisibilityMode4__</option>
+					</select>
+				</div>
+
 				<div data-type="toggle" data-sync="showCategoryGuidelines">
 					<div class="switch-container">
 						<label class="switch">
@@ -638,19 +634,7 @@
 	
 					<div class="small-description">__MSG_whatTrackDownvotes__</div>
 				</div>
-
-				<div data-type="toggle" data-sync="trackDownvotesInPrivate" data-confirm-on="false">
-					<div class="switch-container">
-						<label class="switch">
-							<input id="trackDownvotesInPrivate" type="checkbox" checked>
-							<span class="slider round"></span>
-						</label>
-						<label class="switch-label" for="trackDownvotesInPrivate">
-							__MSG_enableTrackDownvotesInPrivate__
-						</label>
-					</div>
-				</div>
-
+	
 				<div data-type="button-press" data-sync="copyDebugInformation" data-confirm-message="copyDebugInformation">
 					<div class="option-button trigger-button">
 						__MSG_copyDebugInformation__

public/popup.html

@@ -196,8 +196,6 @@
         <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>

src/background.ts

@@ -7,9 +7,13 @@ import { sendRealRequestToCustomServer, setupBackgroundRequestProxy } from "../m
 import { setupTabUpdates } from "../maze-utils/src/tab-updates";
 import { generateUserID } from "../maze-utils/src/setup";
 
+// Make the config public for debugging purposes
+
+window.SB = Config;
+
 import Utils from "./utils";
 import { getExtensionIdsToImportFrom } from "./utils/crossExtension";
-import { isFirefoxOrSafari, waitFor } from "../maze-utils/src";
+import { isFirefoxOrSafari } from "../maze-utils/src";
 import { injectUpdatedScripts } from "../maze-utils/src/cleanup";
 import { logWarn } from "./utils/logger";
 import { chromeP } from "../maze-utils/src/browserApi";
@@ -43,7 +47,7 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
             chrome.tabs.create({url: chrome.runtime.getURL(request.url)});
             return false;
         case "submitVote":
-            submitVote(request.type, request.UUID, request.category, request.videoID).then(callback);
+            submitVote(request.type, request.UUID, request.category).then(callback);
 
             //this allows the callback to be called later
             return true;
@@ -119,7 +123,7 @@ chrome.runtime.onInstalled.addListener(function () {
         // If there is no userID, then it is the first install.
         if (!userID && !Config.local.alreadyInstalled){
             //open up the install page
-            chrome.tabs.create({url: chrome.runtime.getURL("/help/index.html")});
+            chrome.tabs.create({url: chrome.extension.getURL("/help/index.html")});
 
             //generate a userID
             const newUserID = generateUserID();
@@ -133,21 +137,14 @@ chrome.runtime.onInstalled.addListener(function () {
 
         if (Config.config.supportInvidious) {
             if (!(await utils.containsInvidiousPermission())) {
-                chrome.tabs.create({url: chrome.runtime.getURL("/permissions/index.html")});
+                chrome.tabs.create({url: chrome.extension.getURL("/permissions/index.html")});
             }
         }
     }, 1500);
 
-    if (!isFirefoxOrSafari()) {
+    // Only do this once the old version understands how to clean itself up
+    if (!isFirefoxOrSafari() && chrome.runtime.getManifest().version !== "5.4.13") {
         injectUpdatedScripts().catch(logWarn);
-
-        waitFor(() => Config.isReady()).then(() => {
-            if (Config.config.supportInvidious) {
-                injectUpdatedScripts([
-                    utils.getExtraSiteRegistration()
-                ])
-            }
-        }).catch(logWarn);
     }
 });
 
@@ -163,8 +160,8 @@ async function registerFirefoxContentScript(options: Registration) {
             ids: [options.id]
         }).catch(() => []);
 
-        if (existingRegistrations && existingRegistrations.length > 0 
-            && options.matches.every((match) => existingRegistrations[0].matches.includes(match))) {
+        if (existingRegistrations.length > 0 
+            && existingRegistrations[0].matches.every((match) => options.matches.includes(match))) {
             // No need to register another script, already registered
             return;
         }
@@ -214,7 +211,7 @@ async function  unregisterFirefoxContentScript(id: string) {
     }
 }
 
-async function submitVote(type: number, UUID: string, category: string, videoID: string) {
+async function submitVote(type: number, UUID: string, category: string) {
     let userID = Config.config.userID;
 
     if (userID == undefined || userID === "undefined") {
@@ -225,35 +222,27 @@ async function submitVote(type: number, UUID: string, category: string, videoID:
 
     const typeSection = (type !== undefined) ? "&type=" + type : "&category=" + category;
 
-    try {
-        const response = await asyncRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&videoID=" + videoID + "&userID=" + userID + typeSection);
-    
-        if (response.ok) {
-            return {
-                successType: 1,
-                responseText: await response.text()
-            };
-        } else if (response.status == 405) {
-            //duplicate vote
-            return {
-                successType: 0,
-                statusCode: response.status,
-                responseText: await response.text()
-            };
-        } else {
-            //error while connect
-            return {
-                successType: -1,
-                statusCode: response.status,
-                responseText: await response.text()
-            };
-        }
-    } catch (e) {
-        console.error(e);
+    //publish this vote
+    const response = await asyncRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + typeSection);
+
+    if (response.ok) {
+        return {
+            successType: 1,
+            responseText: await response.text()
+        };
+    } else if (response.status == 405) {
+        //duplicate vote
+        return {
+            successType: 0,
+            statusCode: response.status,
+            responseText: await response.text()
+        };
+    } else {
+        //error while connect
         return {
             successType: -1,
-            statusCode: -1,
-            responseText: ""
+            statusCode: response.status,
+            responseText: await response.text()
         };
     }
 }

src/components/CategoryPillComponent.tsx

@@ -6,7 +6,7 @@ import ThumbsUpSvg from "../svg-icons/thumbs_up_svg";
 import ThumbsDownSvg from "../svg-icons/thumbs_down_svg";
 import { downvoteButtonColor, SkipNoticeAction } from "../utils/noticeUtils";
 import { VoteResponse } from "../messageTypes";
-import { AnimationUtils } from "../../maze-utils/src/animationUtils";
+import { AnimationUtils } from "../utils/animationUtils";
 import { Tooltip } from "../render/Tooltip";
 import { getErrorMessage } from "../../maze-utils/src/formating";
 
@@ -23,14 +23,12 @@ export interface CategoryPillState {
 }
 
 class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryPillState> {
-    mainRef: React.MutableRefObject<HTMLSpanElement>;
+
     tooltip?: Tooltip;
 
     constructor(props: CategoryPillProps) {
         super(props);
 
-        this.mainRef = React.createRef();
-
         this.state = {
             segment: null,
             show: false,
@@ -45,21 +43,17 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
             color: this.getTextColor(),
         }
 
-        // To be able to remove the margin from the parent
-        this.mainRef?.current?.parentElement?.classList?.toggle("cbPillOpen", this.state.show);
-
         return (
             <span style={style}
                 className={"sponsorBlockCategoryPill" + (!this.props.showTextByDefault ? " sbPillNoText" : "")}
                 aria-label={this.getTitleText()}
                 onClick={(e) => this.toggleOpen(e)}
                 onMouseEnter={() => this.openTooltip()}
-                onMouseLeave={() => this.closeTooltip()}
-                ref={this.mainRef}>
+                onMouseLeave={() => this.closeTooltip()}>
                 
                 <span className="sponsorBlockCategoryPillTitleSection">
                     <img className="sponsorSkipLogo sponsorSkipObject"
-                        src={chrome.runtime.getURL("icons/IconSponsorBlocker256px.png")}>
+                        src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}>
                     </img>
 
                     {
@@ -92,7 +86,7 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
                 )}
 
                 {/* Close Button */}
-                <img src={chrome.runtime.getURL("icons/close.png")}
+                <img src={chrome.extension.getURL("icons/close.png")}
                     className="categoryPillClose"
                     onClick={() => {
                         this.setState({ show: false });

src/components/ChapterVoteComponent.tsx

@@ -6,7 +6,7 @@ import ThumbsUpSvg from "../svg-icons/thumbs_up_svg";
 import ThumbsDownSvg from "../svg-icons/thumbs_down_svg";
 import { downvoteButtonColor, SkipNoticeAction } from "../utils/noticeUtils";
 import { VoteResponse } from "../messageTypes";
-import { AnimationUtils } from "../../maze-utils/src/animationUtils";
+import { AnimationUtils } from "../utils/animationUtils";
 import { Tooltip } from "../render/Tooltip";
 import { getErrorMessage } from "../../maze-utils/src/formating";
 

src/components/NoticeComponent.tsx

@@ -19,7 +19,6 @@ export interface NoticeProps {
     idSuffix?: string;
 
     fadeIn?: boolean;
-    fadeOut?: boolean;
     startFaded?: boolean;
     firstColumn?: React.ReactElement[] | React.ReactElement;
     firstRow?: React.ReactElement;
@@ -208,7 +207,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
                                     
 
                                         {/* Close button */}
-                                        <img src={chrome.runtime.getURL("icons/close.png")}
+                                        <img src={chrome.extension.getURL("icons/close.png")}
                                             className={"sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeCloseButton sponsorSkipNoticeRightButton" 
                                                             + (this.props.biggerCloseButton ? " biggerCloseButton" : "")}
                                             onClick={() => this.close()}>
@@ -245,7 +244,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
                         id={"skipNoticeTimerText" + this.idSuffix}
                         key="skipNoticeTimerText"
                         className={this.state.countdownMode !== CountdownMode.Timer ? "sbhidden" : ""} >
-                            {chrome.i18n.getMessage("NoticeTimeAfterSkip").replace("{seconds}", Math.ceil(this.state.countdownTime).toString())}
+                            {chrome.i18n.getMessage("NoticeTimeAfterSkip").replace("{seconds}", this.state.countdownTime.toString())}
                     </span>
                 ),(
                     <img 
@@ -327,7 +326,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
             return;
         }
 
-        if (countdownTime == 3 && this.props.fadeOut) {
+        if (countdownTime == 3) {
             //start fade out animation
             const notice = document.getElementById("sponsorSkipNotice" + this.idSuffix);
             notice?.style.removeProperty("animation");

src/components/SkipNoticeComponent.tsx

@@ -6,7 +6,7 @@ import NoticeComponent from "./NoticeComponent";
 import NoticeTextSelectionComponent from "./NoticeTextSectionComponent";
 import Utils from "../utils";
 const utils = new Utils();
-import { getSkippingText, getUpcomingText } from "../utils/categoryUtils";
+import { getSkippingText } from "../utils/categoryUtils";
 
 import ThumbsUpSvg from "../svg-icons/thumbs_up_svg";
 import ThumbsDownSvg from "../svg-icons/thumbs_down_svg";
@@ -15,7 +15,6 @@ 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
@@ -28,17 +27,12 @@ export interface SkipNoticeProps {
 
     autoSkip: boolean;
     startReskip?: boolean;
-    upcomingNotice?: boolean;
     // Contains functions and variables from the content script needed by the skip notice
     contentContainer: ContentContainer;
 
     closeListener: () => void;
     showKeybindHint?: boolean;
     smaller: boolean;
-    fadeIn: boolean;
-    maxCountdownTime?: number;
-
-    componentDidMount?: () => void;
 
     unskipTime?: number;
 }
@@ -102,9 +96,9 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         this.autoSkip = props.autoSkip;
         this.contentContainer = props.contentContainer;
 
-        const noticeTitle = !this.props.upcomingNotice ? getSkippingText(this.segments, this.props.autoSkip) : getUpcomingText(this.segments);
+        const noticeTitle = getSkippingText(this.segments, this.props.autoSkip);
 
-        const previousSkipNotices = document.querySelectorAll(".sponsorSkipNoticeParent:not(.sponsorSkipUpcomingNotice)");
+        const previousSkipNotices = document.getElementsByClassName("sponsorSkipNoticeParent");
         this.amountOfPreviousNotices = previousSkipNotices.length;
         // If there is at least one already in the first slot
         this.showInSecondSlot = previousSkipNotices.length > 0 && [...previousSkipNotices].some(notice => !notice.classList.contains("secondSkipNotice"));
@@ -125,7 +119,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         this.lockedColor = Config.config.colorPalette.locked;
 
         const isMuteSegment = this.segments[0].actionType === ActionType.Mute;
-        const maxCountdownTime = props.maxCountdownTime ? () => props.maxCountdownTime : (isMuteSegment ? this.getFullDurationCountdown(0) : () => Config.config.skipNoticeDuration);
+        const maxCountdownTime = isMuteSegment ? this.getFullDurationCountdown(0) : () => Config.config.skipNoticeDuration;
 
         const defaultSkipButtonState = this.props.startReskip ? SkipButtonState.Redo : SkipButtonState.Undo;
         const skipButtonStates = [defaultSkipButtonState, isMuteSegment ? SkipButtonState.Start : defaultSkipButtonState];
@@ -176,7 +170,12 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
             noticeStyle.transform = "scale(0.8) translate(10%, 10%)";
         }
 
-        const firstColumn = this.getSkipButton(0);
+        // 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 ? (
+            this.getSkipButton(0)
+        ) : null;
 
         return (
             <NoticeComponent 
@@ -184,8 +183,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                 amountOfPreviousNotices={this.amountOfPreviousNotices}
                 showInSecondSlot={this.showInSecondSlot}
                 idSuffix={this.idSuffix}
-                fadeIn={this.props.fadeIn}
-                fadeOut={!this.props.upcomingNotice}
+                fadeIn={true}
                 startFaded={Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAll
                     || (Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAutoSkip && this.autoSkip)}
                 timed={true}
@@ -198,20 +196,12 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                 logoFill={Config.config.barTypes[this.segments[0].category].color}
                 limitWidth={true}
                 firstColumn={firstColumn}
-                dontPauseCountdown={!!this.props.upcomingNotice}
                 bottomRow={[...this.getMessageBoxes(), ...this.getBottomRow() ]}
-                extraClass={this.props.upcomingNotice ? "sponsorSkipUpcomingNotice" : ""}
                 onMouseEnter={() => this.onMouseEnter() } >
             </NoticeComponent>
         );
     }
 
-    componentDidMount(): void {
-        if (this.props.componentDidMount) {
-            this.props.componentDidMount();
-        }
-    }
-
     getBottomRow(): JSX.Element[] {
         return [
             /* Bottom Row */
@@ -374,10 +364,8 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                 style.minWidth = "100px";
             }
 
-            const showSkipButton = (buttonIndex !== 0 || this.props.smaller || this.segments[0].actionType === ActionType.Mute) && !this.props.upcomingNotice;
-
             return (
-                <span className="sponsorSkipNoticeUnskipSection" style={{ visibility: !showSkipButton ? "hidden" : null }}>
+                <span className="sponsorSkipNoticeUnskipSection">
                     <button id={"sponsorSkipUnskipButton" + this.idSuffix}
                             className="sponsorSkipObject sponsorSkipNoticeButton"
                             style={style}
@@ -431,7 +419,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
     }
 
     onMouseEnter(): void {
-        if (this.state.smaller && !this.props.upcomingNotice) {
+        if (this.state.smaller) {
             this.setState({
                 smaller: false
             });
@@ -669,7 +657,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         const skipButtonStates = this.state.skipButtonStates;
         const skipButtonCallbacks = this.state.skipButtonCallbacks;
         if (buttonIndex === null) {
-            for (let i = 0; i < skipButtonStates.length; i++) {
+            for (let i = 0; i < this.segments.length; i++) {
                 skipButtonStates[i] = skipButtonState;
                 skipButtonCallbacks[i] = this.reskip.bind(this);
             }
@@ -697,7 +685,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] - getCurrentTime()) * (1 / getVideo().playbackRate));
+            const duration = Math.round((sponsorTime.segment[1] - this.contentContainer().v.currentTime) * (1 / this.contentContainer().v.playbackRate));
 
             return Math.max(duration, Config.config.skipNoticeDuration);
         };

src/components/SponsorTimeEditComponent.tsx

@@ -9,7 +9,6 @@ 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;
@@ -35,7 +34,7 @@ export interface SponsorTimeEditState {
     chapterNameSelectorHovering: boolean;
 }
 
-const categoryNamesGrams: string[] = [].concat(...CompileConfig.categoryList.filter((name) => !["chapter", "intro"].includes(name))
+const categoryNamesGrams: string[] = [].concat(...CompileConfig.categoryList.filter((name) => name !== "chapter")
     .map((name) => chrome.i18n.getMessage("category_" + name).split(/\/|\s|-/)));
 
 class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, SponsorTimeEditState> {
@@ -82,15 +81,13 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
     componentDidMount(): void {
         // Prevent inputs from triggering key events
-        document.getElementById("sponsorTimeEditContainer" + this.idSuffix).addEventListener('keydown', (e) => {
-            e.stopPropagation();
+        document.getElementById("sponsorTimeEditContainer" + this.idSuffix).addEventListener('keydown', function (event) {
+            event.stopPropagation();
         });
 
         // Prevent scrolling while changing times
-        document.getElementById("sponsorTimesContainer" + this.idSuffix).addEventListener('wheel', (e) => {
-            if (this.state.editing) {
-                e.preventDefault();
-            }
+        document.getElementById("sponsorTimesContainer" + this.idSuffix).addEventListener('wheel', function (event) {
+            event.preventDefault();
         }, {passive: false});
 
         // Add as a config listener
@@ -224,7 +221,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                         target="_blank" rel="noreferrer">
                         <img id={"sponsorTimeCategoriesHelpButton" + this.idSuffix}
                             className="helpButton"
-                            src={chrome.runtime.getURL("icons/help.svg")}
+                            src={chrome.extension.getURL("icons/help.svg")}
                             title={chrome.i18n.getMessage("categoryGuidelines")} />
                     </a>
                 </div>
@@ -273,49 +270,48 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                     </div>
                 ): ""}
 
+                <br/>
+
                 {/* Editing Tools */}
 
-                <div style={{ marginTop: "3px" }}>
-                    <span id={"sponsorTimeDeleteButton" + this.idSuffix}
+                <span id={"sponsorTimeDeleteButton" + this.idSuffix}
+                    className="sponsorTimeEditButton"
+                    onClick={this.deleteTime.bind(this)}>
+                    {chrome.i18n.getMessage("delete")}
+                </span>
+
+                {(!isNaN(segment[1]) && ![ActionType.Poi, ActionType.Full].includes(this.state.selectedActionType)) 
+                    && this.state.selectedActionType !== ActionType.Chapter ? (
+                    <span id={"sponsorTimePreviewButton" + this.idSuffix}
                         className="sponsorTimeEditButton"
-                        onClick={this.deleteTime.bind(this)}>
-                        {chrome.i18n.getMessage("delete")}
+                        onClick={(e) => this.previewTime(e.ctrlKey, e.shiftKey)}>
+                        {chrome.i18n.getMessage("preview")}
                     </span>
+                ): ""}
 
-                    {(!isNaN(segment[1]) && ![ActionType.Poi, ActionType.Full].includes(this.state.selectedActionType)) 
-                        && this.state.selectedActionType !== ActionType.Chapter ? (
-                        <span id={"sponsorTimePreviewButton" + this.idSuffix}
-                            className="sponsorTimeEditButton"
-                            onClick={(e) => this.previewTime(e.ctrlKey, e.shiftKey)}>
-                            {chrome.i18n.getMessage("preview")}
-                        </span>
-                    ): ""}
+                {(!isNaN(segment[1]) && this.state.selectedActionType != ActionType.Full) ? (
+                    <span id={"sponsorTimeInspectButton" + this.idSuffix}
+                        className="sponsorTimeEditButton"
+                        onClick={this.inspectTime.bind(this)}>
+                        {chrome.i18n.getMessage("inspect")}
+                    </span>
+                ): ""}
 
-                    {(!isNaN(segment[1]) && this.state.selectedActionType != ActionType.Full) ? (
-                        <span id={"sponsorTimeInspectButton" + this.idSuffix}
-                            className="sponsorTimeEditButton"
-                            onClick={this.inspectTime.bind(this)}>
-                            {chrome.i18n.getMessage("inspect")}
-                        </span>
-                    ): ""}
-
-                    {(!isNaN(segment[1]) && ![ActionType.Poi, ActionType.Full].includes(this.state.selectedActionType)) ? (
-                        <span id={"sponsorTimePreviewEndButton" + this.idSuffix}
-                            className="sponsorTimeEditButton"
-                            onClick={(e) => this.previewTime(e.ctrlKey, e.shiftKey, true)}>
-                            {chrome.i18n.getMessage("End")}
-                        </span>
-                    ): ""}
-
-                    {(!isNaN(segment[1]) && this.state.selectedActionType != ActionType.Full) ? (
-                        <span id={"sponsorTimeEditButton" + this.idSuffix}
-                            className="sponsorTimeEditButton"
-                            onClick={this.toggleEditTime.bind(this)}>
-                            {this.state.editing ? chrome.i18n.getMessage("save") : chrome.i18n.getMessage("edit")}
-                        </span>
-                    ): ""}
-                </div>
+                {(!isNaN(segment[1]) && ![ActionType.Poi, ActionType.Full].includes(this.state.selectedActionType)) ? (
+                    <span id={"sponsorTimePreviewEndButton" + this.idSuffix}
+                        className="sponsorTimeEditButton"
+                        onClick={(e) => this.previewTime(e.ctrlKey, e.shiftKey, true)}>
+                        {chrome.i18n.getMessage("End")}
+                    </span>
+                ): ""}
 
+                {(!isNaN(segment[1]) && this.state.selectedActionType != ActionType.Full) ? (
+                    <span id={"sponsorTimeEditButton" + this.idSuffix}
+                        className="sponsorTimeEditButton"
+                        onClick={this.toggleEditTime.bind(this)}>
+                        {this.state.editing ? chrome.i18n.getMessage("save") : chrome.i18n.getMessage("edit")}
+                    </span>
+                ): ""}
             </div>
         );
     }
@@ -402,7 +398,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 / getVideoDuration();
+        const videoPercentage = segmentDuration / this.props.contentContainer().v.duration;
 
         if (videoPercentage > 0.6 && !this.fullVideoWarningShown 
                 && (sponsorTime.category === "sponsor" || sponsorTime.category === "selfpromo" || sponsorTime.category === "chooseACategory")) {
@@ -554,7 +550,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
     }
 
     setTimeToEnd(): void {
-        this.setTimeTo(1, getVideoDuration());
+        this.setTimeTo(1, this.props.contentContainer().v.duration);
     }
 
     /**
@@ -641,7 +637,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] = getVideoDuration();
+            sponsorTimesSubmitting[this.props.index].segment[1] = this.props.contentContainer().v.duration;
             this.props.contentContainer().updateEditButtonsOnPlayer();
         }
 
@@ -684,7 +680,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 * getVideo().playbackRate));
+        const skipTime = (startTime === 0 || skipToEndTime) ? endTime : (startTime - (seekTime * this.props.contentContainer().v.playbackRate));
 
         this.props.contentContainer().previewTime(skipTime, !skipToEndTime);
     }

src/components/SubmissionNoticeComponent.tsx

@@ -9,13 +9,12 @@ 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
     contentContainer: ContentContainer;
 
-    callback: () => Promise<boolean>;
+    callback: () => unknown;
 
     closeListener: () => void;
 }
@@ -67,16 +66,9 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
             this.forceUpdate();
         });
 
-        this.videoObserver.observe(getVideo(), {
+        this.videoObserver.observe(this.contentContainer().v, {
             attributes: true
         });
-
-        // Prevent zooming while changing times
-        document.getElementById("sponsorSkipNoticeMiddleRow" + this.state.idSuffix).addEventListener('wheel', function (event) {
-            if (event.ctrlKey) {
-                event.preventDefault();
-            }
-        }, {passive: false});
     }
 
     componentWillUnmount(): void {
@@ -108,7 +100,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                 onClick={() => this.sortSegments()}
                 title={chrome.i18n.getMessage("sortSegments")}
                 key="sortButton"
-                src={chrome.runtime.getURL("icons/sort.svg")}>
+                src={chrome.extension.getURL("icons/sort.svg")}>
             </img>;
         const exportButton = 
             <img id={"sponsorSkipExportButton" + this.state.idSuffix} 
@@ -116,7 +108,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                 onClick={() => this.exportSegments()}
                 title={chrome.i18n.getMessage("exportSegments")}
                 key="exportButton"
-                src={chrome.runtime.getURL("icons/export.svg")}>
+                src={chrome.extension.getURL("icons/export.svg")}>
             </img>;
         return (
             <NoticeComponent noticeTitle={this.state.noticeTitle}
@@ -132,7 +124,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                 {/* Sponsor Time List */}
                 <tr id={"sponsorSkipNoticeMiddleRow" + this.state.idSuffix}
                     className="sponsorTimeMessagesRow"
-                    style={{maxHeight: (getVideo()?.offsetHeight - 200) + "px"}}
+                    style={{maxHeight: (this.contentContainer().v.offsetHeight - 200) + "px"}}
                     onMouseDown={(e) => e.stopPropagation()}>
                     <td style={{width: "100%"}}>
                         {this.getSponsorTimeMessages()}
@@ -216,11 +208,6 @@ 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();
@@ -245,11 +232,9 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
             }
         }
 
-        this.props.callback().then((success) => {
-            if (success) {
-                this.cancel();
-            }
-        });
+        this.props.callback();
+
+        this.cancel();
     }
 
     sortSegments(): void {
@@ -289,7 +274,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
-                && getVideo().offsetWidth > dialogWidth * 2) {
+                && this.contentContainer().v.offsetWidth > dialogWidth * 2) {
             const options = {
                 title:  chrome.i18n.getMessage(`category_${category}`),
                 textBoxes: getGuidelineInfo(category),

src/components/options/CategorySkipOptionsComponent.tsx

@@ -158,7 +158,7 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
             });
         }
 
-        Config.forceSyncUpdate("categorySelections");
+        Config.forceLocalUpdate("categorySelections");
     }
 
     getCategorySkipOptions(): JSX.Element[] {
@@ -234,10 +234,6 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                     configKey: "showSegmentNameInChapterBar",
                     label: chrome.i18n.getMessage("showSegmentNameInChapterBar"),
                     dontDisable: true
-                }, {
-                    configKey: "showAutogeneratedChapters",
-                    label: chrome.i18n.getMessage("showAutogeneratedChapters"),
-                    dontDisable: true
                 }];
             case "music_offtopic":
                 return [{

src/config.ts

@@ -29,9 +29,7 @@ interface SBConfig {
     trackViewCount: boolean;
     trackViewCountInPrivate: boolean;
     trackDownvotes: boolean;
-    trackDownvotesInPrivate: boolean;
     dontShowNotice: boolean;
-    showUpcomingNotice: boolean;
     noticeVisibilityMode: NoticeVisbilityMode;
     hideVideoPlayerControls: boolean;
     hideInfoButtonPlayerControls: boolean;
@@ -48,6 +46,7 @@ interface SBConfig {
     audioNotificationOnSkip: boolean;
     checkForUnlistedVideos: boolean;
     testingServer: boolean;
+    refetchWhenNotFound: boolean;
     ytInfoPermissionGranted: boolean;
     allowExpirements: boolean;
     showDonationLink: boolean;
@@ -69,7 +68,6 @@ interface SBConfig {
     showCategoryGuidelines: boolean;
     showCategoryWithoutPermission: boolean;
     showSegmentNameInChapterBar: boolean;
-    showAutogeneratedChapters: boolean;
     useVirtualTime: boolean;
     showSegmentFailedToFetchWarning: boolean;
     allowScrollingToEdit: boolean;
@@ -141,7 +139,7 @@ interface SBStorage {
     downvotedSegments: Record<VideoID & HashedValue, VideoDownvotes>;
     navigationApiAvailable: boolean;
     
-    // Used when sync storage disabled
+    // Used when sync storage disbaled
     alreadyInstalled: boolean;
 
     /* Contains unsubmitted segments that the user has created. */
@@ -292,9 +290,7 @@ const syncDefaults = {
     trackViewCount: true,
     trackViewCountInPrivate: true,
     trackDownvotes: true,
-    trackDownvotesInPrivate: false,
     dontShowNotice: false,
-    showUpcomingNotice: false,
     noticeVisibilityMode: NoticeVisbilityMode.FadedForAutoSkip,
     hideVideoPlayerControls: false,
     hideInfoButtonPlayerControls: false,
@@ -311,6 +307,7 @@ const syncDefaults = {
     audioNotificationOnSkip: false,
     checkForUnlistedVideos: false,
     testingServer: false,
+    refetchWhenNotFound: true,
     ytInfoPermissionGranted: false,
     allowExpirements: true,
     showDonationLink: true,
@@ -327,7 +324,6 @@ const syncDefaults = {
     showCategoryGuidelines: true,
     showCategoryWithoutPermission: false,
     showSegmentNameInChapterBar: true,
-    showAutogeneratedChapters: true,
     useVirtualTime: true,
     showSegmentFailedToFetchWarning: true,
     allowScrollingToEdit: true,
@@ -479,26 +475,4 @@ const localDefaults = {
 };
 
 const Config = new ConfigClass(syncDefaults, localDefaults, migrateOldSyncFormats);
-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);
-}
+export default Config;

src/globals.d.ts

@@ -1,4 +1,19 @@
 import { SBObject } from "./config";
 declare global {
     interface Window { SB: SBObject }
+    // Remove this once the API becomes stable and types are shipped in @types/chrome
+    namespace chrome {
+        namespace declarativeContent {
+            export interface RequestContentScriptOptions {
+                allFrames?: boolean;
+                css?: string[];
+                instanceType?: "declarativeContent.RequestContentScript";
+                js?: string[];
+                matchAboutBlanck?: boolean;
+            }
+            export class RequestContentScript {
+                constructor(options: RequestContentScriptOptions);
+            }
+        }
+    }
 }

src/js-components/previewBar.ts

@@ -11,10 +11,9 @@ import { ActionType, Category, SegmentContainer, SponsorHideType, SponsorSourceT
 import { partition } from "../utils/arrayUtils";
 import { DEFAULT_CATEGORY, shortCategoryName } from "../utils/categoryUtils";
 import { normalizeChapterName } from "../utils/exporter";
+import { getFormattedTimeToSeconds } from "../../maze-utils/src/formating";
 import { findValidElement } from "../../maze-utils/src/dom";
 import { addCleanupListener } from "../../maze-utils/src/cleanup";
-import { hasAutogeneratedChapters, isVisible } from "../utils/pageUtils";
-import { isVorapisInstalled } from "../utils/compatibility";
 
 const TOOLTIP_VISIBLE_CLASS = 'sponsorCategoryTooltipVisible';
 const MIN_CHAPTER_SIZE = 0.003;
@@ -52,7 +51,6 @@ class PreviewBar {
     progressBar: HTMLElement;
 
     segments: PreviewBarSegment[] = [];
-    hasYouTubeChapters = false;
     existingChapters: PreviewBarSegment[] = [];
     videoDuration = 0;
     updateExistingChapters: () => void;
@@ -102,15 +100,13 @@ class PreviewBar {
         this.chapterTooltip.className = "ytp-tooltip-title sponsorCategoryTooltip";
 
         // global chaper tooltip or duration tooltip
-        // YT, Vorapis, unknown
-        const tooltipTextWrapper = document.querySelector(".ytp-tooltip-text-wrapper, .ytp-progress-tooltip-text-container") ?? document.querySelector("#progress-bar-container.ytk-player > #hover-time-info");
-        const originalTooltip = tooltipTextWrapper.querySelector(".ytp-tooltip-title:not(.sponsorCategoryTooltip), .ytp-progress-tooltip-text:not(.sponsorCategoryTooltip)") as HTMLElement;
+        const tooltipTextWrapper = document.querySelector(".ytp-tooltip-text-wrapper") ?? document.querySelector("#progress-bar-container.ytk-player > #hover-time-info");
+        const originalTooltip = tooltipTextWrapper.querySelector(".ytp-tooltip-title:not(.sponsorCategoryTooltip)") as HTMLElement;
         if (!tooltipTextWrapper || !tooltipTextWrapper.parentElement) return;
 
         // Grab the tooltip from the text wrapper as the tooltip doesn't have its classes on init
         this.categoryTooltipContainer = tooltipTextWrapper.parentElement;
-        // YT, Vorapis
-        const titleTooltip = tooltipTextWrapper.querySelector(".ytp-tooltip-title, .ytp-progress-tooltip-text") as HTMLElement;
+        const titleTooltip = tooltipTextWrapper.querySelector(".ytp-tooltip-title") as HTMLElement;
         if (!this.categoryTooltipContainer || !titleTooltip) return;
 
         tooltipTextWrapper.insertBefore(this.categoryTooltip, titleTooltip.nextSibling);
@@ -129,15 +125,38 @@ class PreviewBar {
             mouseOnSeekBar = false;
         });
 
-        seekBar.addEventListener("mousemove", (e: MouseEvent) => {
-            if (!mouseOnSeekBar || !this.categoryTooltip || !this.categoryTooltipContainer || !chrome.runtime?.id) return;
+        const observer = new MutationObserver((mutations) => {
+            if (!mouseOnSeekBar || !this.categoryTooltip || !this.categoryTooltipContainer) return;
 
-            let noYoutubeChapters = !!tooltipTextWrapper.querySelector(".ytp-tooltip-text.ytp-tooltip-text-no-title, .ytp-progress-tooltip-timestamp");
-            const timeInSeconds = this.decimalToTime((e.clientX - seekBar.getBoundingClientRect().x) / seekBar.clientWidth);
+            // Only care about mutations to time tooltip
+            if (!mutations.some((mutation) => (mutation.target as HTMLElement).classList.contains("ytp-tooltip-text"))) {
+                return;
+            }
+
+            const tooltipTextElements = tooltipTextWrapper.querySelectorAll(".ytp-tooltip-text");
+            let timeInSeconds: number | null = null;
+            let noYoutubeChapters = false;
+
+            for (const tooltipTextElement of tooltipTextElements) {
+                if (tooltipTextElement.classList.contains('ytp-tooltip-text-no-title')) noYoutubeChapters = true;
+
+                const tooltipText = tooltipTextElement.textContent;
+                if (tooltipText === null || tooltipText.length === 0) continue;
+
+                timeInSeconds = getFormattedTimeToSeconds(tooltipText);
+
+                if (timeInSeconds !== null) break;
+            }
+
+            if (timeInSeconds === null) {
+                originalTooltip.style.removeProperty("display");
+
+                return;
+            }
 
             // Find the segment at that location, using the shortest if multiple found
             const [normalSegments, chapterSegments] =
-                partition(this.segments,
+                partition(this.segments.filter((s) => s.source !== SponsorSourceType.YouTube),
                     (segment) => segment.actionType !== ActionType.Chapter);
             let mainSegment = this.getSmallestSegment(timeInSeconds, normalSegments, "normal");
             let secondarySegment = this.getSmallestSegment(timeInSeconds, chapterSegments, "chapter");
@@ -146,28 +165,13 @@ class PreviewBar {
                 secondarySegment = this.getSmallestSegment(timeInSeconds, chapterSegments.filter((s) => s !== secondarySegment));
             }
 
-            const hasAYouTubeChapterRemoved = this.hasYouTubeChapters
-                || (!Config.config.showAutogeneratedChapters && hasAutogeneratedChapters());
-            if (hasAYouTubeChapterRemoved) {
-                // Hide original tooltip if some chapter has been filtered out
-                originalTooltip.style.display = "none";
-                noYoutubeChapters = true;
-
-                originalTooltip.classList.add("sponsorTooltipHasYTChapters");
-            } else {
-                originalTooltip.classList.remove("sponsorTooltipHasYTChapters");
-            }
-
             if (mainSegment === null && secondarySegment === null) {
-                if (!hasAYouTubeChapterRemoved) {
-                    this.categoryTooltipContainer.classList.remove(TOOLTIP_VISIBLE_CLASS);
-                    originalTooltip.style.removeProperty("display");
-                }
+                this.categoryTooltipContainer.classList.remove(TOOLTIP_VISIBLE_CLASS);
+                originalTooltip.style.removeProperty("display");
             } else {
                 this.categoryTooltipContainer.classList.add(TOOLTIP_VISIBLE_CLASS);
                 if (mainSegment !== null && secondarySegment !== null) {
                     this.categoryTooltipContainer.classList.add("sponsorTwoTooltips");
-                    originalTooltip.classList.remove("sponsorTooltipHasYTChapters");
                 } else {
                     this.categoryTooltipContainer.classList.remove("sponsorTwoTooltips");
                 }
@@ -175,11 +179,6 @@ class PreviewBar {
                 this.setTooltipTitle(mainSegment, this.categoryTooltip);
                 this.setTooltipTitle(secondarySegment, this.chapterTooltip);
 
-                if (isVorapisInstalled()) {
-                    const tooltipParent = tooltipTextWrapper.parentElement!;
-                    tooltipParent.classList.add("with-text");
-                }
-
                 if (normalizeChapterName(originalTooltip.textContent) === normalizeChapterName(this.categoryTooltip.textContent)
                         || normalizeChapterName(originalTooltip.textContent) === normalizeChapterName(this.chapterTooltip.textContent)) {
                     if (originalTooltip.style.display !== "none") originalTooltip.style.display = "none";
@@ -188,16 +187,25 @@ class PreviewBar {
                     originalTooltip.style.removeProperty("display");
                 }
 
+                // Used to prevent overlapping
+                this.categoryTooltip.classList.toggle("ytp-tooltip-text-no-title", noYoutubeChapters);
+                this.chapterTooltip.classList.toggle("ytp-tooltip-text-no-title", noYoutubeChapters);
+
                 // To prevent offset issue
                 this.categoryTooltip.style.right = titleTooltip.style.right;
                 this.chapterTooltip.style.right = titleTooltip.style.right;
                 this.categoryTooltip.style.textAlign = titleTooltip.style.textAlign;
                 this.chapterTooltip.style.textAlign = titleTooltip.style.textAlign;
             }
+        });
 
-            // Used to prevent overlapping
-            this.categoryTooltip.classList.toggle("ytp-tooltip-text-no-title", noYoutubeChapters);
-            this.chapterTooltip.classList.toggle("ytp-tooltip-text-no-title", noYoutubeChapters);
+        observer.observe(tooltipTextWrapper, {
+            childList: true,
+            subtree: true,
+        });
+
+        addCleanupListener(() => {
+            observer.disconnect();
         });
     }
 
@@ -221,6 +229,7 @@ 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");
         }
@@ -248,28 +257,11 @@ class PreviewBar {
     set(segments: PreviewBarSegment[], videoDuration: number): void {
         this.segments = segments ?? [];
         this.videoDuration = videoDuration ?? 0;
-        this.hasYouTubeChapters = segments.some((segment) => segment.source === SponsorSourceType.YouTube);
-
-        // Remove unnecessary original chapters if submitted replacements exist
-        for (const chapter of this.segments.filter((s) => s.actionType === ActionType.Chapter && s.source === SponsorSourceType.Server)) {
-            const segmentDuration = chapter.segment[1] - chapter.segment[0];
-            
-            const duplicate = this.segments.find((s) => s.actionType === ActionType.Chapter 
-                && s.source === SponsorSourceType.YouTube
-                && Math.abs(s.segment[0] - chapter.segment[0]) < Math.min(3, segmentDuration / 3)
-                && Math.abs(s.segment[1] - chapter.segment[1]) < Math.min(3, segmentDuration / 3));
-            
-            if (duplicate) {
-                const index = this.segments.indexOf(duplicate);
-                this.segments.splice(index, 1);
-            }
-        }
 
         this.updatePageElements();
         // Sometimes video duration is inaccurate, pull from accessibility info
         const ariaDuration = parseInt(this.progressBar?.getAttribute('aria-valuemax')) ?? 0;
-        const multipleActiveVideos = [...document.querySelectorAll("video")].filter((v) => isVisible(v)).length > 1;
-        if (!multipleActiveVideos && ariaDuration && Math.abs(ariaDuration - this.videoDuration) > 3) {
+        if (ariaDuration && Math.abs(ariaDuration - this.videoDuration) > 3) {
             this.videoDuration = ariaDuration;
         }
 
@@ -277,8 +269,7 @@ class PreviewBar {
     }
 
     private updatePageElements(): void {
-        // YT, Vorapis v3
-        const allProgressBars = document.querySelectorAll(".ytp-progress-bar, .ytp-progress-bar-container > .html5-progress-bar > .ytp-progress-list") as NodeListOf<HTMLElement>;
+        const allProgressBars = document.querySelectorAll('.ytp-progress-bar') as NodeListOf<HTMLElement>;
         this.progressBar = findValidElement(allProgressBars) ?? allProgressBars?.[0];
 
         if (this.progressBar) {
@@ -316,7 +307,6 @@ class PreviewBar {
             return (b[1] - b[0]) - (a[1] - a[0]);
         });
         for (const segment of sortedSegments) {
-            if (segment.actionType === ActionType.Chapter) continue;
             const bar = this.createBar(segment);
 
             this.container.appendChild(bar);
@@ -356,7 +346,7 @@ class PreviewBar {
         bar.style.left = this.timeToPercentage(startTime);
 
         if (duration > 0) {
-            bar.style.right = this.timeToRightPercentage(endTime);
+            bar.style.right = this.timeToPercentage(this.videoDuration - endTime);
         }
         if (this.chapterFilter(barSegment) && segment[1] < this.videoDuration) {
             bar.style.marginRight = `${this.chapterMargin}px`;
@@ -382,13 +372,11 @@ class PreviewBar {
             // Merge overlapping chapters
             this.unfilteredChapterGroups = this.createChapterRenderGroups(segments);
         }
-        
-        if ((segments.every((segments) => segments.source === SponsorSourceType.YouTube)
+
+        if (segments.every((segments) => segments.source === SponsorSourceType.YouTube)
             || (!Config.config.renderSegmentsAsChapters
                 && segments.every((segment) => segment.actionType !== ActionType.Chapter
-                    || segment.source === SponsorSourceType.YouTube)))
-            && !(hasAutogeneratedChapters() && !Config.config.showAutogeneratedChapters)) {
-
+                    || segment.source === SponsorSourceType.YouTube))) {
             if (this.customChaptersBar) this.customChaptersBar.style.display = "none";
             this.originalChapterBar.style.removeProperty("display");
             return;
@@ -414,15 +402,6 @@ class PreviewBar {
             this.chapterGroups = this.unfilteredChapterGroups;
         }
 
-        if (this.chapterGroups.length === 0 && !Config.config.showAutogeneratedChapters && hasAutogeneratedChapters()) {
-            // Add placeholder chapter group for whole video
-            this.chapterGroups = [{
-                segment: [0, this.videoDuration],
-                originalDuration: 0,
-                actionType: null
-            }];
-        }
-
         if (!this.chapterGroups || this.chapterGroups.length <= 0) {
             if (this.customChaptersBar) this.customChaptersBar.style.display = "none";
             this.originalChapterBar.style.removeProperty("display");
@@ -698,21 +677,8 @@ 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(${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`;
-                                }
-                            }
-
+                                `scaleX(${Math.max(0, Math.min(1 - calculatedLeft, (transformScale - cursor) / fullSectionWidth - calculatedLeft))}`;
                             if (firstUpdate) {
                                 customChangedElement.style.transition = "none";
                                 setTimeout(() => customChangedElement.style.removeProperty("transition"), 50);
@@ -814,9 +780,7 @@ class PreviewBar {
 
     updateChapterText(segments: SponsorTime[], submittingSegments: SponsorTime[], currentTime: number): SponsorTime[] {
         if (!Config.config.showSegmentNameInChapterBar
-                || Config.config.disableSkipping
-                || ((!segments || segments.length <= 0) && submittingSegments?.length <= 0 
-                    && (Config.config.showAutogeneratedChapters || !hasAutogeneratedChapters()))) {
+                || ((!segments || segments.length <= 0) && submittingSegments?.length <= 0)) {
             const chaptersContainer = this.getChaptersContainer();
             if (chaptersContainer) {
                 chaptersContainer.querySelector(".sponsorChapterText")?.remove();
@@ -856,14 +820,8 @@ class PreviewBar {
                         return -1;
                     } else if (a.actionType !== ActionType.Chapter && b.actionType === ActionType.Chapter) {
                         return 1;
-                    } else if (a.actionType === ActionType.Chapter && b.actionType === ActionType.Chapter
-                                && a.source === SponsorSourceType.Server && b.source !== SponsorSourceType.Server) {
-                        return -0.5;
-                    } else if (a.actionType === ActionType.Chapter && b.actionType === ActionType.Chapter
-                                && a.source !== SponsorSourceType.Server && b.source === SponsorSourceType.Server) {
-                        return 0.5;
                     } else {
-                        return (b.segment[0] - a.segment[0]) * 4;
+                        return (b.segment[0] - a.segment[0]);
                     }
                 })[0];
 
@@ -904,18 +862,6 @@ class PreviewBar {
                 } else {
                     this.chapterVote.setVisibility(false);
                 }
-            } else if (!Config.config.showAutogeneratedChapters && hasAutogeneratedChapters()) {
-                // Keep original hidden
-                chaptersContainer.querySelector(".sponsorChapterText")?.remove();
-                const chapterTitle = chaptersContainer.querySelector(".ytp-chapter-title-content") as HTMLDivElement;
-
-                chapterTitle.style.display = "none";
-                chaptersContainer.classList.remove("sponsorblock-chapter-visible");
-
-                const titlePrefixDot = chaptersContainer.querySelector(".ytp-chapter-title-prefix") as HTMLElement;
-                if (titlePrefixDot) titlePrefixDot.style.display = "none";
-                
-                this.chapterVote.setVisibility(false);
             } else {
                 chaptersContainer.querySelector(".sponsorChapterText")?.remove();
                 const chapterTitle = chaptersContainer.querySelector(".ytp-chapter-title-content") as HTMLDivElement;
@@ -973,22 +919,7 @@ class PreviewBar {
         return `${this.timeToDecimal(time) * 100}%`
     }
 
-    timeToRightPercentage(time: number): string {
-        return `${(1 - this.timeToDecimal(time)) * 100}%`
-    }
-
     timeToDecimal(time: number): number {
-        return this.decimalTimeConverter(time, true);
-    }
-
-    decimalToTime(decimal: number): number {
-        return this.decimalTimeConverter(decimal, false);
-    }
-
-    /**
-     * Decimal to time or time to decimal
-     */
-    decimalTimeConverter(value: number, isTime: boolean): number {
         if (this.originalChapterBarBlocks?.length > 1 && this.existingChapters.length === this.originalChapterBarBlocks?.length) {
             // Parent element to still work when display: none
             const totalPixels = this.originalChapterBar.parentElement.clientWidth;
@@ -998,9 +929,8 @@ class PreviewBar {
                 const chapterElement = this.originalChapterBarBlocks[i];
                 const widthPixels = parseFloat(chapterElement.style.width.replace("px", ""));
 
-                const marginPixels = chapterElement.style.marginRight ? parseFloat(chapterElement.style.marginRight.replace("px", "")) : 0;
-                if ((isTime && value >= this.existingChapters[i].segment[1])
-                        || (!isTime && value >= (pixelOffset + widthPixels + marginPixels) / totalPixels)) {
+                if (time >= this.existingChapters[i].segment[1]) {
+                    const marginPixels = chapterElement.style.marginRight ? parseFloat(chapterElement.style.marginRight.replace("px", "")) : 0;
                     pixelOffset += widthPixels + marginPixels;
                     lastCheckedChapter = i;
                 } else {
@@ -1014,22 +944,13 @@ class PreviewBar {
                 const latestWidth = parseFloat(this.originalChapterBarBlocks[lastCheckedChapter + 1].style.width.replace("px", ""));
                 const latestChapterDuration = latestChapter.segment[1] - latestChapter.segment[0];
 
-                if (isTime) {
-                    const percentageInCurrentChapter = (value - latestChapter.segment[0]) / latestChapterDuration;
-                    const sizeOfCurrentChapter = latestWidth / totalPixels;
-                    return Math.min(1, ((pixelOffset / totalPixels) + (percentageInCurrentChapter * sizeOfCurrentChapter)));
-                } else {
-                    const percentageInCurrentChapter = (value * totalPixels - pixelOffset) / latestWidth;
-                    return Math.max(0, latestChapter.segment[0] + (percentageInCurrentChapter * latestChapterDuration));
-                }
+                const percentageInCurrentChapter = (time - latestChapter.segment[0]) / latestChapterDuration;
+                const sizeOfCurrentChapter = latestWidth / totalPixels;
+                return Math.min(1, ((pixelOffset / totalPixels) + (percentageInCurrentChapter * sizeOfCurrentChapter)));
             }
         }
 
-        if (isTime) {
-            return Math.min(1, value / this.videoDuration);
-        } else {
-            return Math.max(0, value * this.videoDuration);
-        }
+        return Math.min(1, time / this.videoDuration);
     }
 
     /*

src/js-components/skipButtonControlBar.ts

@@ -1,7 +1,7 @@
 import Config from "../config";
 import { SegmentUUID, SponsorTime } from "../types";
 import { getSkippingText } from "../utils/categoryUtils";
-import { AnimationUtils } from "../../maze-utils/src/animationUtils";
+import { AnimationUtils } from "../utils/animationUtils";
 import { keybindToString } from "../../maze-utils/src/config";
 import { isMobileControlsOpen } from "../utils/mobileUtils";
 

src/messageTypes.ts

@@ -17,8 +17,7 @@ interface DefaultMessage {
         | "isChannelWhitelisted"
         | "submitTimes"
         | "refreshSegments"
-        | "closePopup"
-        | "getLogs";
+        | "closePopup";
 }
 
 interface BoolValueMessage {
@@ -104,9 +103,7 @@ export type MessageResponse =
     | IsChannelWhitelistedResponse
     | Record<string, never> // empty object response {}
     | VoteResponse
-    | ImportSegmentsResponse
-    | RefreshSegmentsResponse
-    | LogResponse;
+    | ImportSegmentsResponse;
 
 export interface VoteResponse {
     successType: number;
@@ -118,15 +115,6 @@ interface ImportSegmentsResponse {
     importedSegments: SponsorTime[];
 }
 
-export interface RefreshSegmentsResponse {
-    hasVideo: boolean;
-}
-
-export interface LogResponse {
-    debug: string[];
-    warn: string[];
-}
-
 export interface TimeUpdateMessage {
     message: "time";
     time: number;

src/options.ts

@@ -1,7 +1,8 @@
 import * as React from "react";
 import { createRoot } from 'react-dom/client';
 
-import Config, { generateDebugDetails } from "./config";
+import Config from "./config";
+import * as CompileConfig from "../config.json";
 import * as invidiousList from "../ci/invidiouslist.json";
 
 // Make the config public for debugging purposes
@@ -285,7 +286,7 @@ async function init() {
                             break;
                         case "resetToDefault":
                             Config.resetToDefault();
-                            setTimeout(() => window.location.reload(), 200);
+                            window.location.reload();
                             break;
                     }
                 });
@@ -631,7 +632,8 @@ async function setTextOption(option: string, element: HTMLElement, value: string
                         await invidiousOnClick(checkbox, "supportInvidious");
                     }
 
-                    setTimeout(() => window.location.reload(), 200);
+                    window.location.reload();
+
                 } catch (e) {
                     alert(chrome.i18n.getMessage("incorrectlyFormattedOptions"));
                 }
@@ -697,14 +699,32 @@ 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(generateDebugDetails())
-    .then(() => {
+    navigator.clipboard.writeText(JSON.stringify(output, null, 4))
+      .then(() => {
         alert(chrome.i18n.getMessage("copyDebugInformationComplete"));
-    })
-    .catch(() => {
+      })
+      .catch(() => {
         alert(chrome.i18n.getMessage("copyDebugInformationFailed"));
-    });
+      });
 }
 
 function isIncognitoAllowed(): Promise<boolean> {

src/popup.ts

@@ -1,4 +1,4 @@
-import Config, { generateDebugDetails } from "./config";
+import Config from "./config";
 
 import Utils from "./utils";
 import {
@@ -12,16 +12,14 @@ import {
     GetChannelIDResponse,
     IsChannelWhitelistedResponse,
     IsInfoFoundMessageResponse,
-    LogResponse,
     Message,
     MessageResponse,
     PopupMessage,
-    RefreshSegmentsResponse,
     SponsorStartResponse,
     VoteResponse,
 } from "./messageTypes";
 import { showDonationLink } from "./utils/configUtils";
-import { AnimationUtils } from "../maze-utils/src/animationUtils";
+import { AnimationUtils } from "./utils/animationUtils";
 import { shortCategoryName } from "./utils/categoryUtils";
 import { localizeHtmlPage } from "../maze-utils/src/setup";
 import { exportTimes } from "./utils/exporter";
@@ -185,8 +183,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
         "exportSegmentsButton",
         "importSegmentsMenu",
         "importSegmentsText",
-        "importSegmentsSubmit",
-        "debugLogs"
+        "importSegmentsSubmit"
 
     ].forEach(id => PageElements[id] = document.getElementById(id));
 
@@ -257,7 +254,6 @@ 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) {
@@ -306,7 +302,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
         PageElements.showNoticeAgain.style.display = "unset";
     }
 
-    const values = ["userName", "viewCount", "minutesSaved", "vip", "permissions", "segmentCount"];
+    const values = ["userName", "viewCount", "minutesSaved", "vip", "permissions"];
 
     asyncRequestToServer("GET", "/api/userInfo", {
         publicUserID: await getHash(Config.config.userID),
@@ -339,18 +335,16 @@ 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) {
@@ -465,35 +459,37 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
             stopLoadingAnimation = null;
         }
 
-        if (chrome.runtime.lastError || request == undefined || request.found == undefined) {
+        if (chrome.runtime.lastError) {
             //This page doesn't have the injected content script, or at least not yet
-            // Or if the request is empty, meaning the current page is not YouTube or a video page
             displayNoVideo();
             return;
         }
 
-        //remove loading text
-        PageElements.mainControls.style.display = "block";
-        if (request.onMobileYouTube) PageElements.mainControls.classList.add("hidden");
-        PageElements.whitelistButton.classList.remove("hidden");
-        PageElements.loadingIndicator.style.display = "none";
+        //if request is undefined, then the page currently being browsed is not YouTube
+        if (request != undefined) {
+            //remove loading text
+            PageElements.mainControls.style.display = "block";
+            if (request.onMobileYouTube) PageElements.mainControls.classList.add("hidden");
+            PageElements.whitelistButton.classList.remove("hidden");
+            PageElements.loadingIndicator.style.display = "none";
 
-        downloadedTimes = request.sponsorTimes ?? [];
-        displayDownloadedSponsorTimes(downloadedTimes, request.time);
-        if (request.found) {
-            PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsorFound");
-            PageElements.issueReporterImportExport.classList.remove("hidden");
-        } else if (request.status == 404 || request.status == 200) {
-            PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsor404");
-            PageElements.issueReporterImportExport.classList.remove("hidden");
-        } else {
-            if (request.status) {
-                PageElements.videoFound.innerHTML = chrome.i18n.getMessage("connectionError") + request.status;
+            downloadedTimes = request.sponsorTimes ?? [];
+            displayDownloadedSponsorTimes(downloadedTimes, request.time);
+            if (request.found) {
+                PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsorFound");
+                PageElements.issueReporterImportExport.classList.remove("hidden");
+            } else if (request.status == 404 || request.status == 200) {
+                PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsor404");
+                PageElements.issueReporterImportExport.classList.remove("hidden");
             } else {
-                PageElements.videoFound.innerHTML = chrome.i18n.getMessage("segmentsStillLoading");
-            }
+                if (request.status) {
+                    PageElements.videoFound.innerHTML = chrome.i18n.getMessage("connectionError") + request.status;
+                } else {
+                    PageElements.videoFound.innerHTML = chrome.i18n.getMessage("segmentsStillLoading");
+                }
 
-            PageElements.issueReporterImportExport.classList.remove("hidden");
+                PageElements.issueReporterImportExport.classList.remove("hidden");
+            }
         }
 
         //see if whitelist button should be swapped
@@ -566,7 +562,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                     return true;
                 }
             })
-            .sort((a, b) => b.segment[1] - a.segment[1])
+            .sort((a, b) => a.segment[1] - b.segment[1])
             .sort((a, b) => a.segment[0] - b.segment[0]);
 
         //add them as buttons to the issue reporting container
@@ -681,22 +677,9 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
             uuidButton.className = "voteButton";
             uuidButton.src = chrome.runtime.getURL("icons/clipboard.svg");
             uuidButton.title = chrome.i18n.getMessage("copySegmentID");
-            uuidButton.addEventListener("click", async () => {
+            uuidButton.addEventListener("click", () => {
+                copyToClipboard(UUID);
                 const stopAnimation = AnimationUtils.applyLoadingAnimation(uuidButton, 0.3);
-
-                if (UUID.length > 60) {
-                    copyToClipboard(UUID);
-                } else {
-                    const segmentIDData = await asyncRequestToServer("GET", "/api/segmentID", {
-                        UUID: UUID,
-                        videoID: currentVideoID
-                    });
-        
-                    if (segmentIDData.ok && segmentIDData.responseText) {
-                        copyToClipboard(segmentIDData.responseText);
-                    }
-                }
-
                 stopAnimation();
             });
 
@@ -997,17 +980,9 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
         stopLoadingAnimation = AnimationUtils.applyLoadingAnimation(PageElements.refreshSegmentsButton, 0.3);
     }
 
-    async function refreshSegments() {
+    function refreshSegments() {
         startLoadingAnimation();
-        const response = await sendTabMessageAsync({ message: 'refreshSegments' }) as RefreshSegmentsResponse;
-
-        if (response == null || !response.hasVideo) {
-            if (stopLoadingAnimation != null) {
-                stopLoadingAnimation();
-                stopLoadingAnimation = null;
-            }
-            displayNoVideo();
-        }
+        sendTabMessage({ message: 'refreshSegments' });
     }
 
     function skipSegment(actionType: ActionType, UUID: SegmentUUID, element?: HTMLElement): void {
@@ -1159,12 +1134,6 @@ 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":

src/render/CategoryPill.tsx

@@ -43,15 +43,9 @@ export class CategoryPill {
     }
 
     private async attachToPageInternal(): Promise<void> {
-        let referenceNode =
+        const referenceNode = 
             await waitFor(() => getYouTubeTitleNode());
 
-        // Experimental YouTube layout with description on right
-        const isOnDescriptionOnRightLayout = document.querySelector("#title #description");
-        if (isOnDescriptionOnRightLayout) {
-            referenceNode = referenceNode.parentElement;
-        }
-
         if (referenceNode && !referenceNode.contains(this.container)) {
             if (!this.container) {
                 this.container = document.createElement('span');
@@ -97,9 +91,7 @@ export class CategoryPill {
             parent.appendChild(this.container);
 
             referenceNode.prepend(parent);
-            if (!isOnDescriptionOnRightLayout) {
-                referenceNode.style.display = "flex";
-            }
+            referenceNode.style.display = "flex";
         }
     }
 
@@ -119,8 +111,6 @@ export class CategoryPill {
     }
 
     async setSegment(segment: SponsorTime): Promise<void> {
-        await waitFor(() => this.ref.current);
-
         if (this.ref.current?.state?.segment !== segment) {
             const newState = {
                 segment,

src/render/GenericNotice.tsx

@@ -8,7 +8,6 @@ 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;
@@ -76,7 +75,7 @@ export default class GenericNotice {
                     {options.textBoxes?.length > 0 ?
                         <tr id={"sponsorSkipNoticeMiddleRow" + this.idSuffix}
                             className="sponsorTimeMessagesRow"
-                            style={{maxHeight: getVideo() ? (getVideo().offsetHeight - 200) + "px" : null}}>
+                            style={{maxHeight: this.contentContainer ? (this.contentContainer().v.offsetHeight - 200) + "px" : null}}>
                             <td style={{width: "100%"}}>
                                 {this.getMessageBoxes(this.idSuffix, options.textBoxes)}
                             </td>

src/render/RectangleTooltip.tsx

@@ -59,7 +59,7 @@ export class RectangleTooltip {
                     className="sponsorBlockRectangleTooltip" >
                     <div>
                         <img className="sponsorSkipLogo sponsorSkipObject"
-                            src={chrome.runtime.getURL("icons/IconSponsorBlocker256px.png")}>
+                            src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}>
                         </img>
                         <span className="sponsorSkipObject">
                             {this.text + (props.link ? ". " : "")}

src/render/SkipNotice.tsx

@@ -20,7 +20,7 @@ class SkipNotice {
     skipNoticeRef: React.MutableRefObject<SkipNoticeComponent>;
     root: Root;
 
-    constructor(segments: SponsorTime[], autoSkip = false, contentContainer: ContentContainer, componentDidMount: () => void, unskipTime: number = null, startReskip = false, upcomingNoticeShown: boolean) {
+    constructor(segments: SponsorTime[], autoSkip = false, contentContainer: ContentContainer, unskipTime: number = null, startReskip = false) {
         this.skipNoticeRef = React.createRef();
 
         this.segments = segments;
@@ -53,9 +53,7 @@ class SkipNotice {
                 closeListener={() => this.close()}
                 smaller={Config.config.noticeVisibilityMode >= NoticeVisbilityMode.MiniForAll 
                     || (Config.config.noticeVisibilityMode >= NoticeVisbilityMode.MiniForAutoSkip && autoSkip)}
-                fadeIn={!upcomingNoticeShown}
-                unskipTime={unskipTime}
-                componentDidMount={componentDidMount} />
+                unskipTime={unskipTime} />
         );
     }
 

src/render/SubmissionNotice.tsx

@@ -11,7 +11,7 @@ class SubmissionNotice {
     // Contains functions and variables from the content script needed by the skip notice
     contentContainer: () => unknown;
 
-    callback: () => Promise<boolean>;
+    callback: () => unknown;
 
     noticeRef: React.MutableRefObject<SubmissionNoticeComponent>;
 
@@ -19,7 +19,7 @@ class SubmissionNotice {
 
     root: Root;
 
-    constructor(contentContainer: ContentContainer, callback: () => Promise<boolean>) {
+    constructor(contentContainer: ContentContainer, callback: () => unknown) {
         this.noticeRef = React.createRef();
 
         this.contentContainer = contentContainer;

src/render/UpcomingNotice.tsx

@@ -1,66 +0,0 @@
-import * as React from "react";
-import { createRoot, Root } from "react-dom/client";
-import { ContentContainer, SponsorTime } from "../types";
-
-import Utils from "../utils";
-import SkipNoticeComponent from "../components/SkipNoticeComponent";
-const utils = new Utils();
-
-class UpcomingNotice {
-    segments: SponsorTime[];
-    // Contains functions and variables from the content script needed by the skip notice
-    contentContainer: ContentContainer;
-
-    noticeElement: HTMLDivElement;
-
-    upcomingNoticeRef: React.MutableRefObject<SkipNoticeComponent>;
-    root: Root;
-
-    closed = false;
-
-    constructor(segments: SponsorTime[], contentContainer: ContentContainer, timeLeft: number, autoSkip: boolean) {
-        this.upcomingNoticeRef = React.createRef();
-
-        this.segments = segments;
-        this.contentContainer = contentContainer;
-
-        const referenceNode = utils.findReferenceNode();
-
-        this.noticeElement = document.createElement("div");
-        this.noticeElement.className = "sponsorSkipNoticeContainer";
-
-        referenceNode.prepend(this.noticeElement);
-
-        this.root = createRoot(this.noticeElement);
-        this.root.render(
-            <SkipNoticeComponent segments={segments} 
-                autoSkip={autoSkip} 
-                upcomingNotice={true}
-                contentContainer={contentContainer}
-                ref={this.upcomingNoticeRef}
-                closeListener={() => this.close()}
-                smaller={true}
-                fadeIn={true}
-                maxCountdownTime={timeLeft} />
-        );
-    }
-
-    close(): void {
-        this.root.unmount();
-        this.noticeElement.remove();
-
-        this.closed = true;
-    }
-
-    sameNotice(segments: SponsorTime[]): boolean {
-        if (segments.length !== this.segments.length) return false;
-
-        for (let i = 0; i < segments.length; i++) {
-            if (segments[i].UUID !== this.segments[i].UUID) return false;
-        }
-
-        return true;
-    }
-}
-
-export default UpcomingNotice;

src/types.ts

@@ -10,6 +10,7 @@ export interface ContentContainer {
         sponsorTimes: SponsorTime[];
         sponsorTimesSubmitting: SponsorTime[];
         skipNotices: SkipNotice[];
+        v: HTMLVideoElement;
         sponsorVideoID;
         reskipSponsorTime: (segment: SponsorTime, forceSeek?: boolean) => void;
         updatePreviewBar: () => void;
@@ -56,13 +57,7 @@ export enum ActionType {
     Poi = "poi"
 }
 
-export const ActionTypes = [
-    ActionType.Skip,
-    ActionType.Mute,
-    ActionType.Chapter,
-    ActionType.Full,
-    ActionType.Poi
-];
+export const ActionTypes = [ActionType.Skip, ActionType.Mute];
 
 export type SegmentUUID = string  & { __segmentUUIDBrand: unknown };
 export type Category = string & { __categoryBrand: unknown };

src/utils.ts

@@ -2,10 +2,9 @@ import Config, { VideoDownvotes } from "./config";
 import { CategorySelection, SponsorTime, BackgroundScriptContainer, Registration, VideoID, SponsorHideType, CategorySkipOption } from "./types";
 
 import { getHash, HashedValue } from "../maze-utils/src/hash";
-import { waitFor } from "../maze-utils/src";
+import { isFirefoxOrSafari, waitFor } from "../maze-utils/src";
 import { findValidElementFromSelector } from "../maze-utils/src/dom";
 import { isSafari } from "../maze-utils/src/config";
-import { asyncRequestToServer } from "./utils/requests";
 
 export default class Utils {
     
@@ -47,7 +46,10 @@ export default class Utils {
      */
     setupExtraSitePermissions(callback: (granted: boolean) => void): void {
         const permissions = [];
-        if (isSafari()) {
+        if (!isFirefoxOrSafari()) {
+            permissions.push("declarativeContent");
+        }
+        if (!isFirefoxOrSafari() || isSafari()) {
             permissions.push("webNavigation");
         }
 
@@ -65,17 +67,6 @@ export default class Utils {
         });
     }
 
-    getExtraSiteRegistration(): Registration {
-        return {
-            message: "registerContentScript",
-            id: "invidious",
-            allFrames: true,
-            js: this.js,
-            css: this.css,
-            matches: this.getPermissionRegex()
-        };
-    }
-
     /**
      * Registers the content scripts for the extra sites.
      * Will use a different method depending on the browser.
@@ -84,7 +75,14 @@ export default class Utils {
      * For now, it is just SB.config.invidiousInstances.
      */
     setupExtraSiteContentScripts(): void {
-        const registration = this.getExtraSiteRegistration();
+        const registration: Registration = {
+            message: "registerContentScript",
+            id: "invidious",
+            allFrames: true,
+            js: this.js,
+            css: this.css,
+            matches: this.getPermissionRegex()
+        };
 
         if (this.backgroundScriptContainer) {
             this.backgroundScriptContainer.registerFirefoxContentScript(registration);
@@ -108,6 +106,11 @@ export default class Utils {
             });
         }
 
+        if (!isFirefoxOrSafari() && chrome.declarativeContent) {
+            // Only if we have permission
+            chrome.declarativeContent.onPageChanged.removeRules(["invidious"]);
+        }
+
         chrome.permissions.remove({
             origins: this.getPermissionRegex()
         });
@@ -132,10 +135,8 @@ export default class Utils {
 
     containsInvidiousPermission(): Promise<boolean> {
         return new Promise((resolve) => {
-            const permissions = [];
-            if (isSafari()) {
-                permissions.push("webNavigation");
-            }
+            let permissions = ["declarativeContent"];
+            if (isFirefoxOrSafari()) permissions = [];
 
             chrome.permissions.contains({
                 origins: this.getPermissionRegex(),
@@ -199,7 +200,7 @@ export default class Utils {
 
     getSponsorIndexFromUUID(sponsorTimes: SponsorTime[], UUID: string): number {
         for (let i = 0; i < sponsorTimes.length; i++) {
-            if (sponsorTimes[i].UUID.startsWith(UUID) || UUID.startsWith(sponsorTimes[i].UUID)) {
+            if (sponsorTimes[i].UUID === UUID) {
                 return i;
             }
         }
@@ -280,19 +281,7 @@ export default class Utils {
     }
 
     async addHiddenSegment(videoID: VideoID, segmentUUID: string, hidden: SponsorHideType) {
-        if ((chrome.extension.inIncognitoContext && !Config.config.trackDownvotesInPrivate)
-                || !Config.config.trackDownvotes) return;
-
-        if (segmentUUID.length < 60) {
-            const segmentIDData = await asyncRequestToServer("GET", "/api/segmentID", {
-                UUID: segmentUUID,
-                videoID
-            });
-
-            if (segmentIDData.ok && segmentIDData.responseText) {
-                segmentUUID = segmentIDData.responseText;
-            }
-        }
+        if (chrome.extension.inIncognitoContext || !Config.config.trackDownvotes) return;
 
         const hashedVideoID = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
         const UUIDHash = await getHash(segmentUUID, 1);

src/utils/animationUtils.ts

@@ -0,0 +1,78 @@
+ /**
+ * Starts a spinning animation and returns a function to be called when it should be stopped
+ * The callback will be called when the animation is finished 
+ * It waits until a full rotation is complete
+ */
+function applyLoadingAnimation(element: HTMLElement, time: number, callback?: () => void): () => Promise<void> {
+    element.style.animation = `rotate ${time}s 0s infinite`;
+
+    return async () => new Promise((resolve) => {
+        // Make the animation finite
+        element.style.animation = `rotate ${time}s`;
+
+        // When the animation is over, hide the button
+        const animationEndListener = () => {
+            if (callback) callback();
+
+            element.style.animation = "none";
+
+            element.removeEventListener("animationend", animationEndListener);
+
+            resolve();
+        };
+
+        element.addEventListener("animationend", animationEndListener);
+    });
+}
+
+function setupCustomHideAnimation(element: Element, container: Element, enabled = true, rightSlide = true): { hide: () => void; show: () => void } {
+    if (enabled) element.classList.add("autoHiding");
+    element.classList.add("sbhidden");
+    element.classList.add("animationDone");
+    if (!rightSlide) element.classList.add("autoHideLeft");
+
+    let mouseEntered = false;
+
+    return {
+        hide: () => {
+            mouseEntered = false;
+            if (element.classList.contains("autoHiding")) {
+                element.classList.add("sbhidden");
+            }
+        },
+        show: () => {
+            mouseEntered = true;
+            element.classList.remove("animationDone");
+
+            // Wait for next event loop
+            setTimeout(() => {
+                if (mouseEntered) element.classList.remove("sbhidden")
+            }, 10);
+        }
+    };
+}
+
+function setupAutoHideAnimation(element: Element, container: Element, enabled = true, rightSlide = true): void {
+    const { hide, show } = this.setupCustomHideAnimation(element, container, enabled, rightSlide);
+
+    container.addEventListener("mouseleave", () => hide());
+    container.addEventListener("mouseenter", () => show());
+}
+
+function enableAutoHideAnimation(element: Element): void {
+    element.classList.add("autoHiding");
+    element.classList.add("sbhidden");
+}
+
+function disableAutoHideAnimation(element: Element): void {
+    element.classList.remove("autoHiding");
+    element.classList.remove("sbhidden");
+}
+
+export const AnimationUtils = {
+    applyLoadingAnimation,
+    setupAutoHideAnimation,
+    setupCustomHideAnimation,
+    enableAutoHideAnimation,
+    disableAutoHideAnimation
+};

src/utils/categoryUtils.ts

@@ -36,15 +36,6 @@ export function getSkippingText(segments: SponsorTime[], autoSkip: boolean): str
     }
 }
 
-export function getUpcomingText(segments: SponsorTime[]): string {
-    const categoryName = chrome.i18n.getMessage(segments.length > 1 ? "multipleSegments" 
-        : "category_" + segments[0].category + "_short") || chrome.i18n.getMessage("category_" + segments[0].category);
-        
-    const messageId = "upcoming";
-    return chrome.i18n.getMessage(messageId).replace("{0}", categoryName);
-}
-
-
 export function getCategorySuffix(category: Category): string {
     if (category.startsWith("poi_")) {
         return "_POI";
@@ -60,4 +51,5 @@ export function getCategorySuffix(category: Category): string {
 export function shortCategoryName(categoryName: string): string {
     return chrome.i18n.getMessage("category_" + categoryName + "_short") || chrome.i18n.getMessage("category_" + categoryName);
 }
+
 export const DEFAULT_CATEGORY = "chooseACategory";

src/utils/compatibility.ts

@@ -12,8 +12,4 @@ export function runCompatibilityChecks() {
             Config.config.showZoomToFillError2 = false;
         }, 10000);
     }
-}
-
-export function isVorapisInstalled() {
-    return document.querySelector(`.v3`);
 }

src/utils/exporter.ts

@@ -53,23 +53,24 @@ export function importTimes(data: string, videoDuration: number): SponsorTime[]
                 titleRight = removeIf(split2[split2.length - 1], specialCharMatchers)
 
                 const title = titleLeft?.length > titleRight?.length ? titleLeft : titleRight;
-                const determinedCategory = chapterNames.find(c => c.names.includes(title))?.code as Category;
+                if (title) {
+                    const determinedCategory = chapterNames.find(c => c.names.includes(title))?.code as Category;
 
-                const category = title ? (determinedCategory ?? ("chapter" as Category)) : "chooseACategory" as Category;
-                const segment: SponsorTime = {
-                    segment: [startTime, getFormattedTimeToSeconds(match[1])],
-                    category,
-                    actionType: category === "chapter" ? ActionType.Chapter : ActionType.Skip,
-                    description: category === "chapter" ? title : null,
-                    source: SponsorSourceType.Local,
-                    UUID: generateUserID() as SegmentUUID
-                };
+                    const segment: SponsorTime = {
+                        segment: [startTime, getFormattedTimeToSeconds(match[1])],
+                        category: determinedCategory ?? ("chapter" as Category),
+                        actionType: determinedCategory ? ActionType.Skip : ActionType.Chapter,
+                        description: title,
+                        source: SponsorSourceType.Local,
+                        UUID: generateUserID() as SegmentUUID
+                    };
 
-                if (result.length > 0 && result[result.length - 1].segment[1] === null) {
-                    result[result.length - 1].segment[1] = segment.segment[0];
+                    if (result.length > 0 && result[result.length - 1].segment[1] === null) {
+                        result[result.length - 1].segment[1] = segment.segment[0];
+                    }
+
+                    result.push(segment);
                 }
-
-                result.push(segment);
             }
         }
     }

src/utils/logger.ts

@@ -1,22 +1,12 @@
-if (typeof (window) !== "undefined") {
-    window["SBLogs"] = {
-        debug: [],
-        warn: []
-    };
-}
+window["SBLogs"] = {
+    debug: [],
+    warn: []
+};
 
 export function logDebug(message: string) {
-    if (typeof (window) !== "undefined") {
-        window["SBLogs"].debug.push(`[${new Date().toISOString()}] ${message}`);
-    } else {
-        console.log(`[${new Date().toISOString()}] ${message}`)
-    }
+    window["SBLogs"].debug.push(`[${new Date().toISOString()}] ${message}`);
 }
 
 export function logWarn(message: string) {
-    if (typeof (window) !== "undefined") {
-        window["SBLogs"].warn.push(`[${new Date().toISOString()}] ${message}`);
-    } else {
-        console.warn(`[${new Date().toISOString()}] ${message}`)
-    }
+    window["SBLogs"].warn.push(`[${new Date().toISOString()}] ${message}`);
 }

src/utils/pageUtils.ts

@@ -1,6 +1,5 @@
 import { ActionType, Category, SponsorSourceType, SponsorTime, VideoID } from "../types";
 import { getFormattedTimeToSeconds } from "../../maze-utils/src/formating";
-import Config from "../config";
 
 export function getControls(): HTMLElement {
     const controlsSelectors = [
@@ -11,9 +10,7 @@ export function getControls(): HTMLElement {
         // Invidious/videojs video element's controls element
         ".vjs-control-bar",
         // Piped shaka player
-        ".shaka-bottom-controls",
-        // Vorapis v3
-        ".html5-player-chrome"
+        ".shaka-bottom-controls"
     ];
 
     for (const controlsSelector of controlsSelectors) {
@@ -56,15 +53,10 @@ export function getHashParams(): Record<string, unknown> {
     return {};
 }
 
-export function hasAutogeneratedChapters(): boolean {
-    return !!document.querySelector("ytd-engagement-panel-section-list-renderer ytd-macro-markers-list-renderer #menu");
-}
-
 export function getExistingChapters(currentVideoID: VideoID, duration: number): SponsorTime[] {
     const chaptersBox = document.querySelector("ytd-macro-markers-list-renderer");
-    const title = chaptersBox?.closest("ytd-engagement-panel-section-list-renderer")?.querySelector("#title-text.ytd-engagement-panel-title-header-renderer");
+    const title = document.querySelector("[target-id=engagement-panel-macro-markers-auto-chapters] #title-text");
     if (title?.textContent?.includes("Key moment")) return [];
-    if (!Config.config.showAutogeneratedChapters && hasAutogeneratedChapters()) return [];
 
     const chapters: SponsorTime[] = [];
     // .ytp-timed-markers-container indicates that key-moments are present, which should not be divided

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 = {}, headers = {}): Promise<FetchResponse> {
-    return sendRequestToCustomServer(type, url, data, headers);
+export function asyncRequestToCustomServer(type: string, url: string, data = {}): Promise<FetchResponse> {
+    return sendRequestToCustomServer(type, url, data);
 }
 
 /**
@@ -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 = {}, headers = {}): Promise<FetchResponse> {
+export async function asyncRequestToServer(type: string, address: string, data = {}): Promise<FetchResponse> {
     const serverAddress = Config.config.testingServer ? CompileConfig.testingServerAddress : Config.config.serverAddress;
 
-    return await (asyncRequestToCustomServer(type, serverAddress + address, data, headers));
+    return await (asyncRequestToCustomServer(type, serverAddress + address, data));
 }
 
 /**

src/utils/segmentData.ts

@@ -1,106 +0,0 @@
-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 hasDownvotedSegments = !!Config.local.downvotedSegments[hashPrefix];
-    const response = await asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
-        categories: CompileConfig.categoryList,
-        actionTypes: ActionTypes,
-        trimUUIDs: hasDownvotedSegments ? null : 5,
-        ...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;
-}

src/utils/thumbnails.ts

@@ -1,15 +1,10 @@
 import { isOnInvidious, parseYouTubeVideoIDFromURL } from "../../maze-utils/src/video";
 import Config from "../config";
-import { getHasStartSegment, getVideoLabel } from "./videoLabels";
-import { getThumbnailSelector, setThumbnailListener } from "../../maze-utils/src/thumbnailManagement";
-import { VideoID } from "../types";
-import { getSegmentsForVideo } from "./segmentData";
+import { getVideoLabel } from "./videoLabels";
+import { setThumbnailListener } from "../../maze-utils/src/thumbnailManagement";
 
-export async function handleThumbnails(thumbnails: HTMLImageElement[]): Promise<void> {
-    await Promise.all(thumbnails.map((t) => {
-        labelThumbnail(t);
-        setupThumbnailHover(t);
-    }));
+export async function labelThumbnails(thumbnails: HTMLImageElement[]): Promise<void> {
+    await Promise.all(thumbnails.map((t) => labelThumbnail(t)));
 }
 
 export async function labelThumbnail(thumbnail: HTMLImageElement): Promise<HTMLElement | null> {
@@ -18,7 +13,9 @@ export async function labelThumbnail(thumbnail: HTMLImageElement): Promise<HTMLE
         return null;
     }
     
-    const videoID = extractVideoID(thumbnail);
+    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;
     if (!videoID) {
         hideThumbnailLabel(thumbnail);
         return null;
@@ -40,64 +37,6 @@ 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
-    let fetched = false;
-    const preFetch = async () => {
-        fetched = true;
-        const videoID = extractVideoID(thumbnail);
-        if (videoID && await getHasStartSegment(videoID)) {
-            void getSegmentsForVideo(videoID, false);
-        }
-    };
-    const timeout = setTimeout(preFetch, 100);
-    const onMouseDown = () => {
-        clearTimeout(timeout);
-        if (!fetched) {
-            preFetch();
-        }
-    };
-
-    e.target.addEventListener("mousedown", onMouseDown, { once: true });
-    e.target.addEventListener("mouseleave", () => {
-        clearTimeout(timeout);
-        e.target.removeEventListener("mousedown", onMouseDown);
-    }, { once: true });
-}
-
-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;
 }   
@@ -170,7 +109,7 @@ function insertSBIconDefinition() {
 }
 
 export function setupThumbnailListener(): void {
-    setThumbnailListener(handleThumbnails, () => {
+    setThumbnailListener(labelThumbnails, () => {
         insertSBIconDefinition();
     }, () => Config.isReady());
 }

src/utils/videoLabels.ts

@@ -6,14 +6,9 @@ import { asyncRequestToServer } from "./requests";
 
 const utils = new Utils();
 
-interface VideoLabelsCacheData {
-    category: Category;
-    hasStartSegment: boolean;
-}
-
 export interface LabelCacheEntry {
     timestamp: number;
-    videos: Record<VideoID, VideoLabelsCacheData>;
+    videos: Record<VideoID, Category>;
 }
 
 const labelCache: Record<string, LabelCacheEntry> = {};
@@ -26,7 +21,7 @@ async function getLabelHashBlock(hashPrefix: string): Promise<LabelCacheEntry |
         return cachedEntry;
     }
 
-    const response = await asyncRequestToServer("GET", `/api/videoLabels/${hashPrefix}?hasStartSegment=true`);
+    const response = await asyncRequestToServer("GET", `/api/videoLabels/${hashPrefix}`);
     if (response.status !== 200) {
         // No video labels or server down
         labelCache[hashPrefix] = {
@@ -41,10 +36,7 @@ async function getLabelHashBlock(hashPrefix: string): Promise<LabelCacheEntry |
 
         const newEntry: LabelCacheEntry = {
             timestamp: Date.now(),
-            videos: Object.fromEntries(data.map(video => [video.videoID, {
-                category: video.segments[0]?.category,
-                hasStartSegment: video.hasStartSegment
-            }])),
+            videos: Object.fromEntries(data.map(video => [video.videoID, video.segments[0].category])),
         };
         labelCache[hashPrefix] = newEntry;
 
@@ -63,11 +55,11 @@ async function getLabelHashBlock(hashPrefix: string): Promise<LabelCacheEntry |
 }
 
 export async function getVideoLabel(videoID: VideoID): Promise<Category | null> {
-    const prefix = (await getHash(videoID, 1)).slice(0, 4);
+    const prefix = (await getHash(videoID, 1)).slice(0, 3);
     const result = await getLabelHashBlock(prefix);
 
     if (result) {
-        const category = result.videos[videoID]?.category;
+        const category = result.videos[videoID];
         if (category && utils.getCategorySelection(category).option !== CategorySkipOption.Disabled) {
             return category;
         } else {
@@ -75,16 +67,5 @@ export async function getVideoLabel(videoID: VideoID): Promise<Category | null>
         }
     }
 
-    return null;
-}
-
-export async function getHasStartSegment(videoID: VideoID): Promise<boolean | null> {
-    const prefix = (await getHash(videoID, 1)).slice(0, 4);
-    const result = await getLabelHashBlock(prefix);
-
-    if (result) {
-        return result?.videos[videoID]?.hasStartSegment ?? false;
-    }
-
     return null;
 }

webpack/webpack.common.js

@@ -170,13 +170,6 @@ 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));
                             }
@@ -192,12 +185,6 @@ module.exports = env => {
                 stream: env.stream
             }),
             new configDiffPlugin()
-        ],
-        performance: {
-            hints: false,
-            maxEntrypointSize: 512000,
-            maxAssetSize: 512000
-        }
-
+        ]
     };
 };

webpack/webpack.manifest.js

@@ -11,7 +11,6 @@ const chromeManifestExtra = require("../manifest/chrome-manifest-extra.json");
 const safariManifestExtra = require("../manifest/safari-manifest-extra.json");
 const betaManifestExtra = require("../manifest/beta-manifest-extra.json");
 const firefoxBetaManifestExtra = require("../manifest/firefox-beta-manifest-extra.json");
-const manifestV2ManifestExtra = require("../manifest/manifest-v2-extra.json");
 
 // schema for options object
 const schema = {
@@ -42,14 +41,12 @@ class BuildManifest {
 
         // Add missing manifest elements
         if (this.options.browser.toLowerCase() === "firefox") {
-            mergeObjects(manifest, manifestV2ManifestExtra);
             mergeObjects(manifest, firefoxManifestExtra);
         } else if (this.options.browser.toLowerCase() === "chrome" 
                 || this.options.browser.toLowerCase() === "chromium"
                 || this.options.browser.toLowerCase() === "edge") {
             mergeObjects(manifest, chromeManifestExtra);
         }  else if (this.options.browser.toLowerCase() === "safari") {
-            mergeObjects(manifest, manifestV2ManifestExtra);
             mergeObjects(manifest, safariManifestExtra);
         }