bump version

Warn if server-side ad wasn't detected and submitting a segment
Support server side rendered ads
2025-12-22 15:38:26 +03:00 · 2024-06-23 00:33:39 +05:30 · 2024-06-23 00:31:11 +05:30 · 2024-06-23 00:03:03 +05:30 · 2024-06-22 17:42:48 +05:30 · 2024-06-22 17:06:29 +05:30
39 changed files with 1751 additions and 1036 deletions
--- a/README.md
+++ b/README.md
@@ -75,4 +75,4 @@ Icons made by:

 ### License

-This project is licensed under GNU LGPL v3 or any later version
+This project is licensed under GNU GPL v3 or any later version
--- a/manifest/chrome-manifest-extra.json
+++ b/manifest/chrome-manifest-extra.json
@@ -1,12 +1,156 @@
 {
-  "optional_permissions": [
-    "declarativeContent",
-    "webNavigation"
+  "host_permissions": [
+    "https://*.youtube.com/*",
+    "https://sponsor.ajay.app/*"
  ],
-  "background": {
-    "persistent": false
+  "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.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"
+    ],
+    "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
+        }
+    ]
  },
-  "permissions": [
-    "https://*.youtube.com/*"
-  ]
+  "background": {
+    "service_worker": "./js/background.js"
+  },
+  "manifest_version": 3
 }
--- a/manifest/firefox-manifest-extra.json
+++ b/manifest/firefox-manifest-extra.json
@@ -11,9 +11,6 @@
  "background": {
    "persistent": false
  },
-  "permissions": [
-    "scripting"
-  ],
  "browser_action": {
    "default_area": "navbar"
  }
--- a/manifest/manifest-v2-extra.json
+++ b/manifest/manifest-v2-extra.json
@@ -0,0 +1,136 @@
+{
+    "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": [
+        "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
+}  
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,141 +1,10 @@
 {
    "name": "__MSG_fullName__",
    "short_name": "SponsorBlock",
-    "version": "5.5",
+    "version": "5.7",
    "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",
@@ -145,9 +14,12 @@
        "512": "icons/IconSponsorBlocker512px.png",
        "1024": "icons/IconSponsorBlocker1024px.png"
    },
+    "permissions": [
+        "storage",
+        "scripting"
+    ],
    "options_ui": {
        "page": "options/options.html",
        "open_in_tab": true
-    },
-    "manifest_version": 2
+    }
 }  
--- a/manifest/safari-manifest-extra.json
+++ b/manifest/safari-manifest-extra.json
@@ -2,9 +2,6 @@
  "background": {
    "persistent": false
  },
-  "permissions": [
-    "scripting"
-  ],
  "optional_permissions": [
    "webNavigation"
  ]
--- a/2
+++ b/2
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
    "ts-loader": "^9.4.2",
    "ts-node": "^10.9.1",
    "typescript": "4.9",
-    "web-ext": "^7.6.2",
+    "web-ext": "^7.10.0",
    "webpack": "^5.75.0",
    "webpack-cli": "^4.10.0",
    "webpack-merge": "^5.8.0"
--- a/public/_locales
+++ b/public/_locales
--- a/public/content.css
+++ b/public/content.css
@@ -26,6 +26,11 @@
 	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);
 }
@@ -780,6 +785,18 @@ 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;
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -219,20 +219,22 @@
 							__MSG_showSkipNotice__
 						</label>
 					</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>
 				</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">
@@ -634,7 +636,19 @@
 	
 					<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__
--- a/src/background.ts
+++ b/src/background.ts
@@ -7,13 +7,9 @@ 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 } from "../maze-utils/src";
+import { isFirefoxOrSafari, waitFor } from "../maze-utils/src";
 import { injectUpdatedScripts } from "../maze-utils/src/cleanup";
 import { logWarn } from "./utils/logger";
 import { chromeP } from "../maze-utils/src/browserApi";
@@ -123,7 +119,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.extension.getURL("/help/index.html")});
+            chrome.tabs.create({url: chrome.runtime.getURL("/help/index.html")});

            //generate a userID
            const newUserID = generateUserID();
@@ -137,14 +133,21 @@ chrome.runtime.onInstalled.addListener(function () {

        if (Config.config.supportInvidious) {
            if (!(await utils.containsInvidiousPermission())) {
-                chrome.tabs.create({url: chrome.extension.getURL("/permissions/index.html")});
+                chrome.tabs.create({url: chrome.runtime.getURL("/permissions/index.html")});
            }
        }
    }, 1500);

-    // Only do this once the old version understands how to clean itself up
-    if (!isFirefoxOrSafari() && chrome.runtime.getManifest().version !== "5.4.13") {
+    if (!isFirefoxOrSafari()) {
        injectUpdatedScripts().catch(logWarn);
+
+        waitFor(() => Config.isReady()).then(() => {
+            if (Config.config.supportInvidious) {
+                injectUpdatedScripts([
+                    utils.getExtraSiteRegistration()
+                ])
+            }
+        }).catch(logWarn);
    }
 });

@@ -160,8 +163,8 @@ async function registerFirefoxContentScript(options: Registration) {
            ids: [options.id]
        }).catch(() => []);

-        if (existingRegistrations.length > 0 
-            && existingRegistrations[0].matches.every((match) => options.matches.includes(match))) {
+        if (existingRegistrations && existingRegistrations.length > 0 
+            && options.matches.every((match) => existingRegistrations[0].matches.includes(match))) {
            // No need to register another script, already registered
            return;
        }
@@ -222,27 +225,35 @@ async function submitVote(type: number, UUID: string, category: string) {

    const typeSection = (type !== undefined) ? "&type=" + type : "&category=" + category;

-    //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
+    try {
+        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: response.status,
+                responseText: await response.text()
+            };
+        }
+    } catch (e) {
+        console.error(e);
        return {
            successType: -1,
-            statusCode: response.status,
-            responseText: await response.text()
+            statusCode: -1,
+            responseText: ""
        };
    }
 }
