RSSNext
diff --git a/‎apps/desktop/layer/renderer/package.json
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎apps/desktop/layer/renderer/package.json
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/constants/hotkeys.ts
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎apps/desktop/layer/renderer/src/constants/hotkeys.ts
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎apps/desktop/layer/renderer/src/hooks/common/useSwitchHotkeyScope.ts
Copy file name to clipboard
+6-12Lines changed: 6 additions & 12 deletions b/‎apps/desktop/layer/renderer/src/hooks/common/useSwitchHotkeyScope.ts
Copy file name to clipboard
+6-12Lines changed: 6 additions & 12 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/app-layout/feed-column/desktop.tsx
Copy file name to clipboard
+9-13Lines changed: 9 additions & 13 deletions b/‎apps/desktop/layer/renderer/src/modules/app-layout/feed-column/desktop.tsx
Copy file name to clipboard
+9-13Lines changed: 9 additions & 13 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/command-manager.ts
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎apps/desktop/layer/renderer/src/modules/command/command-manager.ts
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx
Copy file name to clipboard
+105Lines changed: 105 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx
Copy file name to clipboard
+105Lines changed: 105 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/global.tsx
Copy file name to clipboard
+26Lines changed: 26 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/global.tsx
Copy file name to clipboard
+26Lines changed: 26 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/integration.tsx
Copy file name to clipboard
+45Lines changed: 45 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/integration.tsx
Copy file name to clipboard
+45Lines changed: 45 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/layout.tsx
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/layout.tsx
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
@@ -88,6 +88,7 @@
     "react-zoom-pan-pinch": "3.7.0",
     "shiki": "3.3.0",
     "sonner": "2.0.3",
+    "tinykeys": "3.0.0",
     "tldts": "7.0.4",
     "use-context-selector": "2.0.0",
     "use-sync-external-store": "1.5.0",
 
@@ -1,6 +1,6 @@
 export const HotKeyScopeMap = {
-  Home: ["home"],
-  Menu: ["menu"],
-  Modal: ["modal"],
-  DropdownMenu: ["dropdown-menu"],
+  Home: "home",
+  Menu: "menu",
+  Modal: "modal",
+  DropdownMenu: "dropdown-menu",
 }
@@ -4,7 +4,7 @@ import { useHotkeysContext } from "react-hotkeys-hook"
 import { HotKeyScopeMap } from "~/constants"
 
 const allScopes = Object.keys(HotKeyScopeMap).reduce((acc, key) => {
-  acc.push(...HotKeyScopeMap[key])
+  acc.push(HotKeyScopeMap[key])
   return acc
 }, [] as string[])
 export const useSwitchHotKeyScope = () => {
@@ -18,9 +18,7 @@ export const useSwitchHotKeyScope = () => {
       for (const key of allScopes) {
         disableScope(key)
       }
-      for (const key of nextScope) {
-        enableScope(key)
-      }
+      enableScope(nextScope)
     },
     [disableScope, enableScope],
   )
@@ -34,15 +32,11 @@ export const useHotkeyScopeFn = (scope: keyof typeof HotKeyScopeMap) => {
     for (const key of allScopes) {
       disableScope(key)
     }
-    for (const key of scope) {
-      enableScope(key)
-    }
+    enableScope(scope)
     return () => {
-      for (const key of scope) {
-        disableScope(key)
-      }
-      for (const scope of currentScope) {
-        enableScope(scope)
+      disableScope(scope)
+      for (const key of currentScope) {
+        enableScope(key)
       }
     }
   }, [enableScope, disableScope, scope])
 
@@ -12,7 +12,7 @@ import { debounce } from "es-toolkit/compat"
 import type { PropsWithChildren } from "react"
 import * as React from "react"
 import { Suspense, useEffect, useRef, useState } from "react"
-import { useHotkeys } from "react-hotkeys-hook"
+import { useHotkeysContext } from "react-hotkeys-hook"
 import { Trans } from "react-i18next"
 import { useResizable } from "react-resizable-layout"
 import { Outlet } from "react-router"
@@ -40,8 +40,9 @@ import { useI18n } from "~/hooks/common"
 import { EnvironmentIndicator } from "~/modules/app/EnvironmentIndicator"
 import { NetworkStatusIndicator } from "~/modules/app/NetworkStatusIndicator"
 import { LoginModalContent } from "~/modules/auth/LoginModalContent"
+import { COMMAND_ID } from "~/modules/command/commands/id"
+import { useCommandHotkey } from "~/modules/command/hooks/use-register-hotkey"
 import { DebugRegistry } from "~/modules/debug/registry"
-import { useShortcutsModal } from "~/modules/modal/shortcuts"
 import { CmdF } from "~/modules/panel/cmdf"
 import { SearchCmdK } from "~/modules/panel/cmdk"
 import { CmdNTrigger } from "~/modules/panel/cmdn"
