From 9e4939e2e38fbc8e9aed7341f671d4c4941b76fe Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Tue, 14 Jan 2025 15:08:01 -0500
Subject: [PATCH 01/26] Fix options page layout issue

---
 public/options/options.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/options/options.css b/public/options/options.css
index b36a802b..b68ce3dd 100644
--- a/public/options/options.css
+++ b/public/options/options.css
@@ -373,6 +373,7 @@ input[type='number'] {
     display: inline-block;
     width: 40px;
     height: 24px;
+    min-width: 40px;
 }
 
 .switch input { 

From 0f4c1c50cb39fce6d7f4f583de138c4eb7e12fdc Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Fri, 17 Jan 2025 04:33:56 -0500
Subject: [PATCH 02/26] Add delay to fetch on hover to make it less easy to
 trigger

---
 src/utils/thumbnails.ts | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/utils/thumbnails.ts b/src/utils/thumbnails.ts
index 68ad8169..f6f82a60 100644
--- a/src/utils/thumbnails.ts
+++ b/src/utils/thumbnails.ts
@@ -58,10 +58,27 @@ function thumbnailHoverListener(e: MouseEvent) {
     if (!thumbnail) return;
 
     // Pre-fetch data for this video
-    const videoID = extractVideoID(thumbnail);
-    if (videoID) {
-        void getSegmentsForVideo(videoID, false);
-    }
+    let fetched = false;
+    const preFetch = () => {
+        fetched = true;
+        const videoID = extractVideoID(thumbnail);
+        if (videoID) {
+            void getSegmentsForVideo(videoID, false);
+        }
+    };
+    const timeout = setTimeout(preFetch, 200);
+    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 {

From 0f75953ad152c9db54974143ea6fd1b51243977e Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Fri, 17 Jan 2025 04:35:52 -0500
Subject: [PATCH 03/26] bump version

---
 manifest/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest/manifest.json b/manifest/manifest.json
index 7e19a919..7c12cd25 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.11",
+    "version": "5.11.1",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",

From 236c95d2f66f98690727e3b6efece929d5dcd370 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Sat, 18 Jan 2025 00:25:33 -0500
Subject: [PATCH 04/26] Only do pre-fetch on hover if there are segments near
 the start of the video

---
 src/utils/thumbnails.ts  |  8 ++++----
 src/utils/videoLabels.ts | 29 ++++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/utils/thumbnails.ts b/src/utils/thumbnails.ts
index f6f82a60..5b98cc44 100644
--- a/src/utils/thumbnails.ts
+++ b/src/utils/thumbnails.ts
@@ -1,6 +1,6 @@
 import { isOnInvidious, parseYouTubeVideoIDFromURL } from "../../maze-utils/src/video";
 import Config from "../config";
-import { getVideoLabel } from "./videoLabels";
+import { getHasStartSegment, getVideoLabel } from "./videoLabels";
 import { getThumbnailSelector, setThumbnailListener } from "../../maze-utils/src/thumbnailManagement";
 import { VideoID } from "../types";
 import { getSegmentsForVideo } from "./segmentData";
@@ -59,14 +59,14 @@ function thumbnailHoverListener(e: MouseEvent) {
 
     // Pre-fetch data for this video
     let fetched = false;
-    const preFetch = () => {
+    const preFetch = async () => {
         fetched = true;
         const videoID = extractVideoID(thumbnail);
-        if (videoID) {
+        if (videoID && await getHasStartSegment(videoID)) {
             void getSegmentsForVideo(videoID, false);
         }
     };
-    const timeout = setTimeout(preFetch, 200);
+    const timeout = setTimeout(preFetch, 100);
     const onMouseDown = () => {
         clearTimeout(timeout);
         if (!fetched) {
diff --git a/src/utils/videoLabels.ts b/src/utils/videoLabels.ts
index 82af788c..4b9c71c4 100644
--- a/src/utils/videoLabels.ts
+++ b/src/utils/videoLabels.ts
@@ -6,9 +6,14 @@ import { asyncRequestToServer } from "./requests";
 
 const utils = new Utils();
 
+interface VideoLabelsCacheData {
+    category: Category;
+    hasStartSegment: boolean;
+}
+
 export interface LabelCacheEntry {
     timestamp: number;
-    videos: Record<VideoID, Category>;
+    videos: Record<VideoID, VideoLabelsCacheData>;
 }
 
 const labelCache: Record<string, LabelCacheEntry> = {};
@@ -21,7 +26,7 @@ async function getLabelHashBlock(hashPrefix: string): Promise<LabelCacheEntry |
         return cachedEntry;
     }
 
-    const response = await asyncRequestToServer("GET", `/api/videoLabels/${hashPrefix}`);
+    const response = await asyncRequestToServer("GET", `/api/videoLabels/${hashPrefix}?hasStartSegment=true`);
     if (response.status !== 200) {
         // No video labels or server down
         labelCache[hashPrefix] = {
@@ -36,7 +41,10 @@ async function getLabelHashBlock(hashPrefix: string): Promise<LabelCacheEntry |
 
         const newEntry: LabelCacheEntry = {
             timestamp: Date.now(),
-            videos: Object.fromEntries(data.map(video => [video.videoID, video.segments[0].category])),
+            videos: Object.fromEntries(data.map(video => [video.videoID, {
+                category: video.segments[0]?.category,
+                hasStartSegment: video.hasStartSegment
+            }])),
         };
         labelCache[hashPrefix] = newEntry;
 
@@ -55,11 +63,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, 3);
+    const prefix = (await getHash(videoID, 1)).slice(0, 4);
     const result = await getLabelHashBlock(prefix);
 
     if (result) {
-        const category = result.videos[videoID];
+        const category = result.videos[videoID]?.category;
         if (category && utils.getCategorySelection(category).option !== CategorySkipOption.Disabled) {
             return category;
         } else {
@@ -67,5 +75,16 @@ 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;
 }
\ No newline at end of file

From b81de9627795528e43d2d0c381bf620dbddddb86 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Sat, 18 Jan 2025 03:10:14 -0500
Subject: [PATCH 05/26] Add support for partial segment IDs

---
 src/background.ts        |  6 +++---
 src/content.ts           |  7 ++++---
 src/utils.ts             | 14 +++++++++++++-
 src/utils/segmentData.ts |  4 +++-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/background.ts b/src/background.ts
index a5a70219..6bb21d1b 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -43,7 +43,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).then(callback);
+            submitVote(request.type, request.UUID, request.category, request.videoID).then(callback);
 
             //this allows the callback to be called later
             return true;
@@ -214,7 +214,7 @@ async function  unregisterFirefoxContentScript(id: string) {
     }
 }
 
-async function submitVote(type: number, UUID: string, category: string) {
+async function submitVote(type: number, UUID: string, category: string, videoID: string) {
     let userID = Config.config.userID;
 
     if (userID == undefined || userID === "undefined") {
@@ -226,7 +226,7 @@ async function submitVote(type: number, UUID: string, category: string) {
     const typeSection = (type !== undefined) ? "&type=" + type : "&category=" + category;
 
     try {
-        const response = await asyncRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + typeSection);
+        const response = await asyncRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&videoID=" + videoID + "&userID=" + userID + typeSection);
     
         if (response.ok) {
             return {
diff --git a/src/content.ts b/src/content.ts
index 0b075450..0eb01389 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -1400,7 +1400,7 @@ function updatePreviewBar(): void {
                 showLarger: segment.actionType === ActionType.Poi,
                 description: segment.description,
                 source: segment.source,
-                requiredSegment: requiredSegment && (segment.UUID === requiredSegment || segment.UUID?.startsWith(requiredSegment)),
+                requiredSegment: requiredSegment && (segment.UUID === requiredSegment || segment.UUID?.startsWith(requiredSegment) || requiredSegment.startsWith(segment.UUID)),
                 selectedSegment: selectedSegment && segment.UUID === selectedSegment
             });
         });
@@ -1678,7 +1678,7 @@ function sendTelemetryAndCount(skippingSegments: SponsorTime[], secondsSkipped:
                 counted = true;
             }
 
-            if (fullSkip) asyncRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + segment.UUID);
+            if (fullSkip) asyncRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + segment.UUID + "&videoID=" + getVideoID());
         }
     }
 }
@@ -2268,7 +2268,8 @@ async function voteAsync(type: number, UUID: SegmentUUID, category?: Category):
             message: "submitVote",
             type: type,
             UUID: UUID,
-            category: category
+            category: category,
+            videoID: getVideoID()
         }, (response) => {
             if (response.successType === 1) {
                 // Change the sponsor locally
diff --git a/src/utils.ts b/src/utils.ts
index c1887119..6c646a7b 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -5,6 +5,7 @@ import { getHash, HashedValue } from "../maze-utils/src/hash";
 import { 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 {
     
@@ -198,7 +199,7 @@ export default class Utils {
 
     getSponsorIndexFromUUID(sponsorTimes: SponsorTime[], UUID: string): number {
         for (let i = 0; i < sponsorTimes.length; i++) {
-            if (sponsorTimes[i].UUID === UUID) {
+            if (sponsorTimes[i].UUID.startsWith(UUID) || UUID.startsWith(sponsorTimes[i].UUID)) {
                 return i;
             }
         }
@@ -282,6 +283,17 @@ export default class Utils {
         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;
+            }
+        }
+
         const hashedVideoID = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
         const UUIDHash = await getHash(segmentUUID, 1);
 
diff --git a/src/utils/segmentData.ts b/src/utils/segmentData.ts
index 1c2e631a..5741730d 100644
--- a/src/utils/segmentData.ts
+++ b/src/utils/segmentData.ts
@@ -48,11 +48,13 @@ async function fetchSegmentsForVideo(videoID: VideoID): Promise<SegmentResponse>
     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}`

From 2cefb9822b6cecf63621fb91fc44de6d0c38df86 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Sat, 18 Jan 2025 03:13:40 -0500
Subject: [PATCH 06/26] Make copy button in popup use full segment ID

---
 src/popup.ts | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/popup.ts b/src/popup.ts
index b20723a2..0776fd24 100644
--- a/src/popup.ts
+++ b/src/popup.ts
@@ -681,9 +681,22 @@ 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", () => {
-                copyToClipboard(UUID);
+            uuidButton.addEventListener("click", async () => {
                 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();
             });
 

From ac52a1cb1de42ea0945893184a3fd8b29f45c10f Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Mon, 20 Jan 2025 02:28:23 -0500
Subject: [PATCH 07/26] update translations

---
 public/_locales | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/_locales b/public/_locales
index 1853c78f..a45cc387 160000
--- a/public/_locales
+++ b/public/_locales
@@ -1 +1 @@
-Subproject commit 1853c78fc2f7206d6041d65dee598b8c68191b48
+Subproject commit a45cc387cad0172de63bc1e25fb6f5c1c6ac2c69

From 617f0e25e8af225e3cb5cd1ea6ce60671886916f Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Mon, 20 Jan 2025 02:28:35 -0500
Subject: [PATCH 08/26] bump version

---
 manifest/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest/manifest.json b/manifest/manifest.json
index 7c12cd25..a9e71531 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.11.1",
+    "version": "5.11.2",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",

From 945ac5aad3660683f98de2563c05f5d9a16b6e35 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Tue, 21 Jan 2025 23:42:58 -0500
Subject: [PATCH 09/26] Fix local storage error appearing unnecessarily

Also adds more details to the log message
---
 maze-utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maze-utils b/maze-utils
index dc162b4e..a1e6ea7c 160000
--- a/maze-utils
+++ b/maze-utils
@@ -1 +1 @@
-Subproject commit dc162b4e7d26b33c31392ba8ba830976a2d97062
+Subproject commit a1e6ea7c60dfb2fde7b06be210df51f1dd836e85

From 7a1fa601da3c55c25cd0441f3f0e6254a420ad56 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Tue, 21 Jan 2025 23:43:11 -0500
Subject: [PATCH 10/26] bump version

---
 manifest/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest/manifest.json b/manifest/manifest.json
index a9e71531..73530f47 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.11.2",
+    "version": "5.11.3",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",

From eb61ad76c153fa8d5623bfc42c332a3cdd41c43f Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Wed, 22 Jan 2025 14:17:04 -0500
Subject: [PATCH 11/26] Add extension name to storage error message

---
 maze-utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maze-utils b/maze-utils
index a1e6ea7c..67799eeb 160000
--- a/maze-utils
+++ b/maze-utils
@@ -1 +1 @@
-Subproject commit a1e6ea7c60dfb2fde7b06be210df51f1dd836e85
+Subproject commit 67799eebf03238a999e24de1ce9bddcb919b7c99

From 6965279d367907f58ce7d06e9f492bd2765ee31e Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Wed, 22 Jan 2025 14:17:15 -0500
Subject: [PATCH 12/26] bump version

---
 manifest/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest/manifest.json b/manifest/manifest.json
index 73530f47..9cc12249 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.11.3",
+    "version": "5.11.4",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",

From c3cbc44d2897221bcb41ff6f02c0bfb56d6a6640 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Thu, 23 Jan 2025 05:18:49 -0500
Subject: [PATCH 13/26] Fix hiding segments not working on videos with YouTube
 chapters

Fixes #2194
---
 src/utils.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils.ts b/src/utils.ts
index 6c646a7b..1a20209c 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -199,7 +199,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 && (sponsorTimes[i].UUID.startsWith(UUID) || UUID.startsWith(sponsorTimes[i].UUID))) {
                 return i;
             }
         }
@@ -320,6 +320,7 @@ export default class Utils {
 
             allDownvotes[hashedVideoID] = currentVideoData;
         }
+        console.log(allDownvotes)
 
         const entries = Object.entries(allDownvotes);
         if (entries.length > 10000) {

From 5c7e3b5cb3f5ed0aa65771d27b5b9c8721be2335 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Thu, 23 Jan 2025 05:19:10 -0500
Subject: [PATCH 14/26] bump version

---
 manifest/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest/manifest.json b/manifest/manifest.json
index 9cc12249..aea11c66 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.11.4",
+    "version": "5.11.5",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",

From 19efcb5a98477e42347c0deac69bc957b0c8101a Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Sun, 2 Feb 2025 22:17:51 -0500
Subject: [PATCH 15/26] Handle video being null in skip notice

Resolves #2201
---
 src/components/SkipNoticeComponent.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SkipNoticeComponent.tsx b/src/components/SkipNoticeComponent.tsx
index d30ae4d4..cb1217a7 100644
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -697,7 +697,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] - getCurrentTime()) * (1 / (getVideo()?.playbackRate ?? 1)));
 
             return Math.max(duration, Config.config.skipNoticeDuration);
         };

From c9c02e91ff00519134c2a1d5a5a6a014c13c2107 Mon Sep 17 00:00:00 2001
From: gosha305 <gosha305.lol@gmail.com>
Date: Mon, 10 Feb 2025 01:28:22 +0100
Subject: [PATCH 16/26] Added keybinds to vote on the last segment

Added keybinds to vote on the last segment

fixed Upvote/Downvote keybind message variable names to match others in that options section
---
 public/options/options.html                       | 10 ++++++++++
 src/components/options/KeybindDialogComponent.tsx |  4 +++-
 src/config.ts                                     |  4 ++++
 src/content.ts                                    | 10 ++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/public/options/options.html b/public/options/options.html
index 9bb6b40c..43e73b60 100644
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -472,6 +472,16 @@
 					<div class="inline"></div>
 				</div>
 
+				<div data-type="keybind-change" data-sync="upvoteKeybind">	
+					<label class="optionLabel">__MSG_setUpvoteKeybind__:</label>
+					<div class="inline"></div>
+				</div>
+
+				<div data-type="keybind-change" data-sync="downvoteKeybind">	
+					<label class="optionLabel">__MSG_setDownvoteKeybind__:</label>
+					<div class="inline"></div>
+				</div>
+				
 			</div>
 
 			<div id="import" class="option-group hidden">
diff --git a/src/components/options/KeybindDialogComponent.tsx b/src/components/options/KeybindDialogComponent.tsx
index b034d7eb..0c5c6ee0 100644
--- a/src/components/options/KeybindDialogComponent.tsx
+++ b/src/components/options/KeybindDialogComponent.tsx
@@ -146,7 +146,9 @@ class KeybindDialogComponent extends React.Component<KeybindDialogProps, Keybind
                 this.props.option !== "actuallySubmitKeybind" && this.equals(Config.config['actuallySubmitKeybind']) ||
                 this.props.option !== "previewKeybind" && this.equals(Config.config['previewKeybind']) ||
                 this.props.option !== "closeSkipNoticeKeybind" && this.equals(Config.config['closeSkipNoticeKeybind']) ||
-                this.props.option !== "startSponsorKeybind" && this.equals(Config.config['startSponsorKeybind']))
+                this.props.option !== "startSponsorKeybind" && this.equals(Config.config['startSponsorKeybind']) ||
+                this.props.option !== "downvoteKeybind" && this.equals(Config.config['downvoteKeybind']) ||
+                this.props.option !== "upvoteKeybind" && this.equals(Config.config['upvoteKeybind']))
             return {message: chrome.i18n.getMessage("keyAlreadyUsed"), blocking: true};
 
         return null;
diff --git a/src/config.ts b/src/config.ts
index fc8f903f..5f753ed8 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -97,6 +97,8 @@ interface SBConfig {
     nextChapterKeybind: Keybind;
     previousChapterKeybind: Keybind;
     closeSkipNoticeKeybind: Keybind;
+    upvoteKeybind: Keybind;
+    downvoteKeybind: Keybind;
 
     // What categories should be skipped
     categorySelections: CategorySelection[];
@@ -356,6 +358,8 @@ const syncDefaults = {
     nextChapterKeybind: { key: "ArrowRight", ctrl: true },
     previousChapterKeybind: { key: "ArrowLeft", ctrl: true },
     closeSkipNoticeKeybind: { key: "Backspace" },
+    downvoteKeybind: { key: "h" },
+    upvoteKeybind: { key: "g" },
 
     categorySelections: [{
         name: "sponsor" as Category,
diff --git a/src/content.ts b/src/content.ts
index 0eb01389..ca3d41e4 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -2575,6 +2575,8 @@ function hotkeyListener(e: KeyboardEvent): void {
     const openSubmissionMenuKey = Config.config.submitKeybind;
     const nextChapterKey = Config.config.nextChapterKeybind;
     const previousChapterKey = Config.config.previousChapterKeybind;
+    const upvoteKey = Config.config.upvoteKeybind;
+    const downvoteKey = Config.config.downvoteKeybind;
 
     if (keybindEquals(key, skipKey)) {
         if (activeSkipKeybindElement) {
@@ -2618,6 +2620,14 @@ function hotkeyListener(e: KeyboardEvent): void {
         if (sponsorTimes.length > 0) e.stopPropagation();
         previousChapter();
         return;
+    } else if (keybindEquals(key, upvoteKey)) {
+        const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.segment[0]<=getCurrentTime());
+        if (lastSegment) vote(1,lastSegment.UUID, undefined, skipNotices?.find((skipNotice) => skipNotice.segments.some((segment) => segment.UUID === lastSegment.UUID))?.skipNoticeRef.current);
+        return;
+    } else if (keybindEquals(key, downvoteKey)) {
+        const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.segment[0]<=getCurrentTime());
+        if (lastSegment) vote(0,lastSegment.UUID, undefined, skipNotices?.find((skipNotice) => skipNotice.segments.some((segment) => segment.UUID === lastSegment.UUID))?.skipNoticeRef.current);
+        return;
     }
 }
 

From 2823e51b1d929464615a309b067ef60f9588d6ad Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Tue, 11 Feb 2025 20:28:10 -0500
Subject: [PATCH 17/26] Allow importing placeholder chapters without start
 times

---
 src/content.ts        |  3 ++-
 src/utils/exporter.ts | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/content.ts b/src/content.ts
index 0eb01389..58e94f38 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -306,7 +306,8 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
             for (const segment of importedSegments) {
                 if (!sponsorTimesSubmitting.some(
                         (s) => Math.abs(s.segment[0] - segment.segment[0]) < 1
-                            && Math.abs(s.segment[1] - segment.segment[1]) < 1)) {
+                            && Math.abs(s.segment[1] - segment.segment[1]) < 1
+                            && s.description === segment.description)) {
                     const hasChaptersPermission = (Config.config.showCategoryWithoutPermission
                         || Config.config.permissions["chapter"]);
                     if (segment.category === "chapter" && (!utils.getCategorySelection("chapter") || !hasChaptersPermission)) {
diff --git a/src/utils/exporter.ts b/src/utils/exporter.ts
index 85e1b383..c3f2ee2d 100644
--- a/src/utils/exporter.ts
+++ b/src/utils/exporter.ts
@@ -34,9 +34,12 @@ function exportTime(segment: SponsorTime): string {
 
 export function importTimes(data: string, videoDuration: number): SponsorTime[] {
     const lines = data.split("\n");
+    const timeRegex = /(?:((?:\d+:)?\d+:\d+)+(?:\.\d+)?)|(?:\d+(?=s| second))/g;
+    const anyLineHasTime = lines.some((line) => timeRegex.test(line));
+
     const result: SponsorTime[] = [];
     for (const line of lines) {
-        const match = line.match(/(?:((?:\d+:)?\d+:\d+)+(?:\.\d+)?)|(?:\d+(?=s| second))/g);
+        const match = line.match(timeRegex);
         if (match) {
             const startTime = getFormattedTimeToSeconds(match[0]);
             if (startTime !== null) {
@@ -71,6 +74,18 @@ export function importTimes(data: string, videoDuration: number): SponsorTime[]
 
                 result.push(segment);
             }
+        } else if (!anyLineHasTime) {
+            // Adding chapters with placeholder times
+            const segment: SponsorTime = {
+                segment: [0, 0],
+                category: "chapter" as Category,
+                actionType: ActionType.Chapter,
+                description: line,
+                source: SponsorSourceType.Local,
+                UUID: generateUserID() as SegmentUUID
+            };
+
+            result.push(segment);
         }
     }
 

From 75dc6a1980bb4b1dccbb7937fc3507abf4085af7 Mon Sep 17 00:00:00 2001
From: gosha305 <gosha305.lol@gmail.com>
Date: Wed, 12 Feb 2025 20:15:32 +0100
Subject: [PATCH 18/26] Added limit to how far back the segment voted on can be

---
 src/content.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/content.ts b/src/content.ts
index ca3d41e4..9f3571bd 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -2621,12 +2621,14 @@ function hotkeyListener(e: KeyboardEvent): void {
         previousChapter();
         return;
     } else if (keybindEquals(key, upvoteKey)) {
-        const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.segment[0]<=getCurrentTime());
-        if (lastSegment) vote(1,lastSegment.UUID, undefined, skipNotices?.find((skipNotice) => skipNotice.segments.some((segment) => segment.UUID === lastSegment.UUID))?.skipNoticeRef.current);
+        const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.segment[0] <= getCurrentTime() && getCurrentTime() - (s.segment[1] || s.segment[0]) <= Config.config.skipNoticeDuration);
+        const lastSkipNotice = skipNotices?.find((skipNotice) => skipNotice.segments.some((segment) => segment.UUID === lastSegment.UUID))?.skipNoticeRef.current;
+        if (lastSegment) vote(1,lastSegment.UUID, undefined, lastSkipNotice);
         return;
     } else if (keybindEquals(key, downvoteKey)) {
-        const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.segment[0]<=getCurrentTime());
-        if (lastSegment) vote(0,lastSegment.UUID, undefined, skipNotices?.find((skipNotice) => skipNotice.segments.some((segment) => segment.UUID === lastSegment.UUID))?.skipNoticeRef.current);
+        const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.segment[0] <= getCurrentTime() && getCurrentTime() - (s.segment[1] || s.segment[0]) <= Config.config.skipNoticeDuration);
+        const lastSkipNotice = skipNotices?.find((skipNotice) => skipNotice.segments.some((segment) => segment.UUID === lastSegment.UUID))?.skipNoticeRef.current;
+        if (lastSegment) vote(0,lastSegment.UUID, undefined, lastSkipNotice);
         return;
     }
 }

From 66876283b42e5daeac496f672e3e1bd6abf5090c Mon Sep 17 00:00:00 2001
From: gosha305 <gosha305.lol@gmail.com>
Date: Sat, 15 Feb 2025 23:34:42 +0100
Subject: [PATCH 19/26] A skip notice is now shown upon voting if one isn't
 already on screen

A skip notice is now shown upon voting if one isn't already on screen

minor fixes
---
 src/components/SkipNoticeComponent.tsx |  3 +++
 src/config.ts                          |  4 ++--
 src/content.ts                         | 25 +++++++++++++++++++------
 src/render/SkipNotice.tsx              | 20 ++++++++++++++++++++
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/components/SkipNoticeComponent.tsx b/src/components/SkipNoticeComponent.tsx
index cb1217a7..7ff4dc4f 100644
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -631,7 +631,10 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
 
     reskip(buttonIndex: number, index: number, forceSeek: boolean): void {
         this.contentContainer().reskipSponsorTime(this.segments[index], forceSeek);
+        this.reskippedMode(buttonIndex);
+    }
 
+    reskippedMode(buttonIndex: number): void {
         const skipButtonStates = this.state.skipButtonStates;
         skipButtonStates[buttonIndex] = SkipButtonState.Undo;
 
diff --git a/src/config.ts b/src/config.ts
index 5f753ed8..1f42ff95 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -358,8 +358,8 @@ const syncDefaults = {
     nextChapterKeybind: { key: "ArrowRight", ctrl: true },
     previousChapterKeybind: { key: "ArrowLeft", ctrl: true },
     closeSkipNoticeKeybind: { key: "Backspace" },
-    downvoteKeybind: { key: "h" },
-    upvoteKeybind: { key: "g" },
+    downvoteKeybind: { key: "h", shift: true },
+    upvoteKeybind: { key: "g", shift: true },
 
     categorySelections: [{
         name: "sponsor" as Category,
diff --git a/src/content.ts b/src/content.ts
index 9f3571bd..ec8d63cd 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -2532,6 +2532,23 @@ function previousChapter(): void {
     }
 }
 
+async function handleKeybindVote(type: number): Promise<void>{
+        let lastSkipNotice = skipNotices[0]?.skipNoticeRef.current;
+
+        if (!lastSkipNotice) {
+            const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.source == SponsorSourceType.Server && s.actionType != 'chapter' && (s.segment[0] <= getCurrentTime() && getCurrentTime() - (s.segment[1] || s.segment[0]) <= Config.config.skipNoticeDuration));
+            if (!lastSegment) return;
+
+            createSkipNotice([lastSegment], shouldAutoSkip(lastSegment), lastSegment?.segment[0], false);
+            lastSkipNotice = await skipNotices[0]?.waitForSkipNoticeRef();
+            lastSkipNotice?.reskippedMode(0);
+        }
+
+        lastSkipNotice?.onMouseEnter();
+        vote(type,lastSkipNotice?.segments[0]?.UUID, undefined, lastSkipNotice);
+        return;
+}
+
 function addHotkeyListener(): void {
     document.addEventListener("keydown", hotkeyListener);
 
@@ -2621,14 +2638,10 @@ function hotkeyListener(e: KeyboardEvent): void {
         previousChapter();
         return;
     } else if (keybindEquals(key, upvoteKey)) {
-        const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.segment[0] <= getCurrentTime() && getCurrentTime() - (s.segment[1] || s.segment[0]) <= Config.config.skipNoticeDuration);
-        const lastSkipNotice = skipNotices?.find((skipNotice) => skipNotice.segments.some((segment) => segment.UUID === lastSegment.UUID))?.skipNoticeRef.current;
-        if (lastSegment) vote(1,lastSegment.UUID, undefined, lastSkipNotice);
+        handleKeybindVote(1);
         return;
     } else if (keybindEquals(key, downvoteKey)) {
-        const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.segment[0] <= getCurrentTime() && getCurrentTime() - (s.segment[1] || s.segment[0]) <= Config.config.skipNoticeDuration);
-        const lastSkipNotice = skipNotices?.find((skipNotice) => skipNotice.segments.some((segment) => segment.UUID === lastSegment.UUID))?.skipNoticeRef.current;
-        if (lastSegment) vote(0,lastSegment.UUID, undefined, lastSkipNotice);
+        handleKeybindVote(0);
         return;
     }
 }
diff --git a/src/render/SkipNotice.tsx b/src/render/SkipNotice.tsx
index c58cef4c..59f60a59 100644
--- a/src/render/SkipNotice.tsx
+++ b/src/render/SkipNotice.tsx
@@ -81,6 +81,26 @@ class SkipNotice {
     unmutedListener(time: number): void {
         this.skipNoticeRef?.current?.unmutedListener(time);
     }
+
+    async waitForSkipNoticeRef(): Promise<SkipNoticeComponent> {
+        const waitForRef = () => new Promise<SkipNoticeComponent>((resolve) => {
+            const observer = new MutationObserver(() => {
+            if (this.skipNoticeRef.current) {
+                observer.disconnect();
+                resolve(this.skipNoticeRef.current);
+            }
+            });
+
+            observer.observe(document.getElementsByClassName("sponsorSkipNoticeContainer")[0], { childList: true, subtree: true});
+
+            if (this.skipNoticeRef.current) {
+            observer.disconnect();
+            resolve(this.skipNoticeRef.current);
+            }
+        });
+
+        return this.skipNoticeRef?.current || await waitForRef();
+    }
 }
 
 export default SkipNotice;
\ No newline at end of file

From 6a4bb50006090974daed2f674ae3baac260db480 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Sun, 2 Mar 2025 23:34:50 -0500
Subject: [PATCH 20/26] Fix document script player client fetching

---
 maze-utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maze-utils b/maze-utils
index 67799eeb..de2cda1e 160000
--- a/maze-utils
+++ b/maze-utils
@@ -1 +1 @@
-Subproject commit 67799eebf03238a999e24de1ce9bddcb919b7c99
+Subproject commit de2cda1e75eb88560dd94546197b674e7f044788

From 3174eda29a2db2f2dd136e4edde39e738fd986c7 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Sun, 2 Mar 2025 23:40:30 -0500
Subject: [PATCH 21/26] bump version

---
 manifest/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest/manifest.json b/manifest/manifest.json
index aea11c66..e1c2c6f1 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.11.5",
+    "version": "5.11.6",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",

From be98dc7b73ed3e07e3cd2510895b849e27f0e2bd Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Sun, 2 Mar 2025 23:41:58 -0500
Subject: [PATCH 22/26] update translations

---
 public/_locales | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/_locales b/public/_locales
index a45cc387..464b48c2 160000
--- a/public/_locales
+++ b/public/_locales
@@ -1 +1 @@
-Subproject commit a45cc387cad0172de63bc1e25fb6f5c1c6ac2c69
+Subproject commit 464b48c2f0485b10e7c32fd599e650ab817c6402

From 5a7e16b51cebaceb14aaf453b44f55efab8e2328 Mon Sep 17 00:00:00 2001
From: gosha305 <gosha305.lol@gmail.com>
Date: Tue, 4 Mar 2025 02:42:59 +0100
Subject: [PATCH 23/26] Fixed chapter skip notices not working + fixed typo

Fixed chapter skip notices not working + fixed typo

Fixed chapter skip notices not working + fixed typo

Fixed chapter skip notices not working + fixed typo

A skip notice is now shown upon voting if one isn't already on screen

minor fixes

fixed commit error
---
 src/components/SkipNoticeComponent.tsx | 21 +++++++++---------
 src/config.ts                          | 12 +++++++----
 src/content.ts                         | 30 +++++++++++++-------------
 src/render/SkipNotice.tsx              | 12 +++++------
 src/types.ts                           |  4 ++--
 src/utils/categoryUtils.ts             |  8 +++++++
 6 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/src/components/SkipNoticeComponent.tsx b/src/components/SkipNoticeComponent.tsx
index 7ff4dc4f..9e571e27 100644
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -1,12 +1,12 @@
 import * as React from "react";
 import * as CompileConfig from "../../config.json";
 import Config from "../config"
-import { Category, ContentContainer, SponsorTime, NoticeVisbilityMode, ActionType, SponsorSourceType, SegmentUUID } from "../types";
+import { Category, ContentContainer, SponsorTime, NoticeVisibilityMode, ActionType, SponsorSourceType, SegmentUUID } from "../types";
 import NoticeComponent from "./NoticeComponent";
 import NoticeTextSelectionComponent from "./NoticeTextSectionComponent";
 import Utils from "../utils";
 const utils = new Utils();
-import { getSkippingText, getUpcomingText } from "../utils/categoryUtils";
+import { getSkippingText, getUpcomingText, getVoteText } from "../utils/categoryUtils";
 
 import ThumbsUpSvg from "../svg-icons/thumbs_up_svg";
 import ThumbsDownSvg from "../svg-icons/thumbs_down_svg";
@@ -29,6 +29,7 @@ export interface SkipNoticeProps {
     autoSkip: boolean;
     startReskip?: boolean;
     upcomingNotice?: boolean;
+    voteNotice?: boolean;
     // Contains functions and variables from the content script needed by the skip notice
     contentContainer: ContentContainer;
 
@@ -102,7 +103,7 @@ 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 = this.props.voteNotice ? getVoteText(this.segments) : !this.props.upcomingNotice ? getSkippingText(this.segments, this.props.autoSkip) : getUpcomingText(this.segments);
 
         const previousSkipNotices = document.querySelectorAll(".sponsorSkipNoticeParent:not(.sponsorSkipUpcomingNotice)");
         this.amountOfPreviousNotices = previousSkipNotices.length;
@@ -186,8 +187,8 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                 idSuffix={this.idSuffix}
                 fadeIn={this.props.fadeIn}
                 fadeOut={!this.props.upcomingNotice}
-                startFaded={Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAll
-                    || (Config.config.noticeVisibilityMode >= NoticeVisbilityMode.FadedForAutoSkip && this.autoSkip)}
+                startFaded={Config.config.noticeVisibilityMode >= NoticeVisibilityMode.FadedForAll
+                    || (Config.config.noticeVisibilityMode >= NoticeVisibilityMode.FadedForAutoSkip && this.autoSkip)}
                 timed={true}
                 maxCountdownTime={this.state.maxCountdownTime}
                 style={noticeStyle}
@@ -278,7 +279,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                 }
 
                 {/* Unskip/Skip Button */}
-                {!this.props.smaller || this.segments[0].actionType === ActionType.Mute
+                {!this.props.voteNotice && (!this.props.smaller || this.segments[0].actionType === ActionType.Mute)
                     ? this.getSkipButton(1) : null}
 
                 {/* Never show button */}
@@ -374,7 +375,7 @@ 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;
+            const showSkipButton = (buttonIndex !== 0 || this.props.smaller || this.props.voteNotice || this.segments[0].actionType === ActionType.Mute) && !this.props.upcomingNotice;
 
             return (
                 <span className="sponsorSkipNoticeUnskipSection" style={{ visibility: !showSkipButton ? "hidden" : null }}>
@@ -624,9 +625,9 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
     }
 
     unskip(buttonIndex: number, index: number, forceSeek: boolean): void {
-        this.contentContainer().unskipSponsorTime(this.segments[index], this.props.unskipTime, forceSeek);
+        this.contentContainer().unskipSponsorTime(this.segments[index], this.props.unskipTime, forceSeek, this.props.voteNotice);
 
-        this.unskippedMode(buttonIndex, index, SkipButtonState.Redo);
+        this.unskippedMode(buttonIndex, index, this.segments[0].actionType === ActionType.Poi ? SkipButtonState.Undo : SkipButtonState.Redo);
     }
 
     reskip(buttonIndex: number, index: number, forceSeek: boolean): void {
@@ -664,7 +665,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
     }
 
     getUnskippedModeInfo(buttonIndex: number, index: number, skipButtonState: SkipButtonState): SkipNoticeState {
-        const changeCountdown = this.segments[index].actionType !== ActionType.Poi;
+        const changeCountdown = !this.props.voteNotice && this.segments[index].actionType !== ActionType.Poi;
 
         const maxCountdownTime = changeCountdown ?
             this.getFullDurationCountdown(index) : this.state.maxCountdownTime;
diff --git a/src/config.ts b/src/config.ts
index 1f42ff95..8c36a612 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,6 +1,6 @@
 import * as CompileConfig from "../config.json";
 import * as invidiousList from "../ci/invidiouslist.json";
-import { Category, CategorySelection, CategorySkipOption, NoticeVisbilityMode, PreviewBarOption, SponsorTime, VideoID, SponsorHideType } from "./types";
+import { Category, CategorySelection, CategorySkipOption, NoticeVisibilityMode, PreviewBarOption, SponsorTime, VideoID, SponsorHideType } from "./types";
 import { Keybind, ProtoConfig, keybindEquals } from "../maze-utils/src/config";
 import { HashedValue } from "../maze-utils/src/hash";
 
@@ -32,7 +32,7 @@ interface SBConfig {
     trackDownvotesInPrivate: boolean;
     dontShowNotice: boolean;
     showUpcomingNotice: boolean;
-    noticeVisibilityMode: NoticeVisbilityMode;
+    noticeVisibilityMode: NoticeVisibilityMode;
     hideVideoPlayerControls: boolean;
     hideInfoButtonPlayerControls: boolean;
     hideDeleteButtonPlayerControls: boolean;
@@ -297,7 +297,7 @@ const syncDefaults = {
     trackDownvotesInPrivate: false,
     dontShowNotice: false,
     showUpcomingNotice: false,
-    noticeVisibilityMode: NoticeVisbilityMode.FadedForAutoSkip,
+    noticeVisibilityMode: NoticeVisibilityMode.FadedForAutoSkip,
     hideVideoPlayerControls: false,
     hideInfoButtonPlayerControls: false,
     hideDeleteButtonPlayerControls: false,
@@ -470,7 +470,11 @@ const syncDefaults = {
         "preview-filler": {
             color: "#2E0066",
             opacity: "0.7"
-        }
+        },
+        "chapter": {
+            color: "#fff",
+            opacity: "0"
+        },
     }
 };
 
diff --git a/src/content.ts b/src/content.ts
index ec8d63cd..25632f7a 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -1778,7 +1778,7 @@ function skipToTime({v, skipTime, skippingSegments, openNotice, forceAutoSkip, u
     if (autoSkip || isSubmittingSegment) sendTelemetryAndCount(skippingSegments, skipTime[1] - skipTime[0], true);
 }
 
-function createSkipNotice(skippingSegments: SponsorTime[], autoSkip: boolean, unskipTime: number, startReskip: boolean) {
+function createSkipNotice(skippingSegments: SponsorTime[], autoSkip: boolean, unskipTime: number, startReskip: boolean, voteNotice = false) {
     for (const skipNotice of skipNotices) {
         if (skippingSegments.length === skipNotice.segments.length
                 && skippingSegments.every((segment) => skipNotice.segments.some((s) => s.UUID === segment.UUID))) {
@@ -1792,7 +1792,7 @@ function createSkipNotice(skippingSegments: SponsorTime[], autoSkip: boolean, un
     const newSkipNotice = new SkipNotice(skippingSegments, autoSkip, skipNoticeContentContainer, () => {
         upcomingNotice?.close();
         upcomingNotice = null;
-    }, unskipTime, startReskip, upcomingNoticeShown);
+    }, unskipTime, startReskip, upcomingNoticeShown, voteNotice);
     if (isOnMobileYouTube() || Config.config.skipKeybind == null) newSkipNotice.setShowKeybindHint(false);
     skipNotices.push(newSkipNotice);
 
@@ -1811,13 +1811,13 @@ function createUpcomingNotice(skippingSegments: SponsorTime[], timeLeft: number,
     upcomingNotice = new UpcomingNotice(skippingSegments, skipNoticeContentContainer, timeLeft / 1000, autoSkip);
 }
 
-function unskipSponsorTime(segment: SponsorTime, unskipTime: number = null, forceSeek = false) {
+function unskipSponsorTime(segment: SponsorTime, unskipTime: number = null, forceSeek = false, voteNotice = false) {
     if (segment.actionType === ActionType.Mute) {
         getVideo().muted = false;
         videoMuted = false;
     }
 
-    if (forceSeek || segment.actionType === ActionType.Skip) {
+    if (forceSeek || segment.actionType === ActionType.Skip || voteNotice) {
         //add a tiny bit of time to make sure it is not skipped again
         setCurrentTime(unskipTime ?? segment.segment[0] + 0.001);
     }
@@ -2533,20 +2533,20 @@ function previousChapter(): void {
 }
 
 async function handleKeybindVote(type: number): Promise<void>{
-        let lastSkipNotice = skipNotices[0]?.skipNoticeRef.current;
+    let lastSkipNotice = skipNotices[0]?.skipNoticeRef.current;
+    lastSkipNotice?.onMouseEnter();
 
-        if (!lastSkipNotice) {
-            const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.source == SponsorSourceType.Server && s.actionType != 'chapter' && (s.segment[0] <= getCurrentTime() && getCurrentTime() - (s.segment[1] || s.segment[0]) <= Config.config.skipNoticeDuration));
-            if (!lastSegment) return;
+    if (!lastSkipNotice) {
+        const lastSegment = [...sponsorTimes].reverse()?.find((s) => s.source == SponsorSourceType.Server && (s.segment[0] <= getCurrentTime() && getCurrentTime() - (s.segment[1] || s.segment[0]) <= Config.config.skipNoticeDuration));
+        if (!lastSegment) return;
 
-            createSkipNotice([lastSegment], shouldAutoSkip(lastSegment), lastSegment?.segment[0], false);
-            lastSkipNotice = await skipNotices[0]?.waitForSkipNoticeRef();
-            lastSkipNotice?.reskippedMode(0);
-        }
+        createSkipNotice([lastSegment], shouldAutoSkip(lastSegment), lastSegment?.segment[0] + 0.001,false, true);
+        lastSkipNotice = await skipNotices[0].waitForSkipNoticeRef();
+        lastSkipNotice?.reskippedMode(0);
+    }
 
-        lastSkipNotice?.onMouseEnter();
-        vote(type,lastSkipNotice?.segments[0]?.UUID, undefined, lastSkipNotice);
-        return;
+    vote(type,lastSkipNotice?.segments[0]?.UUID, undefined, lastSkipNotice);
+    return;
 }
 
 function addHotkeyListener(): void {
diff --git a/src/render/SkipNotice.tsx b/src/render/SkipNotice.tsx
index 59f60a59..6c7fa421 100644
--- a/src/render/SkipNotice.tsx
+++ b/src/render/SkipNotice.tsx
@@ -5,7 +5,7 @@ import Utils from "../utils";
 const utils = new Utils();
 
 import SkipNoticeComponent from "../components/SkipNoticeComponent";
-import { SponsorTime, ContentContainer, NoticeVisbilityMode } from "../types";
+import { SponsorTime, ContentContainer, NoticeVisibilityMode } from "../types";
 import Config from "../config";
 import { SkipNoticeAction } from "../utils/noticeUtils";
 
@@ -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, componentDidMount: () => void, unskipTime: number = null, startReskip = false, upcomingNoticeShown: boolean, voteNotice = false) {
         this.skipNoticeRef = React.createRef();
 
         this.segments = segments;
@@ -42,18 +42,18 @@ class SkipNotice {
         this.noticeElement.id = "sponsorSkipNoticeContainer" + idSuffix;
 
         referenceNode.prepend(this.noticeElement);
-
         this.root = createRoot(this.noticeElement);
         this.root.render(
             <SkipNoticeComponent segments={segments} 
                 autoSkip={autoSkip} 
                 startReskip={startReskip}
+                voteNotice={voteNotice}
                 contentContainer={contentContainer}
                 ref={this.skipNoticeRef}
                 closeListener={() => this.close()}
-                smaller={Config.config.noticeVisibilityMode >= NoticeVisbilityMode.MiniForAll 
-                    || (Config.config.noticeVisibilityMode >= NoticeVisbilityMode.MiniForAutoSkip && autoSkip)}
-                fadeIn={!upcomingNoticeShown}
+                smaller={!voteNotice && (Config.config.noticeVisibilityMode >= NoticeVisibilityMode.MiniForAll 
+                    || (Config.config.noticeVisibilityMode >= NoticeVisibilityMode.MiniForAutoSkip && autoSkip))}
+                fadeIn={!upcomingNoticeShown && !voteNotice}
                 unskipTime={unskipTime}
                 componentDidMount={componentDidMount} />
         );
diff --git a/src/types.ts b/src/types.ts
index d8634c91..d994ba36 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -6,7 +6,7 @@ export interface ContentContainer {
     (): {
         vote: (type: number, UUID: SegmentUUID, category?: Category, skipNotice?: SkipNoticeComponent) => void;
         dontShowNoticeAgain: () => void;
-        unskipSponsorTime: (segment: SponsorTime, unskipTime: number, forceSeek?: boolean) => void;
+        unskipSponsorTime: (segment: SponsorTime, unskipTime: number, forceSeek?: boolean, voteNotice?: boolean) => void;
         sponsorTimes: SponsorTime[];
         sponsorTimesSubmitting: SponsorTime[];
         skipNotices: SkipNotice[];
@@ -219,7 +219,7 @@ export interface ToggleSkippable {
     setShowKeybindHint: (show: boolean) => void;
 }
 
-export enum NoticeVisbilityMode {
+export enum NoticeVisibilityMode {
     FullSize = 0,
     MiniForAutoSkip = 1,
     MiniForAll = 2,
diff --git a/src/utils/categoryUtils.ts b/src/utils/categoryUtils.ts
index 38f4b8e9..c2c1a8a5 100644
--- a/src/utils/categoryUtils.ts
+++ b/src/utils/categoryUtils.ts
@@ -44,6 +44,14 @@ export function getUpcomingText(segments: SponsorTime[]): string {
     return chrome.i18n.getMessage(messageId).replace("{0}", categoryName);
 }
 
+export function getVoteText(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 = "voted_on";
+    return chrome.i18n.getMessage(messageId).replace("{0}", categoryName);
+}
+
 
 export function getCategorySuffix(category: Category): string {
     if (category.startsWith("poi_")) {

From 9ef948670c5efa3b2caced0570a70dfbf8b346fb Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Tue, 4 Mar 2025 21:08:39 -0500
Subject: [PATCH 24/26] bump version

---
 manifest/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest/manifest.json b/manifest/manifest.json
index e1c2c6f1..62889abb 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.11.6",
+    "version": "5.11.7",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",

From 8b0b670ea88134c5f9d8f649ae454cb4e4841d30 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Wed, 5 Mar 2025 01:44:01 -0500
Subject: [PATCH 25/26] update translation

---
 public/_locales | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/_locales b/public/_locales
index a45cc387..2653a150 160000
--- a/public/_locales
+++ b/public/_locales
@@ -1 +1 @@
-Subproject commit a45cc387cad0172de63bc1e25fb6f5c1c6ac2c69
+Subproject commit 2653a150380d6045e60b57c8db22a6261bad506f

From 5903d1a023104dbd265102dc2b68dd09a7c1ef10 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Wed, 5 Mar 2025 01:45:08 -0500
Subject: [PATCH 26/26] Fixes for vote notice

---
 src/components/SkipNoticeComponent.tsx | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/SkipNoticeComponent.tsx b/src/components/SkipNoticeComponent.tsx
index 9e571e27..24a70fa7 100644
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -243,15 +243,18 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                         </div>
 
                         {/* Copy and Downvote Button */}
-                        <div id={"sponsorTimesDownvoteButtonsContainerCopyDownvote" + this.idSuffix}
-                                className="voteButton"
-                                style={{marginLeft: "5px"}}
-                                onClick={() => this.openEditingOptions()}>
-                            <PencilSvg fill={this.state.editing === true
-                                            || this.state.actionState === SkipNoticeAction.CopyDownvote
-                                            || this.state.choosingCategory === true
-                                            ? this.selectedColor : this.unselectedColor} />
-                        </div>
+                        {
+                            !this.props.voteNotice &&
+                            <div id={"sponsorTimesDownvoteButtonsContainerCopyDownvote" + this.idSuffix}
+                                    className="voteButton"
+                                    style={{marginLeft: "5px"}}
+                                    onClick={() => this.openEditingOptions()}>
+                                <PencilSvg fill={this.state.editing === true
+                                                || this.state.actionState === SkipNoticeAction.CopyDownvote
+                                                || this.state.choosingCategory === true
+                                                ? this.selectedColor : this.unselectedColor} />
+                            </div>
+                        }
                     </td>
 
                     :
@@ -283,7 +286,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                     ? this.getSkipButton(1) : null}
 
                 {/* Never show button */}
-                {!this.autoSkip || this.props.startReskip ? "" :
+                {!this.autoSkip || this.props.startReskip || this.props.voteNotice ? "" :
                     <td className="sponsorSkipNoticeRightSection"
                         key={1}>
                         <button className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton"
@@ -375,7 +378,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                 style.minWidth = "100px";
             }
 
-            const showSkipButton = (buttonIndex !== 0 || this.props.smaller || this.props.voteNotice || this.segments[0].actionType === ActionType.Mute) && !this.props.upcomingNotice;
+            const showSkipButton = (buttonIndex !== 0 || this.props.smaller || !this.props.voteNotice || this.segments[0].actionType === ActionType.Mute) && !this.props.upcomingNotice;
 
             return (
                 <span className="sponsorSkipNoticeUnskipSection" style={{ visibility: !showSkipButton ? "hidden" : null }}>