From 8496e32cfefddda85605c02ad8e241e559c12041 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Fri, 22 Dec 2023 11:48:21 -0500
Subject: [PATCH] Add keybind for closing skip notices

Fixes #1915
---
 public/_locales                                   | 2 +-
 public/options/options.html                       | 5 +++++
 src/components/options/KeybindDialogComponent.tsx | 7 ++++---
 src/config.ts                                     | 2 ++
 src/content.ts                                    | 7 +++++++
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/public/_locales b/public/_locales
index 01bf91da..0c9f9998 160000
--- a/public/_locales
+++ b/public/_locales
@@ -1 +1 @@
-Subproject commit 01bf91daef4ed4d3f9ed02096b8186799dc73731
+Subproject commit 0c9f99989481a29522dcd338e821295f15eeb136
diff --git a/public/options/options.html b/public/options/options.html
index 5a9c78e1..545b0fdc 100644
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -433,6 +433,11 @@
 					<div class="inline"></div>
 				</div>
 
+				<div data-type="keybind-change" data-sync="closeSkipNoticeKeybind">	
+					<label class="optionLabel">__MSG_setCloseSkipNoticeKeybind__:</label>
+					<div class="inline"></div>
+				</div>
+
 				<div data-type="keybind-change" data-sync="startSponsorKeybind">	
 					<label class="optionLabel">__MSG_setStartSponsorShortcut__:</label>
 					<div class="inline"></div>
diff --git a/src/components/options/KeybindDialogComponent.tsx b/src/components/options/KeybindDialogComponent.tsx
index f67c82b5..2fdd728d 100644
--- a/src/components/options/KeybindDialogComponent.tsx
+++ b/src/components/options/KeybindDialogComponent.tsx
@@ -141,10 +141,11 @@ class KeybindDialogComponent extends React.Component<KeybindDialogProps, Keybind
                 return {message: chrome.i18n.getMessage("youtubeKeybindWarning"), blocking: false};
         }
 
-        if (this.props.option != "skipKeybind" && this.equals(Config.config['skipKeybind']) ||
-                this.props.option != "submitKeybind" && this.equals(Config.config['submitKeybind']) ||
+        if (this.props.option !== "skipKeybind" && this.equals(Config.config['skipKeybind']) ||
+                this.props.option !== "submitKeybind" && this.equals(Config.config['submitKeybind']) ||
                 this.props.option !== "actuallySubmitKeybind" && this.equals(Config.config['actuallySubmitKeybind']) ||
-                this.props.option != "startSponsorKeybind" && this.equals(Config.config['startSponsorKeybind']))
+                this.props.option !== "closeSkipNoticeKeybind" && this.equals(Config.config['closeSkipNoticeKeybind']) ||
+                this.props.option !== "startSponsorKeybind" && this.equals(Config.config['startSponsorKeybind']))
             return {message: chrome.i18n.getMessage("keyAlreadyUsed"), blocking: true};
 
         return null;
diff --git a/src/config.ts b/src/config.ts
index 69b3382a..14387a89 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -95,6 +95,7 @@ interface SBConfig {
     actuallySubmitKeybind: Keybind;
     nextChapterKeybind: Keybind;
     previousChapterKeybind: Keybind;
+    closeSkipNoticeKeybind: Keybind;
 
     // What categories should be skipped
     categorySelections: CategorySelection[];
@@ -345,6 +346,7 @@ const syncDefaults = {
     actuallySubmitKeybind: { key: "'", ctrl: true },
     nextChapterKeybind: { key: "ArrowRight", ctrl: true },
     previousChapterKeybind: { key: "ArrowLeft", ctrl: true },
+    closeSkipNoticeKeybind: { key: "Backspace" },
 
     categorySelections: [{
         name: "sponsor" as Category,
diff --git a/src/content.ts b/src/content.ts
index 1c6fbb88..bda3b4b7 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -2458,6 +2458,7 @@ function hotkeyListener(e: KeyboardEvent): void {
 
     const skipKey = Config.config.skipKeybind;
     const skipToHighlightKey = Config.config.skipToHighlightKeybind;
+    const closeSkipNoticeKey = Config.config.closeSkipNoticeKeybind;
     const startSponsorKey = Config.config.startSponsorKeybind;
     const submitKey = Config.config.actuallySubmitKeybind;
     const openSubmissionMenuKey = Config.config.submitKeybind;
@@ -2475,6 +2476,12 @@ function hotkeyListener(e: KeyboardEvent): void {
             skipButtonControlBar.toggleSkip.call(skipButtonControlBar);
         }
 
+        return;
+    } else if (keybindEquals(key, closeSkipNoticeKey)) {
+        for (let i = 0; i < skipNotices.length; i++) {
+            skipNotices.pop().close();
+        }
+
         return;
     } else if (keybindEquals(key, startSponsorKey)) {
         startOrEndTimingNewSegment();