@@ -241,17 +242,12 @@ const FeedResponsiveResizerContainer = ({
     }
   }, [feedColumnShow])
 
-  useHotkeys(
-    shortcuts.layout.toggleSidebar.key,
-    () => {
-      setTimelineColumnShow(!feedColumnShow)
-    },
-    {
-      scopes: HotKeyScopeMap.Home,
-    },
-  )
-  const showShortcuts = useShortcutsModal()
-  useHotkeys(shortcuts.layout.showShortcuts.key, showShortcuts)
+  const { activeScopes } = useHotkeysContext()
+  useCommandHotkey({
+    commandId: COMMAND_ID.layout.toggleTimelineColumn,
+    shortcut: shortcuts.layout.toggleSidebar.key,
+    when: activeScopes.includes(HotKeyScopeMap.Home),
+  })
 
   const [delayShowSplitter, setDelayShowSplitter] = useState(feedColumnShow)
 
 
@@ -1,16 +1,16 @@
 import { useRegisterEntryCommands } from "./commands/entry"
+import { useRegisterGlobalCommands } from "./commands/global"
 import { useRegisterIntegrationCommands } from "./commands/integration"
+import { useRegisterLayoutCommands } from "./commands/layout"
 import { useRegisterListCommands } from "./commands/list"
 import { useRegisterSettingsCommands } from "./commands/settings"
 
-export function useRegisterFollowCommands() {
+export const FollowCommandManager = () => {
   useRegisterSettingsCommands()
   useRegisterListCommands()
   useRegisterEntryCommands()
   useRegisterIntegrationCommands()
-}
-
-export const FollowCommandManager = () => {
-  useRegisterFollowCommands()
+  useRegisterGlobalCommands()
+  useRegisterLayoutCommands()
   return null
 }
@@ -28,6 +28,7 @@ import { useTipModal } from "~/modules/wallet/hooks"
 import { entryActions, useEntryStore } from "~/store/entry"
 
 import { useRegisterFollowCommand } from "../hooks/use-register-command"
+import type { Command } from "../types"
 import { COMMAND_ID } from "./id"
 
 const useCollect = () => {
@@ -421,3 +422,107 @@ export const useRegisterEntryCommands = () => {
     },
   )
 }
+
+export type TipCommand = Command<{
+  id: typeof COMMAND_ID.entry.tip
+  fn: (data: { userId?: string | null; feedId?: string; entryId?: string }) => void
+}>
+
+export type StarCommand = Command<{
+  id: typeof COMMAND_ID.entry.star
+  fn: (data: { entryId: string; view?: FeedViewType }) => void
+}>
+
+export type DeleteCommand = Command<{
+  id: typeof COMMAND_ID.entry.delete
+  fn: (data: { entryId: string }) => void
+}>
+
+export type CopyLinkCommand = Command<{
+  id: typeof COMMAND_ID.entry.copyLink
+  fn: (data: { entryId: string }) => void
+}>
+
+export type ExportAsPDFCommand = Command<{
+  id: typeof COMMAND_ID.entry.exportAsPDF
+  fn: (data: { entryId: string }) => void
+}>
+
+export type CopyTitleCommand = Command<{
+  id: typeof COMMAND_ID.entry.copyTitle
+  fn: (data: { entryId: string }) => void
+}>
+
+export type OpenInBrowserCommand = Command<{
+  id: typeof COMMAND_ID.entry.openInBrowser
+  fn: (data: { entryId: string }) => void
+}>
+
+export type ViewSourceContentCommand = Command<{
+  id: typeof COMMAND_ID.entry.viewSourceContent
+  fn: (data: { entryId: string; siteUrl?: string | null | undefined }) => void
+}>
+
+export type ShareCommand = Command<{
+  id: typeof COMMAND_ID.entry.share
+  fn: (data: { entryId: string }) => void
+}>
+
+export type ReadCommand = Command<{
+  id: typeof COMMAND_ID.entry.read
+  fn: (data: { entryId: string }) => void
+}>
+
+export type ReadAboveCommand = Command<{
+  id: typeof COMMAND_ID.entry.readAbove
+  fn: (data: { publishedAt: string }) => void
+}>
+
+export type ReadBelowCommand = Command<{
+  id: typeof COMMAND_ID.entry.readBelow
+  fn: (data: { publishedAt: string }) => void
+}>
+
+export type ToggleAISummaryCommand = Command<{
+  id: typeof COMMAND_ID.entry.toggleAISummary
+  fn: () => void
+}>
+
+export type ToggleAITranslationCommand = Command<{
+  id: typeof COMMAND_ID.entry.toggleAITranslation
+  fn: () => void
+}>
+
+export type ImageGalleryCommand = Command<{
+  id: typeof COMMAND_ID.entry.imageGallery
+  fn: (data: { entryId: string }) => void
+}>
+
+export type TTSCommand = Command<{
+  id: typeof COMMAND_ID.entry.tts
+  fn: (data: { entryId: string; entryContent: string }) => void
+}>
+
+export type ReadabilityCommand = Command<{
+  id: typeof COMMAND_ID.entry.readability
+  fn: (data: { entryId: string; entryUrl: string }) => void
+}>
+
+export type EntryCommand =
+  | TipCommand
+  | StarCommand
+  | DeleteCommand
+  | CopyLinkCommand
+  | ExportAsPDFCommand
+  | CopyTitleCommand
+  | OpenInBrowserCommand
+  | ViewSourceContentCommand
+  | ShareCommand
+  | ReadCommand
+  | ReadAboveCommand
+  | ReadBelowCommand
+  | ToggleAISummaryCommand
+  | ToggleAITranslationCommand
+  | ImageGalleryCommand
+  | TTSCommand
+  | ReadabilityCommand
@@ -0,0 +1,26 @@
+import { useShortcutsModal } from "~/modules/modal/shortcuts"
+
+import { useRegisterCommandEffect } from "../hooks/use-register-command"
+import type { Command } from "../types"
+import { COMMAND_ID } from "./id"
+
+export const useRegisterGlobalCommands = () => {
+  const showShortcuts = useShortcutsModal()
+
+  useRegisterCommandEffect([
+    {
+      id: COMMAND_ID.global.showShortcuts,
+      label: "Show shortcuts",
+      run: () => {
+        showShortcuts()
+      },
+    },
+  ])
+}
+
+export type ShowShortcutsCommand = Command<{
+  id: typeof COMMAND_ID.global.showShortcuts
+  fn: () => void
+}>
+
+export type GlobalCommand = ShowShortcutsCommand
@@ -41,4 +41,10 @@ export const COMMAND_ID = {
     changeThemeToLight: "follow:change-color-mode-to-light",
     customizeToolbar: "follow:customize-toolbar",
   },
