From acc672afcd67ef9c2b9c1fe3e973b278d01bfa21 Mon Sep 17 00:00:00 2001
From: Luc Mcgrady <lucmcgrady@gmail.com>
Date: Sat, 15 Nov 2025 21:47:03 +0000
Subject: [PATCH] Use pre-existing shortcut methods

---
 ts/lib/tslib/shortcuts.ts                     |  6 +++-
 .../reviewer/reviewer-bottom/More.svelte      | 30 ++++++++++++++++++-
 .../reviewer/reviewer-bottom/MoreItem.svelte  |  1 -
 ts/routes/reviewer/reviewer.ts                | 10 +++----
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/ts/lib/tslib/shortcuts.ts b/ts/lib/tslib/shortcuts.ts
index 0cb0b2f2d..6e7061798 100644
--- a/ts/lib/tslib/shortcuts.ts
+++ b/ts/lib/tslib/shortcuts.ts
@@ -34,7 +34,10 @@ const keyCodeLookup = {
     ".": 190,
     "/": 191,
     "`": 192,
-};
+    "!": 49,
+    "*": 56,
+    "@": 50,
+} as const;
 
 function isRequiredModifier(modifier: string): boolean {
     return !modifier.endsWith("?");
@@ -113,6 +116,7 @@ function keyCombinationToCheck(
         keyCombination.slice(0, -1),
     );
 
+    console.log({ keyCode, required, optional });
     return check(keyCode, required, optional);
 }
 
diff --git a/ts/routes/reviewer/reviewer-bottom/More.svelte b/ts/routes/reviewer/reviewer-bottom/More.svelte
index 5220a9a02..8b82b228f 100644
--- a/ts/routes/reviewer/reviewer-bottom/More.svelte
+++ b/ts/routes/reviewer/reviewer-bottom/More.svelte
@@ -9,6 +9,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { setFlag } from "@generated/backend";
     import type { ReviewerState } from "../reviewer";
     import type { MoreMenuItemInfo } from "./types";
+    import Shortcut from "$lib/components/Shortcut.svelte";
 
     let showFloating = false;
     let showFlags = false;
@@ -114,8 +115,30 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         setFlag({ cardIds: [card!.id], flag: index });
         $cardData!.queue!.cards[0].card!.flags = index;
     }
+
+    function prepKeycodeForShortcut(keycode: string) {
+        return keycode.replace("Ctrl", "Control");
+    }
 </script>
 
+{#each shortcuts as shortcut}
+    {#if shortcut !== "hr"}
+        <Shortcut
+            keyCombination={prepKeycodeForShortcut(shortcut.shortcut)}
+            event="keydown"
+            on:action={shortcut.onClick}
+        />
+    {/if}
+{/each}
+
+{#each flags as flag, i}
+    <Shortcut
+        keyCombination={prepKeycodeForShortcut(flag.shortcut)}
+        event="keydown"
+        on:action={() => changeFlag(i + 1)}
+    />
+{/each}
+
 <MoreSubmenu bind:showFloating>
     <button
         slot="button"
@@ -165,7 +188,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                         ? "RGBA(255,0,0,0.25)"
                         : ""}
                 >
-                    <MoreItem shortcut={shortcut.shortcut} on:click={shortcut.onClick}>
+                    <MoreItem
+                        shortcut={shortcut.shortcut}
+                        on:click={shortcut.onClick}
+                        on:keydown={shortcut.onClick}
+                        on:action={console.log}
+                    >
                         {shortcut.name}
                     </MoreItem>
                 </div>
diff --git a/ts/routes/reviewer/reviewer-bottom/MoreItem.svelte b/ts/routes/reviewer/reviewer-bottom/MoreItem.svelte
index 7ce0c2262..353adf74f 100644
--- a/ts/routes/reviewer/reviewer-bottom/MoreItem.svelte
+++ b/ts/routes/reviewer/reviewer-bottom/MoreItem.svelte
@@ -7,7 +7,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </script>
 
 <div class="row" on:click on:keydown role="button" tabindex="0">
-    <!--<Shortcut keyCombination={shortcut}></Shortcut>-->
     <slot />
     <span>{shortcut}</span>
 </div>
diff --git a/ts/routes/reviewer/reviewer.ts b/ts/routes/reviewer/reviewer.ts
index fcf57662b..6f5eb6734 100644
--- a/ts/routes/reviewer/reviewer.ts
+++ b/ts/routes/reviewer/reviewer.ts
@@ -259,12 +259,10 @@ export class ReviewerState {
                 break;
             }
             case "e": {
-                this.displayEditMenu();
-                break;
-            }
-            case "-": {
-                this.buryOrSuspendCurrentCard(false);
-                break;
+                if (!ctrl) {
+                    this.displayEditMenu();
+                    break;
+                }
             }
         }
     }