--- a/src/components/CategoryPillComponent.tsx
+++ b/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 "../utils/animationUtils";
+import { AnimationUtils } from "../../maze-utils/src/animationUtils";
 import { Tooltip } from "../render/Tooltip";
 import { getErrorMessage } from "../../maze-utils/src/formating";

@@ -23,12 +23,14 @@ 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,
@@ -43,17 +45,21 @@ 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()}>
+                onMouseLeave={() => this.closeTooltip()}
+                ref={this.mainRef}>
                
                <span className="sponsorBlockCategoryPillTitleSection">
                    <img className="sponsorSkipLogo sponsorSkipObject"
-                        src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}>
+                        src={chrome.runtime.getURL("icons/IconSponsorBlocker256px.png")}>
                    </img>

                    {
@@ -86,7 +92,7 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
                )}

                {/* Close Button */}
-                <img src={chrome.extension.getURL("icons/close.png")}
+                <img src={chrome.runtime.getURL("icons/close.png")}
                    className="categoryPillClose"
                    onClick={() => {
                        this.setState({ show: false });
--- a/src/components/ChapterVoteComponent.tsx
+++ b/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 "../utils/animationUtils";
+import { AnimationUtils } from "../../maze-utils/src/animationUtils";
 import { Tooltip } from "../render/Tooltip";
 import { getErrorMessage } from "../../maze-utils/src/formating";

--- a/src/components/NoticeComponent.tsx
+++ b/src/components/NoticeComponent.tsx
@@ -207,7 +207,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
                                    

                                        {/* Close button */}
-                                        <img src={chrome.extension.getURL("icons/close.png")}
+                                        <img src={chrome.runtime.getURL("icons/close.png")}
                                            className={"sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeCloseButton sponsorSkipNoticeRightButton" 
                                                            + (this.props.biggerCloseButton ? " biggerCloseButton" : "")}
                                            onClick={() => this.close()}>
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -15,6 +15,7 @@ import { downvoteButtonColor, SkipNoticeAction } from "../utils/noticeUtils";
 import { generateUserID } from "../../maze-utils/src/setup";
 import { keybindToString } from "../../maze-utils/src/config";
 import { getFormattedTime } from "../../maze-utils/src/formating";
+import { getCurrentTime, getVideo } from "../../maze-utils/src/video";

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

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

 export interface SponsorTimeEditProps {
    index: number;
@@ -34,7 +35,7 @@ export interface SponsorTimeEditState {
    chapterNameSelectorHovering: boolean;
 }

-const categoryNamesGrams: string[] = [].concat(...CompileConfig.categoryList.filter((name) => name !== "chapter")
+const categoryNamesGrams: string[] = [].concat(...CompileConfig.categoryList.filter((name) => !["chapter", "intro"].includes(name))
    .map((name) => chrome.i18n.getMessage("category_" + name).split(/\/|\s|-/)));

 class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, SponsorTimeEditState> {
@@ -81,13 +82,15 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo

    componentDidMount(): void {
        // Prevent inputs from triggering key events
-        document.getElementById("sponsorTimeEditContainer" + this.idSuffix).addEventListener('keydown', function (event) {
-            event.stopPropagation();
+        document.getElementById("sponsorTimeEditContainer" + this.idSuffix).addEventListener('keydown', (e) => {
+            e.stopPropagation();
        });

        // Prevent scrolling while changing times
-        document.getElementById("sponsorTimesContainer" + this.idSuffix).addEventListener('wheel', function (event) {
-            event.preventDefault();
+        document.getElementById("sponsorTimesContainer" + this.idSuffix).addEventListener('wheel', (e) => {
+            if (this.state.editing) {
+                e.preventDefault();
+            }
        }, {passive: false});

        // Add as a config listener
@@ -221,7 +224,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                        target="_blank" rel="noreferrer">
                        <img id={"sponsorTimeCategoriesHelpButton" + this.idSuffix}
                            className="helpButton"
-                            src={chrome.extension.getURL("icons/help.svg")}
+                            src={chrome.runtime.getURL("icons/help.svg")}
                            title={chrome.i18n.getMessage("categoryGuidelines")} />
                    </a>
                </div>
@@ -270,48 +273,49 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                    </div>
                ): ""}

-                <br/>
-
                {/* Editing Tools */}

-                <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}
+                <div style={{ marginTop: "3px" }}>
+                    <span id={"sponsorTimeDeleteButton" + this.idSuffix}
                        className="sponsorTimeEditButton"
-                        onClick={(e) => this.previewTime(e.ctrlKey, e.shiftKey)}>
-                        {chrome.i18n.getMessage("preview")}
+                        onClick={this.deleteTime.bind(this)}>
+                        {chrome.i18n.getMessage("delete")}
                    </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)) 
+                        && 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]) && ![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={"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]) && 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>
        );
    }
@@ -398,7 +402,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
    checkToShowFullVideoWarning(): void {
        const sponsorTime = this.props.contentContainer().sponsorTimesSubmitting[this.props.index];
        const segmentDuration = sponsorTime.segment[1] - sponsorTime.segment[0];
-        const videoPercentage = segmentDuration / this.props.contentContainer().v.duration;
+        const videoPercentage = segmentDuration / getVideoDuration();

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

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

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

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

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

        this.props.contentContainer().previewTime(skipTime, !skipToEndTime);
    }
--- a/src/components/SubmissionNoticeComponent.tsx
+++ b/src/components/SubmissionNoticeComponent.tsx
@@ -9,12 +9,13 @@ 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: () => unknown;
+    callback: () => Promise<boolean>;

    closeListener: () => void;
 }
@@ -66,9 +67,16 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
            this.forceUpdate();
        });