+  global: {
+    showShortcuts: "global:show-shortcuts",
+  },
+  layout: {
+    toggleTimelineColumn: "layout:toggle-timeline-column",
+  },
 } as const
@@ -28,6 +28,7 @@ import { useEntryStore } from "~/store/entry"
 
 import { useRegisterCommandEffect } from "../hooks/use-register-command"
 import { defineFollowCommand } from "../registry/command"
+import type { Command } from "../types"
 import { COMMAND_ID } from "./id"
 
 export const useRegisterIntegrationCommands = () => {
@@ -558,3 +559,47 @@ const buildMemoRequestBody = (entry: FlatEntryModel, selectedText: string) => {
     source_url: entry.entries.url,
   }
 }
+
+export type SaveToEagleCommand = Command<{
+  id: typeof COMMAND_ID.integration.saveToEagle
+  fn: (payload: { entryId: string }) => void
+}>
+
+export type SaveToReadwiseCommand = Command<{
+  id: typeof COMMAND_ID.integration.saveToReadwise
+  fn: (payload: { entryId: string }) => void
+}>
+
+export type SaveToInstapaperCommand = Command<{
+  id: typeof COMMAND_ID.integration.saveToInstapaper
+  fn: (payload: { entryId: string }) => void
+}>
+
+export type SaveToObsidianCommand = Command<{
+  id: typeof COMMAND_ID.integration.saveToObsidian
+  fn: (payload: { entryId: string }) => void
+}>
+
+export type SaveToOutlineCommand = Command<{
+  id: typeof COMMAND_ID.integration.saveToOutline
+  fn: (payload: { entryId: string }) => void
+}>
+
+export type SaveToReadeckCommand = Command<{
+  id: typeof COMMAND_ID.integration.saveToReadeck
+  fn: (payload: { entryId: string }) => void
+}>
+
+export type SaveToCuboxCommand = Command<{
+  id: typeof COMMAND_ID.integration.saveToCubox
+  fn: (payload: { entryId: string }) => void
+}>
+
+export type IntegrationCommand =
+  | SaveToEagleCommand
+  | SaveToReadwiseCommand
+  | SaveToInstapaperCommand
+  | SaveToObsidianCommand
+  | SaveToOutlineCommand
+  | SaveToReadeckCommand
+  | SaveToCuboxCommand
@@ -0,0 +1,24 @@
+import { setTimelineColumnShow } from "~/atoms/sidebar"
+
+import { useRegisterCommandEffect } from "../hooks/use-register-command"
+import type { Command } from "../types"
+import { COMMAND_ID } from "./id"
+
+export const useRegisterLayoutCommands = () => {
+  useRegisterCommandEffect([
+    {
+      id: COMMAND_ID.layout.toggleTimelineColumn,
+      label: "Toggle timeline column",
+      run: () => {
+        setTimelineColumnShow((show) => !show)
+      },
+    },
+  ])
+}
+
+export type ToggleTimelineColumnCommand = Command<{
+  id: typeof COMMAND_ID.layout.toggleTimelineColumn
+  fn: () => void
+}>
+
+export type LayoutCommand = ToggleTimelineColumnCommand