RSSNext
diff --git a/‎apps/desktop/layer/renderer/src/atoms/context-menu.ts
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎apps/desktop/layer/renderer/src/atoms/context-menu.ts
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎apps/desktop/layer/renderer/src/constants/shortcuts.ts
Copy file name to clipboard
+18-13Lines changed: 18 additions & 13 deletions b/‎apps/desktop/layer/renderer/src/constants/shortcuts.ts
Copy file name to clipboard
+18-13Lines changed: 18 additions & 13 deletions
diff --git a/‎apps/desktop/layer/renderer/src/hooks/biz/useFeedActions.tsx
Copy file name to clipboard
+13-12Lines changed: 13 additions & 12 deletions b/‎apps/desktop/layer/renderer/src/hooks/biz/useFeedActions.tsx
Copy file name to clipboard
+13-12Lines changed: 13 additions & 12 deletions
diff --git a/‎apps/desktop/layer/renderer/src/hooks/biz/useSubscriptionActions.tsx
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎apps/desktop/layer/renderer/src/hooks/biz/useSubscriptionActions.tsx
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/desktop/layer/renderer/src/modules/app-layout/feed-column/mobile.tsx
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎apps/desktop/layer/renderer/src/modules/app-layout/feed-column/mobile.tsx
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/subscription.tsx
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/subscription.tsx
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/hooks/use-command-binding.ts
Copy file name to clipboard
+45-2Lines changed: 45 additions & 2 deletions b/‎apps/desktop/layer/renderer/src/modules/command/hooks/use-command-binding.ts
Copy file name to clipboard
+45-2Lines changed: 45 additions & 2 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/hooks/use-command-shortcut.ts
Copy file name to clipboard
-44Lines changed: 0 additions & 44 deletions b/‎apps/desktop/layer/renderer/src/modules/command/hooks/use-command-shortcut.ts
Copy file name to clipboard
-44Lines changed: 0 additions & 44 deletions
@@ -56,6 +56,7 @@ export type FollowMenuItem = MenuItemText | MenuItemSeparator
 export type MenuItemInput = MenuItemText | MenuItemSeparator | NilValue
 
 function sortShortcutsString(shortcut: string) {
+  shortcut = shortcut.replace("$mod", "Meta")
   const order = ["Shift", "Ctrl", "Meta", "Alt"]
   const nextShortcut = transformShortcut(shortcut)
 
@@ -101,7 +102,7 @@ function transformMenuItemsForNative(nextItems: FollowMenuItem[]): ElectronMenuI
       click: item.click,
       enabled:
         (!item.disabled && item.click !== undefined) || (!!item.submenu && item.submenu.length > 0),
-      accelerator: item.shortcut?.replace("Meta", "CmdOrCtrl"),
+      accelerator: item.shortcut?.replace("$mod", "CmdOrCtrl"),
       checked: typeof item.checked === "boolean" ? item.checked : undefined,
       submenu:
         item.submenu.length > 0
 
@@ -11,7 +11,7 @@ const shortcutConfigs = {
   subscriptions: {
     add: {
       name: tShortcuts("keys.subscriptions.add"),
-      key: "Meta+T",
+      key: "$mod+T",
     },
     switchToView: {
       name: tShortcuts("keys.subscriptions.switchToView"),
@@ -37,19 +37,27 @@ const shortcutConfigs = {
       name: tShortcuts("keys.subscriptions.toggleFolderCollapse"),
       key: "Z",
     },
+    openInBrowser: {
+      name: tShortcuts("keys.subscriptions.openInBrowser"),
+      key: "O",
+    },
+    markAllAsRead: {
+      name: tShortcuts("keys.entries.markAllAsRead"),
+      key: "Shift+$mod+A",
+    },
   },
   layout: {
     toggleSidebar: {
       name: tShortcuts("keys.layout.toggleSidebar"),
-      key: "Meta+B, [",
+      key: "$mod+B, [",
     },
     showShortcuts: {
       name: tShortcuts("keys.layout.showShortcuts"),
       key: "?",
     },
     toggleWideMode: {
       name: tShortcuts("keys.layout.toggleWideMode"),
-      key: "Meta+[",
+      key: "$mod+[",
     },
     zenMode: {
       name: tShortcuts("keys.layout.zenMode"),
@@ -69,10 +77,7 @@ const shortcutConfigs = {
       name: tShortcuts("keys.entries.next"),
       key: "J, ArrowDown",
     },
-    markAllAsRead: {
-      name: tShortcuts("keys.entries.markAllAsRead"),
-      key: "Shift+Meta+A",
-    },
+
     toggleUnreadOnly: {
       name: tShortcuts("keys.entries.toggleUnreadOnly"),
       key: "U",
@@ -94,23 +99,23 @@ const shortcutConfigs = {
     },
     tts: {
       name: tShortcuts("keys.entry.tts"),
-      key: "Shift+Meta+V",
+      key: "Shift+$mod+V",
     },
     copyLink: {
       name: tShortcuts("keys.entry.copyLink"),
-      key: "Shift+Meta+C",
+      key: "Shift+$mod+C",
     },
     copyTitle: {
       name: tShortcuts("keys.entry.copyTitle"),
-      key: "Shift+Meta+B",
+      key: "Shift+$mod+B",
     },
     tip: {
       name: tShortcuts("keys.entry.tip"),
-      key: "Shift+Meta+T",
+      key: "Shift+$mod+T",
     },
     share: {
       name: tShortcuts("keys.entry.share"),
-      key: "Meta+Alt+S",
+      key: "$mod+Alt+S",
     },
     scrollUp: {
       name: tShortcuts("keys.entry.scrollUp"),
@@ -138,7 +143,7 @@ const shortcutConfigs = {
   misc: {
     quickSearch: {
       name: tShortcuts("keys.misc.quickSearch"),
-      key: "Meta+K",
+      key: "$mod+K",
     },
   },
 } as const
 
@@ -13,6 +13,7 @@ import { MenuItemSeparator, MenuItemText } from "~/atoms/context-menu"
 import { useIsInMASReview } from "~/atoms/server-configs"
 import { whoami } from "~/atoms/user"
 import { useModalStack } from "~/components/ui/modal/stacked/hooks"
+import { shortcuts } from "~/constants/shortcuts"
 import { apiClient } from "~/lib/api-fetch"
 import { UrlBuilder } from "~/lib/url-builder"
 import { useBoostModal } from "~/modules/boost/hooks"
@@ -115,7 +116,7 @@ export const useFeedActions = ({
     const items: MenuItemInput[] = [
       new MenuItemText({
         label: t("sidebar.feed_actions.mark_all_as_read"),
-        shortcut: "Meta+Shift+A",
+        shortcut: "$mod+Shift+A",
         disabled: isEntryList,
         click: () =>
           subscriptionActions.markReadByFeedIds({
@@ -269,7 +270,7 @@ export const useFeedActions = ({
           : isEntryList
             ? t("sidebar.feed_actions.unfollow_feed")
             : t("sidebar.feed_actions.unfollow"),
-        shortcut: "Meta+Backspace",
+        shortcut: "$mod+Backspace",
         disabled: isInbox,
         supportMultipleSelection: true,
         click: () => {
@@ -292,7 +293,7 @@ export const useFeedActions = ({
       }),
       new MenuItemText({
         label: t("sidebar.feed_actions.navigate_to_feed"),
-        shortcut: "Meta+G",
+        shortcut: "$mod+G",
         disabled: isInbox || !isEntryList || getRouteParams().feedId === feedId,
         click: () => {
           navigateEntry({ feedId })
@@ -311,7 +312,7 @@ export const useFeedActions = ({
         label: t("sidebar.feed_actions.open_site_in_browser", {
           which: t(IN_ELECTRON ? "words.browser" : "words.newTab"),
         }),
-        shortcut: "Meta+O",
+        shortcut: "$mod+O",
         disabled: isEntryList,
         click: () => {
           const feed = getFeedById(feedId)
@@ -324,7 +325,7 @@ export const useFeedActions = ({
       new MenuItemText({
         label: t("sidebar.feed_actions.copy_feed_url"),
         disabled: isEntryList,
-        shortcut: "Meta+C",
+        shortcut: "$mod+C",
         click: () => {
           const { url, siteUrl } = feed || {}
           const copied = url || siteUrl
@@ -334,7 +335,7 @@ export const useFeedActions = ({
       }),
       new MenuItemText({
         label: t("sidebar.feed_actions.copy_feed_id"),
-        shortcut: "Meta+Shift+C",
+        shortcut: "$mod+Shift+C",
         disabled: isEntryList,
         click: () => {
           navigator.clipboard.writeText(feedId)
@@ -419,12 +420,12 @@ export const useListActions = ({ listId, view }: { listId: string; view?: FeedVi
       }),
       new MenuItemText({
         label: t("sidebar.feed_actions.unfollow"),
-        shortcut: "Meta+Backspace",
+        shortcut: "$mod+Backspace",
         click: () => deleteSubscription({ subscription }),
       }),
       new MenuItemText({
         label: t("sidebar.feed_actions.navigate_to_list"),
-        shortcut: "Meta+G",
+        shortcut: "$mod+G",
         disabled: getRouteParams().feedId === listId,
         click: () => {
           navigateEntry({ listId })
@@ -435,20 +436,20 @@ export const useListActions = ({ listId, view }: { listId: string; view?: FeedVi
         label: t("sidebar.feed_actions.open_list_in_browser", {
           which: t(IN_ELECTRON ? "words.browser" : "words.newTab"),
         }),
-        shortcut: "O",
+        shortcut: shortcuts.subscriptions.openInBrowser.key,
         click: () => window.open(UrlBuilder.shareList(listId, view), "_blank"),
       }),
       MenuItemSeparator.default,
       new MenuItemText({
         label: t("sidebar.feed_actions.copy_list_url"),
-        shortcut: "Meta+C",
+        shortcut: "$mod+C",
         click: () => {
           navigator.clipboard.writeText(UrlBuilder.shareList(listId, view))
         },
       }),
       new MenuItemText({
         label: t("sidebar.feed_actions.copy_list_id"),
-        shortcut: "Meta+Shift+C",
+        shortcut: "$mod+Shift+C",
         click: () => {
           navigator.clipboard.writeText(listId)
         },
@@ -483,7 +484,7 @@ export const useInboxActions = ({ inboxId }: { inboxId: string }) => {
       MenuItemSeparator.default,
       new MenuItemText({
         label: t("sidebar.feed_actions.copy_email_address"),
-        shortcut: "Meta+Shift+C",
+        shortcut: "$mod+Shift+C",
         click: () => {
           navigator.clipboard.writeText(`${inboxId}${env.VITE_INBOXES_EMAIL}`)
         },
 
@@ -65,7 +65,7 @@ export const useDeleteSubscription = ({ onSuccess }: { onSuccess?: () => void }
               <span className="flex items-center gap-1">
                 {t("words.undo")}
                 <Kbd className="border-border inline-flex items-center border bg-transparent text-white">
-                  Meta+Z
+                  $mod+Z
                 </Kbd>
               </span>
             ),
 
@@ -37,7 +37,7 @@ export function FeedColumnMobile({ asWidget }: { asWidget?: boolean }) {
         </span>
         <div className="center inline-flex">
           <Link to="/discover" tabIndex={-1}>
-            <ActionButton shortcut="Meta+T" tooltip={t("words.discover")}>
+            <ActionButton shortcut="$mod+T" tooltip={t("words.discover")}>
               <i className="i-mgc-add-cute-re text-text-secondary size-5" />
             </ActionButton>
           </Link>
 
@@ -76,5 +76,6 @@ export const COMMAND_ID = {
     previousSubscription: "subscription:previous",
 
     toggleFolderCollapse: "subscription:toggle-folder-collapse",
+    markAllAsRead: "subscription:mark-all-as-read",
   },
 } as const
@@ -1,5 +1,8 @@
 import { EventBus } from "@follow/utils/event-bus"
 
+import type { BizRouteParams } from "~/hooks/biz/useRouteParams"
+import { getRouteParams } from "~/hooks/biz/useRouteParams"
+
 import { useRegisterCommandEffect } from "../hooks/use-register-command"
 import type { Command } from "../types"
 import { COMMAND_ID } from "./id"
@@ -18,6 +21,7 @@ declare module "@follow/utils/event-bus" {
     "subscription:next": never
     "subscription:previous": never
     "subscription:toggle-folder-collapse": never
+    "subscription:mark-all-as-read": BizRouteParams
   }
 }
 const LABEL_PREFIX = "Subscription"
@@ -100,6 +104,14 @@ export const useRegisterSubscriptionCommands = () => {
         EventBus.dispatch(COMMAND_ID.subscription.toggleFolderCollapse)
       },
     },
+    {
+      id: COMMAND_ID.subscription.markAllAsRead,
+      label: `${LABEL_PREFIX}: Mark All as Read`,
+      run: () => {
+        const routeParams = getRouteParams()
+        EventBus.dispatch(COMMAND_ID.subscription.markAllAsRead, routeParams)
+      },
+    },
   ])
 }
 
@@ -158,6 +170,11 @@ type ToggleFolderCollapseCommand = Command<{
   fn: () => void
 }>
 
+type MarkAllAsReadCommand = Command<{
+  id: typeof COMMAND_ID.subscription.markAllAsRead
+  fn: () => void
+}>
+
 export type SubscriptionCommand =
   | SwitchTabToNextCommand
   | SwitchTabToPreviousCommand
@@ -170,3 +187,4 @@ export type SubscriptionCommand =
   | NextSubscriptionCommand
   | PreviousSubscriptionCommand
   | ToggleFolderCollapseCommand
+  | MarkAllAsReadCommand
@@ -1,8 +1,51 @@
-import type { BindingCommandId } from "./use-command-shortcut"
-import { useCommandShortcut } from "./use-command-shortcut"
+import { shortcuts } from "~/constants/shortcuts"
+
+import { COMMAND_ID } from "../commands/id"
 import type { RegisterHotkeyOptions } from "./use-register-hotkey"
 import { useCommandHotkey } from "./use-register-hotkey"
 
+const defaultCommandShortcuts = {
+  [COMMAND_ID.entry.read]: shortcuts.entry.toggleRead.key,
+  [COMMAND_ID.entry.openInBrowser]: shortcuts.entry.openInBrowser.key,
+  [COMMAND_ID.entry.star]: shortcuts.entry.toggleStarred.key,
+  [COMMAND_ID.entry.copyLink]: shortcuts.entry.copyLink.key,
+  [COMMAND_ID.entry.copyTitle]: shortcuts.entry.copyTitle.key,
+  [COMMAND_ID.entry.tts]: shortcuts.entry.tts.key,
+  [COMMAND_ID.entry.tip]: shortcuts.entry.tip.key,
+  [COMMAND_ID.entry.share]: shortcuts.entry.share.key,
+
+  [COMMAND_ID.entryRender.scrollUp]: shortcuts.entry.scrollUp.key,
+  [COMMAND_ID.entryRender.scrollDown]: shortcuts.entry.scrollDown.key,
+
+  [COMMAND_ID.timeline.switchToNext]: shortcuts.entries.next.key,
+  [COMMAND_ID.timeline.switchToPrevious]: shortcuts.entries.previous.key,
+  [COMMAND_ID.timeline.refetch]: shortcuts.entries.refetch.key,
+
+  [COMMAND_ID.layout.toggleTimelineColumn]: shortcuts.layout.toggleSidebar.key,
+
+  [COMMAND_ID.subscription.nextSubscription]: shortcuts.subscriptions.nextSubscription.key,
+  [COMMAND_ID.subscription.previousSubscription]: shortcuts.subscriptions.previousSubscription.key,
+  [COMMAND_ID.subscription.switchTabToNext]: shortcuts.subscriptions.switchNextView.key,
+  [COMMAND_ID.subscription.switchTabToPrevious]: shortcuts.subscriptions.switchPreviousView.key,
+
+  [COMMAND_ID.global.showShortcuts]: shortcuts.layout.showShortcuts.key,
+
+  [COMMAND_ID.entryRender.nextEntry]: shortcuts.entry.nextEntry.key,
+  [COMMAND_ID.entryRender.previousEntry]: shortcuts.entry.previousEntry.key,
+
+  [COMMAND_ID.subscription.toggleFolderCollapse]: shortcuts.subscriptions.toggleFolderCollapse.key,
+  [COMMAND_ID.subscription.markAllAsRead]: shortcuts.subscriptions.markAllAsRead.key,
+} as const
+
+export type BindingCommandId = keyof typeof defaultCommandShortcuts
+
+// eslint-disable-next-line @eslint-react/hooks-extra/no-unnecessary-use-prefix, @eslint-react/hooks-extra/ensure-custom-hooks-using-other-hooks
+export const useCommandShortcut = (commandId: BindingCommandId): string => {
+  const commandShortcut = defaultCommandShortcuts[commandId]
+
+  return commandShortcut
+}
+
 export const useCommandBinding = <T extends BindingCommandId>({
   commandId,
   when = true,