-        this.videoObserver.observe(this.contentContainer().v, {
+        this.videoObserver.observe(getVideo(), {
            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 {
@@ -100,7 +108,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                onClick={() => this.sortSegments()}
                title={chrome.i18n.getMessage("sortSegments")}
                key="sortButton"
-                src={chrome.extension.getURL("icons/sort.svg")}>
+                src={chrome.runtime.getURL("icons/sort.svg")}>
            </img>;
        const exportButton = 
            <img id={"sponsorSkipExportButton" + this.state.idSuffix} 
@@ -108,7 +116,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                onClick={() => this.exportSegments()}
                title={chrome.i18n.getMessage("exportSegments")}
                key="exportButton"
-                src={chrome.extension.getURL("icons/export.svg")}>
+                src={chrome.runtime.getURL("icons/export.svg")}>
            </img>;
        return (
            <NoticeComponent noticeTitle={this.state.noticeTitle}
@@ -124,7 +132,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                {/* Sponsor Time List */}
                <tr id={"sponsorSkipNoticeMiddleRow" + this.state.idSuffix}
                    className="sponsorTimeMessagesRow"
-                    style={{maxHeight: (this.contentContainer().v.offsetHeight - 200) + "px"}}
+                    style={{maxHeight: (getVideo()?.offsetHeight - 200) + "px"}}
                    onMouseDown={(e) => e.stopPropagation()}>
                    <td style={{width: "100%"}}>
                        {this.getSponsorTimeMessages()}
@@ -208,6 +216,11 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
    }

    submit(): void {
+        if (isCurrentTimeWrong()) {
+            alert(chrome.i18n.getMessage("submissionFailedServerSideAds"));
+            return;
+        }
+
        // save all items
        for (const ref of this.timeEditRefs) {
            ref.current.saveEditTimes();
@@ -232,9 +245,11 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
            }
        }

-        this.props.callback();
-
-        this.cancel();
+        this.props.callback().then((success) => {
+            if (success) {
+                this.cancel();
+            }
+        });
    }

    sortSegments(): void {
@@ -274,7 +289,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
    categoryChangeListener(index: number, category: Category): void {
        const dialogWidth = this.noticeRef?.current?.getElement()?.current?.offsetWidth;
        if (category !== "chooseACategory" && Config.config.showCategoryGuidelines
-                && this.contentContainer().v.offsetWidth > dialogWidth * 2) {
+                && getVideo().offsetWidth > dialogWidth * 2) {
            const options = {
                title:  chrome.i18n.getMessage(`category_${category}`),
                textBoxes: getGuidelineInfo(category),
--- a/src/components/options/CategorySkipOptionsComponent.tsx
+++ b/src/components/options/CategorySkipOptionsComponent.tsx
@@ -158,7 +158,7 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
            });
        }

-        Config.forceLocalUpdate("categorySelections");
+        Config.forceSyncUpdate("categorySelections");
    }

    getCategorySkipOptions(): JSX.Element[] {
--- a/src/config.ts
+++ b/src/config.ts
@@ -29,6 +29,7 @@ interface SBConfig {
    trackViewCount: boolean;
    trackViewCountInPrivate: boolean;
    trackDownvotes: boolean;
+    trackDownvotesInPrivate: boolean;
    dontShowNotice: boolean;
    noticeVisibilityMode: NoticeVisbilityMode;
    hideVideoPlayerControls: boolean;
@@ -139,7 +140,7 @@ interface SBStorage {
    downvotedSegments: Record<VideoID & HashedValue, VideoDownvotes>;
    navigationApiAvailable: boolean;
    
-    // Used when sync storage disbaled
+    // Used when sync storage disabled
    alreadyInstalled: boolean;

    /* Contains unsubmitted segments that the user has created. */
@@ -290,6 +291,7 @@ const syncDefaults = {
    trackViewCount: true,
    trackViewCountInPrivate: true,
    trackDownvotes: true,
+    trackDownvotesInPrivate: false,
    dontShowNotice: false,
    noticeVisibilityMode: NoticeVisbilityMode.FadedForAutoSkip,
    hideVideoPlayerControls: false,
--- a/src/content.ts
+++ b/src/content.ts
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -1,19 +1,4 @@
 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);
-            }
-        }
-    }
 }
--- a/src/js-components/previewBar.ts
+++ b/src/js-components/previewBar.ts
@@ -11,9 +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 { isVisible } from "../utils/pageUtils";

 const TOOLTIP_VISIBLE_CLASS = 'sponsorCategoryTooltipVisible';
 const MIN_CHAPTER_SIZE = 0.003;
@@ -125,34 +125,11 @@ class PreviewBar {
            mouseOnSeekBar = false;
        });

-        const observer = new MutationObserver((mutations) => {
-            if (!mouseOnSeekBar || !this.categoryTooltip || !this.categoryTooltipContainer) return;
+        seekBar.addEventListener("mousemove", (e: MouseEvent) => {
+            if (!mouseOnSeekBar || !this.categoryTooltip || !this.categoryTooltipContainer || !chrome.runtime?.id) return;

-            // 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;
-            }
+            let noYoutubeChapters = !!tooltipTextWrapper.querySelector(".ytp-tooltip-text.ytp-tooltip-text-no-title");
+            const timeInSeconds = this.decimalToTime((e.clientX - seekBar.getBoundingClientRect().x) / seekBar.clientWidth);

            // Find the segment at that location, using the shortest if multiple found
            const [normalSegments, chapterSegments] =
@@ -198,15 +175,6 @@ class PreviewBar {
                this.chapterTooltip.style.textAlign = titleTooltip.style.textAlign;
            }
        });
-
-        observer.observe(tooltipTextWrapper, {
-            childList: true,
-            subtree: true,
-        });
-
-        addCleanupListener(() => {
-            observer.disconnect();
-        });
    }

    private setTooltipTitle(segment: PreviewBarSegment, tooltip: HTMLElement): void {
@@ -258,10 +226,12 @@ class PreviewBar {
        this.segments = segments ?? [];
        this.videoDuration = videoDuration ?? 0;

+
        this.updatePageElements();
        // Sometimes video duration is inaccurate, pull from accessibility info
        const ariaDuration = parseInt(this.progressBar?.getAttribute('aria-valuemax')) ?? 0;
-        if (ariaDuration && Math.abs(ariaDuration - this.videoDuration) > 3) {
+        const multipleActiveVideos = [...document.querySelectorAll("video")].filter((v) => isVisible(v)).length > 1;
+        if (!multipleActiveVideos && ariaDuration && Math.abs(ariaDuration - this.videoDuration) > 3) {
            this.videoDuration = ariaDuration;
        }

@@ -269,7 +239,7 @@ class PreviewBar {
    }

    private updatePageElements(): void {
-        const allProgressBars = document.querySelectorAll('.ytp-progress-bar') as NodeListOf<HTMLElement>;
+        const allProgressBars = document.querySelectorAll(".ytp-progress-bar") as NodeListOf<HTMLElement>;
        this.progressBar = findValidElement(allProgressBars) ?? allProgressBars?.[0];

        if (this.progressBar) {
@@ -307,6 +277,7 @@ 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);
@@ -346,7 +317,7 @@ class PreviewBar {
        bar.style.left = this.timeToPercentage(startTime);

        if (duration > 0) {
-            bar.style.right = this.timeToPercentage(this.videoDuration - endTime);
+            bar.style.right = this.timeToRightPercentage(endTime);
        }
        if (this.chapterFilter(barSegment) && segment[1] < this.videoDuration) {
            bar.style.marginRight = `${this.chapterMargin}px`;
@@ -780,6 +751,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)) {
            const chaptersContainer = this.getChaptersContainer();
            if (chaptersContainer) {
@@ -919,7 +891,22 @@ 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;
@@ -929,8 +916,9 @@ class PreviewBar {
                const chapterElement = this.originalChapterBarBlocks[i];
                const widthPixels = parseFloat(chapterElement.style.width.replace("px", ""));

-                if (time >= this.existingChapters[i].segment[1]) {
-                    const marginPixels = chapterElement.style.marginRight ? parseFloat(chapterElement.style.marginRight.replace("px", "")) : 0;
+                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)) {
                    pixelOffset += widthPixels + marginPixels;
                    lastCheckedChapter = i;
                } else {
@@ -944,13 +932,22 @@ class PreviewBar {
                const latestWidth = parseFloat(this.originalChapterBarBlocks[lastCheckedChapter + 1].style.width.replace("px", ""));
                const latestChapterDuration = latestChapter.segment[1] - latestChapter.segment[0];

-                const percentageInCurrentChapter = (time - latestChapter.segment[0]) / latestChapterDuration;
-                const sizeOfCurrentChapter = latestWidth / totalPixels;
-                return Math.min(1, ((pixelOffset / totalPixels) + (percentageInCurrentChapter * sizeOfCurrentChapter)));
+                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));
+                }
            }
        }

-        return Math.min(1, time / this.videoDuration);
+        if (isTime) {
+            return Math.min(1, value / this.videoDuration);
+        } else {
+            return Math.max(0, value * this.videoDuration);
+        }
    }

    /*
--- a/src/js-components/skipButtonControlBar.ts
+++ b/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 "../utils/animationUtils";
+import { AnimationUtils } from "../../maze-utils/src/animationUtils";
 import { keybindToString } from "../../maze-utils/src/config";
 import { isMobileControlsOpen } from "../utils/mobileUtils";

--- a/src/messageTypes.ts
+++ b/src/messageTypes.ts
@@ -103,7 +103,8 @@ export type MessageResponse =
    | IsChannelWhitelistedResponse
    | Record<string, never> // empty object response {}
    | VoteResponse
-    | ImportSegmentsResponse;
+    | ImportSegmentsResponse
+    | RefreshSegmentsResponse;

 export interface VoteResponse {
    successType: number;
@@ -115,6 +116,10 @@ interface ImportSegmentsResponse {
    importedSegments: SponsorTime[];
 }

+export interface RefreshSegmentsResponse {
+    hasVideo: boolean;
+}
+
 export interface TimeUpdateMessage {
    message: "time";
    time: number;
--- a/src/options.ts
+++ b/src/options.ts
@@ -286,7 +286,7 @@ async function init() {
                            break;
                        case "resetToDefault":
                            Config.resetToDefault();
-                            window.location.reload();
+                            setTimeout(() => window.location.reload(), 200);
                            break;
                    }
                });
@@ -632,8 +632,7 @@ async function setTextOption(option: string, element: HTMLElement, value: string
                        await invidiousOnClick(checkbox, "supportInvidious");
                    }

-                    window.location.reload();
-
+                    setTimeout(() => window.location.reload(), 200);
                } catch (e) {
                    alert(chrome.i18n.getMessage("incorrectlyFormattedOptions"));
                }
--- a/src/popup.ts
+++ b/src/popup.ts
@@ -15,11 +15,12 @@ import {
    Message,
    MessageResponse,
    PopupMessage,
+    RefreshSegmentsResponse,
    SponsorStartResponse,
    VoteResponse,
 } from "./messageTypes";
 import { showDonationLink } from "./utils/configUtils";
-import { AnimationUtils } from "./utils/animationUtils";
+import { AnimationUtils } from "../maze-utils/src/animationUtils";
 import { shortCategoryName } from "./utils/categoryUtils";
 import { localizeHtmlPage } from "../maze-utils/src/setup";
 import { exportTimes } from "./utils/exporter";
@@ -302,7 +303,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        PageElements.showNoticeAgain.style.display = "unset";
    }

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

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

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

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

    //get the amount of times this user has skipped a sponsor
    if (Config.config.skipCount != undefined) {
@@ -459,37 +462,35 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
            stopLoadingAnimation = null;
        }

-        if (chrome.runtime.lastError) {
+        if (chrome.runtime.lastError || request == undefined || request.found == undefined) {
            //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;
        }

-        //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";
+        //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");
+        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;
            } else {
-                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.videoFound.innerHTML = chrome.i18n.getMessage("segmentsStillLoading");
            }
+
+            PageElements.issueReporterImportExport.classList.remove("hidden");
        }

        //see if whitelist button should be swapped
@@ -562,7 +563,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                    return true;
                }
            })
-            .sort((a, b) => a.segment[1] - b.segment[1])
+            .sort((a, b) => b.segment[1] - a.segment[1])
            .sort((a, b) => a.segment[0] - b.segment[0]);

        //add them as buttons to the issue reporting container
@@ -980,9 +981,17 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
        stopLoadingAnimation = AnimationUtils.applyLoadingAnimation(PageElements.refreshSegmentsButton, 0.3);
    }

-    function refreshSegments() {
+    async function refreshSegments() {
        startLoadingAnimation();
-        sendTabMessage({ message: 'refreshSegments' });
+        const response = await sendTabMessageAsync({ message: 'refreshSegments' }) as RefreshSegmentsResponse;
+
+        if (response == null || !response.hasVideo) {
+            if (stopLoadingAnimation != null) {
+                stopLoadingAnimation();
+                stopLoadingAnimation = null;
+            }
+            displayNoVideo();
+        }
    }

    function skipSegment(actionType: ActionType, UUID: SegmentUUID, element?: HTMLElement): void {
--- a/src/render/CategoryPill.tsx
+++ b/src/render/CategoryPill.tsx
@@ -43,9 +43,15 @@ export class CategoryPill {
    }

    private async attachToPageInternal(): Promise<void> {
-        const referenceNode = 
+        let 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');
@@ -91,7 +97,9 @@ export class CategoryPill {
            parent.appendChild(this.container);

            referenceNode.prepend(parent);
-            referenceNode.style.display = "flex";
+            if (!isOnDescriptionOnRightLayout) {
+                referenceNode.style.display = "flex";
+            }
        }
    }

--- a/src/render/GenericNotice.tsx
+++ b/src/render/GenericNotice.tsx
@@ -8,6 +8,7 @@ const utils = new Utils();
 import { ContentContainer } from "../types";
 import NoticeTextSelectionComponent from "../components/NoticeTextSectionComponent";
 import { ButtonListener } from "../../maze-utils/src/components/component-types";
+import { getVideo } from "../../maze-utils/src/video";

 export interface TextBox {
    icon: string;
@@ -75,7 +76,7 @@ export default class GenericNotice {
                    {options.textBoxes?.length > 0 ?
                        <tr id={"sponsorSkipNoticeMiddleRow" + this.idSuffix}
                            className="sponsorTimeMessagesRow"
-                            style={{maxHeight: this.contentContainer ? (this.contentContainer().v.offsetHeight - 200) + "px" : null}}>
+                            style={{maxHeight: getVideo() ? (getVideo().offsetHeight - 200) + "px" : null}}>
                            <td style={{width: "100%"}}>
                                {this.getMessageBoxes(this.idSuffix, options.textBoxes)}
                            </td>
--- a/src/render/RectangleTooltip.tsx
+++ b/src/render/RectangleTooltip.tsx
@@ -59,7 +59,7 @@ export class RectangleTooltip {
                    className="sponsorBlockRectangleTooltip" >
                    <div>
                        <img className="sponsorSkipLogo sponsorSkipObject"
-                            src={chrome.extension.getURL("icons/IconSponsorBlocker256px.png")}>
+                            src={chrome.runtime.getURL("icons/IconSponsorBlocker256px.png")}>
                        </img>
                        <span className="sponsorSkipObject">
                            {this.text + (props.link ? ". " : "")}
--- a/src/render/SubmissionNotice.tsx
+++ b/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: () => unknown;
+    callback: () => Promise<boolean>;

    noticeRef: React.MutableRefObject<SubmissionNoticeComponent>;

@@ -19,7 +19,7 @@ class SubmissionNotice {

    root: Root;

-    constructor(contentContainer: ContentContainer, callback: () => unknown) {
+    constructor(contentContainer: ContentContainer, callback: () => Promise<boolean>) {
        this.noticeRef = React.createRef();

        this.contentContainer = contentContainer;
--- a/src/types.ts
+++ b/src/types.ts
@@ -10,7 +10,6 @@ export interface ContentContainer {
        sponsorTimes: SponsorTime[];
        sponsorTimesSubmitting: SponsorTime[];
        skipNotices: SkipNotice[];
-        v: HTMLVideoElement;
        sponsorVideoID;
        reskipSponsorTime: (segment: SponsorTime, forceSeek?: boolean) => void;
        updatePreviewBar: () => void;
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -2,7 +2,7 @@ import Config, { VideoDownvotes } from "./config";
 import { CategorySelection, SponsorTime, BackgroundScriptContainer, Registration, VideoID, SponsorHideType, CategorySkipOption } from "./types";

 import { getHash, HashedValue } from "../maze-utils/src/hash";
-import { isFirefoxOrSafari, waitFor } from "../maze-utils/src";
+import { waitFor } from "../maze-utils/src";
 import { findValidElementFromSelector } from "../maze-utils/src/dom";
 import { isSafari } from "../maze-utils/src/config";

@@ -46,10 +46,7 @@ export default class Utils {
     */
    setupExtraSitePermissions(callback: (granted: boolean) => void): void {
        const permissions = [];
-        if (!isFirefoxOrSafari()) {
-            permissions.push("declarativeContent");
-        }
-        if (!isFirefoxOrSafari() || isSafari()) {
+        if (isSafari()) {
            permissions.push("webNavigation");
        }

@@ -67,6 +64,17 @@ 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.
@@ -75,14 +83,7 @@ export default class Utils {
     * For now, it is just SB.config.invidiousInstances.
     */
    setupExtraSiteContentScripts(): void {
-        const registration: Registration = {
-            message: "registerContentScript",
-            id: "invidious",
-            allFrames: true,
-            js: this.js,
-            css: this.css,
-            matches: this.getPermissionRegex()
-        };
+        const registration = this.getExtraSiteRegistration();

        if (this.backgroundScriptContainer) {
            this.backgroundScriptContainer.registerFirefoxContentScript(registration);
@@ -106,11 +107,6 @@ export default class Utils {
            });
        }

-        if (!isFirefoxOrSafari() && chrome.declarativeContent) {
-            // Only if we have permission
-            chrome.declarativeContent.onPageChanged.removeRules(["invidious"]);
-        }
-
        chrome.permissions.remove({
            origins: this.getPermissionRegex()
        });
@@ -135,8 +131,10 @@ export default class Utils {

    containsInvidiousPermission(): Promise<boolean> {
        return new Promise((resolve) => {
-            let permissions = ["declarativeContent"];
-            if (isFirefoxOrSafari()) permissions = [];
+            const permissions = [];
+            if (isSafari()) {
+                permissions.push("webNavigation");
+            }

            chrome.permissions.contains({
                origins: this.getPermissionRegex(),
@@ -281,7 +279,8 @@ export default class Utils {
    }

    async addHiddenSegment(videoID: VideoID, segmentUUID: string, hidden: SponsorHideType) {
-        if (chrome.extension.inIncognitoContext || !Config.config.trackDownvotes) return;
+        if ((chrome.extension.inIncognitoContext && !Config.config.trackDownvotesInPrivate)
+                || !Config.config.trackDownvotes) return;

        const hashedVideoID = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
        const UUIDHash = await getHash(segmentUUID, 1);
--- a/src/utils/animationUtils.ts
+++ b/src/utils/animationUtils.ts
@@ -1,78 +0,0 @@
- /**
- * 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
-};
--- a/src/utils/exporter.ts
+++ b/src/utils/exporter.ts
@@ -53,24 +53,23 @@ export function importTimes(data: string, videoDuration: number): SponsorTime[]
                titleRight = removeIf(split2[split2.length - 1], specialCharMatchers)

                const title = titleLeft?.length > titleRight?.length ? titleLeft : titleRight;
-                if (title) {
-                    const determinedCategory = chapterNames.find(c => c.names.includes(title))?.code as Category;
+                const determinedCategory = chapterNames.find(c => c.names.includes(title))?.code as Category;

-                    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
-                    };
+                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
+                };

-                    if (result.length > 0 && result[result.length - 1].segment[1] === null) {
-                        result[result.length - 1].segment[1] = segment.segment[0];
-                    }
-
-                    result.push(segment);
+                if (result.length > 0 && result[result.length - 1].segment[1] === null) {
+                    result[result.length - 1].segment[1] = segment.segment[0];
                }
+
+                result.push(segment);
            }
        }
    }
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -1,12 +1,22 @@
-window["SBLogs"] = {
-    debug: [],
-    warn: []
-};
+if (typeof (window) !== "undefined") {
+    window["SBLogs"] = {
+        debug: [],
+        warn: []
+    };
+}

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

 export function logWarn(message: string) {
-    window["SBLogs"].warn.push(`[${new Date().toISOString()}] ${message}`);
+    if (typeof (window) !== "undefined") {
+        window["SBLogs"].warn.push(`[${new Date().toISOString()}] ${message}`);
+    } else {
+        console.warn(`[${new Date().toISOString()}] ${message}`)
+    }
 }
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -160,7 +160,7 @@ module.exports = env => {
                            if (path.match(/(\/|\\)_locales(\/|\\).+/)) {
                                const parsed = JSON.parse(content.toString());
                                if (env.browser.toLowerCase() === "safari") {
-                                    parsed.fullName.message = parsed.fullName.message.match(/^.+(?= -)/)?.[0] || parsed.fullName.message;
+                                    parsed.fullName.message = parsed.fullName.message.match(/^.+(?= [-–])/)?.[0] || parsed.fullName.message;
                                    if (parsed.fullName.message.length > 50) {
                                        parsed.fullName.message = parsed.fullName.message.slice(0, 47) + "...";
                                    }
--- a/webpack/webpack.manifest.js
+++ b/webpack/webpack.manifest.js
@@ -11,6 +11,7 @@ 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 = {
@@ -41,12 +42,14 @@ 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);
        }
Author	SHA1	Message	Date
Ajay	e9a77355bb	bump version	2024-06-23 00:33:39 +05:30
Ajay	116190f2b3	Warn if server-side ad wasn't detected and submitting a segment	2024-06-23 00:31:11 +05:30
Ajay	4bbd59b988	Support server side rendered ads Fixes #2035	2024-06-23 00:03:03 +05:30
Ajay	5c279d80df	Show submission count from server	2024-06-22 17:42:48 +05:30
Ajay	f177b95a5a	Fix submission menu after video ends and unskip button after video ends	2024-06-22 17:06:29 +05:30
Ajay Ramachandran	d86dd37ec0	Merge pull request #2046 from ajayyy/mv3 Support mv3	2024-06-22 16:29:43 +05:30
Ajay	fae7d921a7	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into mv3	2024-06-22 16:27:18 +05:30
Ajay	60a2eff40a	Fix linting issue	2024-06-19 23:16:29 +05:30
Ajay	98a4a076bc	Support invidious in mv3	2024-06-19 23:14:27 +05:30
Ajay	a95020dda3	Manifest v3 without invidious working	2024-06-19 22:37:29 +05:30
Ajay Ramachandran	5e179cf9ff	Merge pull request #2036 from mini-bomba/refresh-fix Fix refreshing	2024-06-13 09:07:57 +05:30
mini-bomba	0b946d5ef7	Don't fetch segments when videoID is null Also log an error to the console if we ever try to do this in the future	2024-06-13 01:18:02 +02:00
mini-bomba	f48c57b1c5	Don't inject into the cookie rotate iframe There's nothing there, it only breaks the refreshing.	2024-06-13 01:09:27 +02:00
Ajay	98ac2fc618	bump version	2024-06-06 19:53:08 +05:30
Ajay	36e3333e39	Fix submission menu disappearing when video ends	2024-06-06 19:52:57 +05:30
Ajay	15fcc971f6	bump version	2024-05-24 03:26:02 -04:00
Ajay	32adbb9581	update translations	2024-05-24 03:22:36 -04:00
Ajay	4ecd02510b	Fix warnings	2024-05-24 03:22:07 -04:00
Ajay	0dbb6474b8	Fix preview bar on mobile Fixes #2021	2024-05-24 03:20:21 -04:00
Ajay	c974c2a6d6	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock	2024-05-24 03:15:59 -04:00
Ajay	a6695254b6	Fix skipping and preview bar on "add to queue", miniplayer and hover preview Fixes #1486	2024-05-24 03:15:58 -04:00
Ajay	e8a82eddca	Change chapters sorting	2024-05-09 19:09:37 -04:00
Ajay Ramachandran	d3684dbedd	Merge pull request #2017 from stdedos/fix/disabled-comment-typo Fix comment typo	2024-05-08 17:54:10 -04:00
Stavros Ntentos	6c9a403731	Fix comment typo Signed-off-by: Stavros Ntentos <133706+stdedos@users.noreply.github.com>	2024-05-08 23:44:01 +03:00
Ajay	3be51c89a9	Fix popup sometimes saying "No video found" Fixes #2006 Fixes #2013 Fixes #1999	2024-04-30 20:54:54 -04:00
Ajay	5b845a56e1	Fix unsubmitted segments sometimes manual skipping if manual skip enabled for category Fixes #2002	2024-04-28 22:59:02 -04:00
Ajay	7b572c3c0e	Fix previewed segment check Fixes #1996	2024-04-28 21:51:35 -04:00
Ajay	56bb22d03d	Allow importing segments with no category Also fixes case when importing chapters when having no permission to submit chapters	2024-04-26 16:44:20 -04:00
Ajay	e1d656f43f	Make notice visibility option not appear when notice disabled	2024-04-04 13:54:47 -04:00
Ajay	e14b3c76f9	Improve submission box padding	2024-03-27 16:14:10 -04:00
Ajay	de830cda48	bump version	2024-03-18 21:03:23 -04:00
Ajay	d8057fb547	bump translations	2024-03-18 21:03:09 -04:00
Ajay Ramachandran	2dd69d443b	Merge pull request #1983 from HanYaodong/dev [Fix #1979] Stop Refresh Animation on Popup When Content Script is Not Injected	2024-03-18 20:59:19 -04:00
Ajay	6732850b41	Fix chapters not changing when skipping is disabled	2024-03-18 20:58:07 -04:00
Ajay	287233785e	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock	2024-03-18 19:45:36 -04:00
Ajay	de094cb11f	Add option to store downvotes when done in private tabs	2024-03-18 19:45:35 -04:00
Ajay Ramachandran	2307691044	Merge pull request #1986 from ajayyy/dependabot/npm_and_yarn/follow-redirects-1.15.6 Bump follow-redirects from 1.15.4 to 1.15.6	2024-03-16 21:07:43 -04:00
dependabot[bot]	2dca0d7526	Bump follow-redirects from 1.15.4 to 1.15.6 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-03-16 23:28:04 +00:00
HanYaodong	a1505bcf20	Refractor popup infoFound() empty message detection	2024-03-09 23:47:48 +08:00
HanYaodong	25b53754ba	Stop refresh animation on popup when content script is not injected	2024-03-09 23:42:17 +08:00
Ajay	6c71036356	update translations	2024-03-07 17:22:22 -05:00
Ajay	f55f2606a7	bump version	2024-03-07 17:21:50 -05:00
Ajay	e9b7abd219	Fix rate-limiting when setting options from options page	2024-03-07 17:20:23 -05:00
Ajay Ramachandran	63d3309605	Merge pull request #1948 from ajayyy/dependabot/npm_and_yarn/follow-redirects-1.15.4 Bump follow-redirects from 1.15.3 to 1.15.4	2024-02-29 03:35:22 -05:00
Ajay Ramachandran	b4615d7d79	Merge pull request #1950 from ajayyy/dependabot/npm_and_yarn/postcss-and-web-ext-8.4.33 Bump postcss and web-ext	2024-02-29 03:35:13 -05:00
Ajay Ramachandran	ec7eee650b	Merge pull request #1979 from HanYaodong/dev_refresh [Fix] Stop Refresh Animation on Popup When Triggered on Non-YouTube Pages	2024-02-29 03:34:45 -05:00
HanYaodong	154bb1749d	Stop refresh animation on popup when not on youtube page	2024-02-29 12:36:06 +08:00
Ajay	742eb7ef57	bump version	2024-02-28 01:13:57 -05:00
Ajay	88526aa46e	Fix missing key in tooltip and update maze utils	2024-02-27 22:16:53 -05:00
Ajay	1909e66c87	Move category pill to top if on description on right layout	2024-02-27 22:13:58 -05:00
Ajay	5f8447ec6b	bump version	2024-02-24 18:54:19 -05:00
Ajay	e6db5b43ff	update translations	2024-02-24 18:54:11 -05:00
Ajay	6566c129c7	Fix issue with BlockTube version 0.4.1	2024-02-24 18:53:26 -05:00
Ajay	e7f4be2d57	Don't require preview for starting segments	2024-02-21 14:32:44 -05:00
Ajay	9d04482d19	bump version	2024-02-13 22:35:44 -05:00
Ajay	7c661f8e67	update translations	2024-02-13 22:33:11 -05:00
Ajay	0b7a2fd197	Fix adding custom Invidious instances on Firefox Fixes #815	2024-02-13 22:32:37 -05:00
Ajay	3382d8a500	Fix chapter names not appearing	2024-02-13 21:52:10 -05:00
Ajay	5d871d5fe7	Fix hidden mute segments sometimes still muting	2024-02-13 21:32:23 -05:00
Ajay Ramachandran	b7c5737a95	Merge pull request #1967 from HanYaodong/dev Fix license info in README	2024-02-02 19:17:14 -05:00
HanYaodong	0cca1c3566	Fix license info in README	2024-02-02 19:32:31 +08:00
Ajay	e0fe0fad67	Don't close submission menu if submission didn't go through Fxies submission menu closing for warning about previewing a segment	2024-02-01 13:31:19 -05:00
Ajay	c0bc068a18	Handle exceptions for voting Maybe fixes #1961	2024-01-31 19:06:16 -05:00
Ajay	7cb413db15	Don't display preview bar while scrubbing on mobile Should help with #1962	2024-01-31 18:58:06 -05:00
Ajay	fdf1a6acf9	bump version	2024-01-30 23:12:36 -05:00
Ajay	b533c6c1c8	update translations	2024-01-30 23:12:28 -05:00
Ajay	926423db5c	Fix compatibility with vinegar on Safari	2024-01-30 23:12:03 -05:00
Ajay	e7d55d2bac	Fix preview bar end time sometimes being inaccurate	2024-01-25 19:38:10 -05:00
Ajay	16f27e5c5c	Move animation utils to maze utils	2024-01-24 16:21:31 -05:00
Ajay	88dc8db6e7	bump version	2024-01-23 14:27:05 -05:00
Ajay	c69a574379	update translations	2024-01-23 14:27:01 -05:00
Ajay	516d624f16	Don't require preview for segments ending at end of the video Fixes #1959	2024-01-23 14:25:07 -05:00
Ajay	a662c3e04f	Reloading after creating segments shouldn't require previewing	2024-01-23 14:22:54 -05:00
Ajay	985910cbf6	Count previewed unsubmitted segments previewed manually	2024-01-23 14:20:24 -05:00
Ajay	feae86f6ea	Don't throw errors on extension live-update	2024-01-21 20:42:40 -05:00
Ajay	1f96e3b117	Improve precision of hover preview Also fixes issue with YouTube "most-replayed" messing it up	2024-01-21 20:35:00 -05:00
Ajay	b3b5d46e4e	bump version	2024-01-21 15:57:35 -05:00
Ajay	c996680a58	Fix category selection changes not saving	2024-01-21 15:57:22 -05:00
Ajay	ade4654ae0	bump version	2024-01-21 14:26:27 -05:00
Ajay	4e9e6282f6	update translations	2024-01-21 14:26:16 -05:00
Ajay	783326afca	Use runtime.getURL	2024-01-21 13:51:32 -05:00
Ajay	8dfd06919b	Only require a preview for skip and mute segments	2024-01-21 13:40:01 -05:00
Ajay	50ee690717	Only prevent scrolling while editing	2024-01-21 13:37:29 -05:00
Ajay	74aebd32a7	Prevent zooming when trying to scroll to edit times	2024-01-21 13:31:45 -05:00
Ajay	e489d0f913	Fix german title not being shortened	2024-01-16 18:39:29 -05:00
Ajay	814df46521	Don't warn about using the word intro in chapter names	2024-01-16 18:21:44 -05:00
dependabot[bot]	ba92e6e386	Bump postcss and web-ext Bumps [postcss](https://github.com/postcss/postcss) to 8.4.33 and updates ancestor dependency [web-ext](https://github.com/mozilla/web-ext). These dependencies need to be updated together. Updates `postcss` from 8.4.21 to 8.4.33 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.21...8.4.33) Updates `web-ext` from 7.6.2 to 7.10.0 - [Release notes](https://github.com/mozilla/web-ext/releases) - [Commits](https://github.com/mozilla/web-ext/compare/7.6.2...7.10.0) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect - dependency-name: web-ext dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-12 18:16:09 +00:00
dependabot[bot]	bdbe8b60cc	Bump follow-redirects from 1.15.3 to 1.15.4 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.3...v1.15.4) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-11 03:55:58 +00:00