)
if (isMobile) {
diff --git a/apps/desktop/layer/renderer/src/modules/boost/boost-progress.tsx b/apps/desktop/layer/renderer/src/modules/boost/boost-progress.tsx
index 2092db5fe..e915b2d7c 100644
--- a/apps/desktop/layer/renderer/src/modules/boost/boost-progress.tsx
+++ b/apps/desktop/layer/renderer/src/modules/boost/boost-progress.tsx
@@ -24,7 +24,7 @@ export const BoostProgress = ({
const nextLevel = level + 1
return (
-
diff --git a/apps/desktop/layer/renderer/src/modules/command/command-button.test-d.ts b/apps/desktop/layer/renderer/src/modules/command/command-button.test-d.ts
index d2d611c93..3cc5d02fa 100644
--- a/apps/desktop/layer/renderer/src/modules/command/command-button.test-d.ts
+++ b/apps/desktop/layer/renderer/src/modules/command/command-button.test-d.ts
@@ -1,8 +1,8 @@
import { assertType, test } from "vitest"
import { CommandActionButton, CommandIdButton } from "./command-button"
+import type { OpenInBrowserCommand, TipCommand } from "./commands/entry"
import { COMMAND_ID } from "./commands/id"
-import type { OpenInBrowserCommand, TipCommand } from "./commands/types"
test("CommandActionButton types", () => {
const mockCommand = {} as OpenInBrowserCommand
diff --git a/apps/desktop/layer/renderer/src/modules/command/command-manager.ts b/apps/desktop/layer/renderer/src/modules/command/command-manager.ts
index 63eb4b674..0c5d34957 100644
--- a/apps/desktop/layer/renderer/src/modules/command/command-manager.ts
+++ b/apps/desktop/layer/renderer/src/modules/command/command-manager.ts
@@ -1,16 +1,22 @@
import { useRegisterEntryCommands } from "./commands/entry"
+import { useRegisterEntryRenderCommand } from "./commands/entry-render"
+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"
+import { useRegisterSubscriptionCommands } from "./commands/subscription"
+import { useRegisterTimelineCommand } from "./commands/timeline"
-export function useRegisterFollowCommands() {
+export const FollowCommandManager = () => {
useRegisterSettingsCommands()
useRegisterListCommands()
useRegisterEntryCommands()
useRegisterIntegrationCommands()
-}
-
-export const FollowCommandManager = () => {
- useRegisterFollowCommands()
+ useRegisterGlobalCommands()
+ useRegisterLayoutCommands()
+ useRegisterTimelineCommand()
+ useRegisterEntryRenderCommand()
+ useRegisterSubscriptionCommands()
return null
}
diff --git a/apps/desktop/layer/renderer/src/modules/command/commands/entry-render.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/entry-render.tsx
new file mode 100644
index 000000000..29682f14f
--- /dev/null
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/entry-render.tsx
@@ -0,0 +1,81 @@
+import { EventBus } from "@follow/utils/event-bus"
+
+import { useRegisterCommandEffect } from "../hooks/use-register-command"
+import type { Command } from "../types"
+import { COMMAND_ID } from "./id"
+
+declare module "@follow/utils/event-bus" {
+ interface EventBusMap {
+ "entry-render:scroll-down": never
+ "entry-render:scroll-up": never
+ "entry-render:next-entry": never
+ "entry-render:previous-entry": never
+ }
+}
+const LABEL_PREFIX = "Entry Render"
+
+const category = "follow:entry-render"
+export const useRegisterEntryRenderCommand = () => {
+ useRegisterCommandEffect([
+ {
+ id: COMMAND_ID.entryRender.scrollDown,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.entryRender.scrollDown)
+ },
+ category,
+ label: `${LABEL_PREFIX}: Scroll down`,
+ },
+ {
+ id: COMMAND_ID.entryRender.scrollUp,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.entryRender.scrollUp)
+ },
+ category,
+ label: `${LABEL_PREFIX}: Scroll up`,
+ },
+ {
+ id: COMMAND_ID.entryRender.nextEntry,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.timeline.switchToNext)
+ EventBus.dispatch(COMMAND_ID.entryRender.nextEntry)
+ },
+ category,
+ label: `${LABEL_PREFIX}: Next entry`,
+ },
+ {
+ id: COMMAND_ID.entryRender.previousEntry,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.timeline.switchToPrevious)
+ EventBus.dispatch(COMMAND_ID.entryRender.previousEntry)
+ },
+ category,
+ label: `${LABEL_PREFIX}: Previous entry`,
+ },
+ ])
+}
+
+type EntryScrollDownCommand = Command<{
+ id: typeof COMMAND_ID.entryRender.scrollDown
+ fn: () => void
+}>
+
+type EntryScrollUpCommand = Command<{
+ id: typeof COMMAND_ID.entryRender.scrollUp
+ fn: () => void
+}>
+
+type EntryNextEntryCommand = Command<{
+ id: typeof COMMAND_ID.entryRender.nextEntry
+ fn: () => void
+}>
+
+type EntryPreviousEntryCommand = Command<{
+ id: typeof COMMAND_ID.entryRender.previousEntry
+ fn: () => void
+}>
+
+export type EntryRenderCommand =
+ | EntryScrollDownCommand
+ | EntryScrollUpCommand
+ | EntryNextEntryCommand
+ | EntryPreviousEntryCommand
diff --git a/apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx
index ad6654795..f0eb7d157 100644
--- a/apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx
@@ -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
diff --git a/apps/desktop/layer/renderer/src/modules/command/commands/global.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/global.tsx
new file mode 100644
index 000000000..60fd1a3d2
--- /dev/null
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/global.tsx
@@ -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
diff --git a/apps/desktop/layer/renderer/src/modules/command/commands/id.ts b/apps/desktop/layer/renderer/src/modules/command/commands/id.ts
index 5790d9a24..629e08af5 100644
--- a/apps/desktop/layer/renderer/src/modules/command/commands/id.ts
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/id.ts
@@ -41,4 +41,39 @@ 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",
+ focusToTimeline: "layout:focus-to-timeline",
+ focusToSubscription: "layout:focus-to-subscription",
+ },
+ timeline: {
+ switchToNext: "timeline:switch-to-next",
+ switchToPrevious: "timeline:switch-to-previous",
+ refetch: "timeline:refetch",
+ enter: "timeline:enter",
+ },
+ entryRender: {
+ scrollDown: "entry-render:scroll-down",
+ scrollUp: "entry-render:scroll-up",
+ nextEntry: "entry-render:next-entry",
+ previousEntry: "entry-render:previous-entry",
+ },
+ subscription: {
+ switchTabToNext: "subscription:switch-tab-to-next",
+ switchTabToPrevious: "subscription:switch-tab-to-previous",
+ switchTabToArticle: "subscription:switch-tab-to-article",
+ switchTabToSocial: "subscription:switch-tab-to-social",
+ switchTabToPicture: "subscription:switch-tab-to-picture",
+ switchTabToVideo: "subscription:switch-tab-to-video",
+ switchTabToAudio: "subscription:switch-tab-to-audio",
+ switchTabToNotification: "subscription:switch-tab-to-notification",
+
+ nextSubscription: "subscription:next",
+ previousSubscription: "subscription:previous",
+
+ toggleFolderCollapse: "subscription:toggle-folder-collapse",
+ },
} as const
diff --git a/apps/desktop/layer/renderer/src/modules/command/commands/integration.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/integration.tsx
index 508b97e4b..7895ad87e 100644
--- a/apps/desktop/layer/renderer/src/modules/command/commands/integration.tsx
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/integration.tsx
@@ -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
diff --git a/apps/desktop/layer/renderer/src/modules/command/commands/layout.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/layout.tsx
new file mode 100644
index 000000000..9c7aadd09
--- /dev/null
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/layout.tsx
@@ -0,0 +1,59 @@
+import { EventBus } from "@follow/utils/event-bus"
+
+import { setTimelineColumnShow } from "~/atoms/sidebar"
+
+import { useRegisterCommandEffect } from "../hooks/use-register-command"
+import type { Command } from "../types"
+import { COMMAND_ID } from "./id"
+
+declare module "@follow/utils/event-bus" {
+ interface EventBusMap {
+ "layout:focus-to-timeline": never
+ "layout:focus-to-subscription": never
+ }
+}
+
+export const useRegisterLayoutCommands = () => {
+ useRegisterCommandEffect([
+ {
+ id: COMMAND_ID.layout.toggleTimelineColumn,
+ label: "Toggle timeline column",
+ run: () => {
+ setTimelineColumnShow((show) => !show)
+ },
+ },
+ {
+ id: COMMAND_ID.layout.focusToTimeline,
+ label: "Focus to timeline",
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.layout.focusToTimeline)
+ },
+ },
+ {
+ id: COMMAND_ID.layout.focusToSubscription,
+ label: "Focus to subscription",
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.layout.focusToSubscription)
+ },
+ },
+ ])
+}
+
+export type FocusToSubscriptionCommand = Command<{
+ id: typeof COMMAND_ID.layout.focusToSubscription
+ fn: () => void
+}>
+
+export type ToggleTimelineColumnCommand = Command<{
+ id: typeof COMMAND_ID.layout.toggleTimelineColumn
+ fn: () => void
+}>
+
+export type FocusToTimelineCommand = Command<{
+ id: typeof COMMAND_ID.layout.focusToTimeline
+ fn: () => void
+}>
+export type LayoutCommand =
+ | ToggleTimelineColumnCommand
+ | FocusToTimelineCommand
+ | FocusToSubscriptionCommand
diff --git a/apps/desktop/layer/renderer/src/modules/command/commands/settings.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/settings.tsx
index 2dc753a12..6231b0992 100644
--- a/apps/desktop/layer/renderer/src/modules/command/commands/settings.tsx
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/settings.tsx
@@ -5,6 +5,7 @@ import { useSetTheme } from "~/hooks/common"
import { useShowCustomizeToolbarModal } from "~/modules/customize-toolbar/modal"
import { useRegisterCommandEffect } from "../hooks/use-register-command"
+import type { Command } from "../types"
import { COMMAND_ID } from "./id"
export const useRegisterSettingsCommands = () => {
@@ -66,3 +67,10 @@ const useRegisterThemeCommands = () => {
},
])
}
+
+export type CustomizeToolbarCommand = Command<{
+ id: typeof COMMAND_ID.settings.customizeToolbar
+ fn: () => void
+}>
+
+export type SettingsCommand = CustomizeToolbarCommand
diff --git a/apps/desktop/layer/renderer/src/modules/command/commands/subscription.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/subscription.tsx
new file mode 100644
index 000000000..ba93f3cdd
--- /dev/null
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/subscription.tsx
@@ -0,0 +1,172 @@
+import { EventBus } from "@follow/utils/event-bus"
+
+import { useRegisterCommandEffect } from "../hooks/use-register-command"
+import type { Command } from "../types"
+import { COMMAND_ID } from "./id"
+
+declare module "@follow/utils/event-bus" {
+ interface EventBusMap {
+ "subscription:switch-tab-to-next": never
+ "subscription:switch-tab-to-previous": never
+ "subscription:switch-tab-to-article": never
+ "subscription:switch-tab-to-social": never
+ "subscription:switch-tab-to-picture": never
+ "subscription:switch-tab-to-video": never
+ "subscription:switch-tab-to-audio": never
+ "subscription:switch-tab-to-notification": never
+
+ "subscription:next": never
+ "subscription:previous": never
+ "subscription:toggle-folder-collapse": never
+ }
+}
+const LABEL_PREFIX = "Subscription"
+export const useRegisterSubscriptionCommands = () => {
+ useRegisterCommandEffect([
+ {
+ id: COMMAND_ID.subscription.switchTabToNext,
+ label: `${LABEL_PREFIX}: Switch to next tab`,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.subscription.switchTabToNext)
+ },
+ },
+ {
+ id: COMMAND_ID.subscription.switchTabToPrevious,
+ label: `${LABEL_PREFIX}: Switch to previous tab`,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.subscription.switchTabToPrevious)
+ },
+ },
+ {
+ id: COMMAND_ID.subscription.switchTabToArticle,
+ label: `${LABEL_PREFIX}: Switch to article tab`,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.subscription.switchTabToArticle)
+ },
+ },
+ {
+ id: COMMAND_ID.subscription.switchTabToSocial,
+ label: `${LABEL_PREFIX}: Switch to social tab`,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.subscription.switchTabToSocial)
+ },
+ },
+ {
+ id: COMMAND_ID.subscription.switchTabToPicture,
+ label: `${LABEL_PREFIX}: Switch to picture tab`,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.subscription.switchTabToPicture)
+ },
+ },
+ {
+ id: COMMAND_ID.subscription.switchTabToVideo,
+ label: `${LABEL_PREFIX}: Switch to video tab`,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.subscription.switchTabToVideo)
+ },
+ },
+ {
+ id: COMMAND_ID.subscription.switchTabToAudio,
+ label: `${LABEL_PREFIX}: Switch to audio tab`,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.subscription.switchTabToAudio)
+ },
+ },
+ {
+ id: COMMAND_ID.subscription.switchTabToNotification,
+ label: `${LABEL_PREFIX}: Switch to notification tab`,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.subscription.switchTabToNotification)
+ },
+ },
+ {
+ id: COMMAND_ID.subscription.nextSubscription,
+ label: `${LABEL_PREFIX}: Next Subscription`,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.subscription.nextSubscription)
+ },
+ },
+ {
+ id: COMMAND_ID.subscription.previousSubscription,
+ label: `${LABEL_PREFIX}: Previous Subscription`,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.subscription.previousSubscription)
+ },
+ },
+ {
+ id: COMMAND_ID.subscription.toggleFolderCollapse,
+ label: `${LABEL_PREFIX}: Toggle Folder Collapse`,
+ run: () => {
+ EventBus.dispatch(COMMAND_ID.subscription.toggleFolderCollapse)
+ },
+ },
+ ])
+}
+
+type SwitchTabToNextCommand = Command<{
+ id: typeof COMMAND_ID.subscription.switchTabToNext
+ fn: () => void
+}>
+
+type SwitchTabToPreviousCommand = Command<{
+ id: typeof COMMAND_ID.subscription.switchTabToPrevious
+ fn: () => void
+}>
+
+type SwitchTabToArticleCommand = Command<{
+ id: typeof COMMAND_ID.subscription.switchTabToArticle
+ fn: () => void
+}>
+
+type SwitchTabToSocialCommand = Command<{
+ id: typeof COMMAND_ID.subscription.switchTabToSocial
+ fn: () => void
+}>
+
+type SwitchTabToPictureCommand = Command<{
+ id: typeof COMMAND_ID.subscription.switchTabToPicture
+ fn: () => void
+}>
+
+type SwitchTabToVideoCommand = Command<{
+ id: typeof COMMAND_ID.subscription.switchTabToVideo
+ fn: () => void
+}>
+
+type SwitchTabToAudioCommand = Command<{
+ id: typeof COMMAND_ID.subscription.switchTabToAudio
+ fn: () => void
+}>
+
+type SwitchTabToNotificationCommand = Command<{
+ id: typeof COMMAND_ID.subscription.switchTabToNotification
+ fn: () => void
+}>
+
+type NextSubscriptionCommand = Command<{
+ id: typeof COMMAND_ID.subscription.nextSubscription
+ fn: () => void
+}>
+
+type PreviousSubscriptionCommand = Command<{
+ id: typeof COMMAND_ID.subscription.previousSubscription
+ fn: () => void
+}>
+
+type ToggleFolderCollapseCommand = Command<{
+ id: typeof COMMAND_ID.subscription.toggleFolderCollapse
+ fn: () => void
+}>
+
+export type SubscriptionCommand =
+ | SwitchTabToNextCommand
+ | SwitchTabToPreviousCommand
+ | SwitchTabToArticleCommand
+ | SwitchTabToSocialCommand
+ | SwitchTabToPictureCommand
+ | SwitchTabToVideoCommand
+ | SwitchTabToAudioCommand
+ | SwitchTabToNotificationCommand
+ | NextSubscriptionCommand
+ | PreviousSubscriptionCommand
+ | ToggleFolderCollapseCommand
diff --git a/apps/desktop/layer/renderer/src/modules/command/commands/timeline.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/timeline.tsx
new file mode 100644
index 000000000..3f6d9e809
--- /dev/null
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/timeline.tsx
@@ -0,0 +1,73 @@
+import { EventBus } from "@follow/utils/event-bus"
+
+import { useRegisterCommandEffect } from "../hooks/use-register-command"
+import type { Command } from "../types"
+import { COMMAND_ID } from "./id"
+
+declare module "@follow/utils/event-bus" {
+ interface EventBusMap {
+ "timeline:switch-to-next": never
+ "timeline:switch-to-previous": never
+ "timeline:refetch": never
+ "timeline:enter": never
+ }
+}
+export const useRegisterTimelineCommand = () => {
+ useRegisterCommandEffect([
+ {
+ id: COMMAND_ID.timeline.switchToNext,
+ label: "Switch to next timeline",
+
+ run: () => {
+ EventBus.dispatch("timeline:switch-to-next")
+ },
+ },
+ {
+ id: COMMAND_ID.timeline.switchToPrevious,
+ label: "Switch to previous timeline",
+ run: () => {
+ EventBus.dispatch("timeline:switch-to-previous")
+ },
+ },
+ {
+ id: COMMAND_ID.timeline.refetch,
+ label: "Refetch timeline",
+ run: () => {
+ EventBus.dispatch("timeline:refetch")
+ },
+ },
+ {
+ id: COMMAND_ID.timeline.enter,
+ label: "Enter Selected Entry",
+ run: () => {
+ EventBus.dispatch("timeline:enter")
+ },
+ },
+ ])
+}
+
+export type SwitchToNextTimelineCommand = Command<{
+ id: typeof COMMAND_ID.timeline.switchToNext
+ fn: () => void
+}>
+
+export type SwitchToPreviousTimelineCommand = Command<{
+ id: typeof COMMAND_ID.timeline.switchToPrevious
+ fn: () => void
+}>
+
+export type RefetchTimelineCommand = Command<{
+ id: typeof COMMAND_ID.timeline.refetch
+ fn: () => void
+}>
+
+export type EnterTimelineCommand = Command<{
+ id: typeof COMMAND_ID.timeline.enter
+ fn: () => void
+}>
+
+export type TimelineCommand =
+ | SwitchToNextTimelineCommand
+ | SwitchToPreviousTimelineCommand
+ | RefetchTimelineCommand
+ | EnterTimelineCommand
diff --git a/apps/desktop/layer/renderer/src/modules/command/commands/types.ts b/apps/desktop/layer/renderer/src/modules/command/commands/types.ts
index 17bd050aa..1db475a15 100644
--- a/apps/desktop/layer/renderer/src/modules/command/commands/types.ts
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/types.ts
@@ -1,167 +1,20 @@
// Entry commands
-import type { FeedViewType } from "@follow/constants"
+import type { EntryCommand } from "./entry"
+import type { EntryRenderCommand } from "./entry-render"
+import type { GlobalCommand } from "./global"
+import type { IntegrationCommand } from "./integration"
+import type { LayoutCommand } from "./layout"
+import type { SettingsCommand } from "./settings"
+import type { SubscriptionCommand } from "./subscription"
+import type { TimelineCommand } from "./timeline"
-import type { Command } from "../types"
-import type { COMMAND_ID } from "./id"
-
-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
-
-// Settings commands
-
-export type CustomizeToolbarCommand = Command<{
- id: typeof COMMAND_ID.settings.customizeToolbar
- fn: () => void
-}>
-
-export type SettingsCommand = CustomizeToolbarCommand
-
-// Integration commands
-
-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
-
-export type BasicCommand = EntryCommand | SettingsCommand | IntegrationCommand
+export type BasicCommand =
+ | EntryCommand
+ | SettingsCommand
+ | IntegrationCommand
+ | GlobalCommand
+ | LayoutCommand
+ | TimelineCommand
+ | EntryRenderCommand
+ | SubscriptionCommand
diff --git a/apps/desktop/layer/renderer/src/modules/command/hooks/use-command-shortcut.ts b/apps/desktop/layer/renderer/src/modules/command/hooks/use-command-shortcut.ts
new file mode 100644
index 000000000..7921d8ac4
--- /dev/null
+++ b/apps/desktop/layer/renderer/src/modules/command/hooks/use-command-shortcut.ts
@@ -0,0 +1,44 @@
+import { shortcuts } from "~/constants/shortcuts"
+
+import { COMMAND_ID } from "../commands/id"
+
+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,
+} 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
+}
diff --git a/apps/desktop/layer/renderer/src/modules/command/hooks/use-command.test-d.ts b/apps/desktop/layer/renderer/src/modules/command/hooks/use-command.test-d.ts
index 04e6eef5a..450d1784b 100644
--- a/apps/desktop/layer/renderer/src/modules/command/hooks/use-command.test-d.ts
+++ b/apps/desktop/layer/renderer/src/modules/command/hooks/use-command.test-d.ts
@@ -1,7 +1,7 @@
import { assertType, expectTypeOf, test } from "vitest"
+import type { TipCommand } from "../commands/entry"
import { COMMAND_ID } from "../commands/id"
-import type { TipCommand } from "../commands/types"
import { getCommand, useCommand, useRunCommandFn } from "./use-command"
test("getCommand types work properly", () => {
diff --git a/apps/desktop/layer/renderer/src/modules/command/hooks/use-register-hotkey.ts b/apps/desktop/layer/renderer/src/modules/command/hooks/use-register-hotkey.ts
index 5c4f1ff50..304310d5c 100644
--- a/apps/desktop/layer/renderer/src/modules/command/hooks/use-register-hotkey.ts
+++ b/apps/desktop/layer/renderer/src/modules/command/hooks/use-register-hotkey.ts
@@ -1,14 +1,16 @@
-import { useHotkeys } from "react-hotkeys-hook"
+import { useEffect } from "react"
+import { tinykeys } from "tinykeys"
import type { FollowCommand, FollowCommandId } from "../types"
import { getCommand } from "./use-command"
+import type { BindingCommandId } from "./use-command-shortcut"
+import { useCommandShortcut } from "./use-command-shortcut"
interface RegisterHotkeyOptions
{
shortcut: string
commandId: T
args?: Parameters["run"]>
when?: boolean
- // hotkeyOptions?: Options
}
export const useCommandHotkey = ({
@@ -17,27 +19,60 @@ export const useCommandHotkey = ({
when,
args,
}: RegisterHotkeyOptions) => {
- useHotkeys(
- shortcut,
- () => {
- const command = getCommand(commandId)
+ useEffect(() => {
+ if (!when) {
+ return
+ }
- if (!command) return
- if (Array.isArray(args)) {
- // It should be safe to spread the args here because we are checking if it is an array
- // @ts-expect-error - A spread argument must either have a tuple type or be passed to a rest parameter.ts(2556)
- command.run(...args)
- return
+ if (!shortcut) {
+ return
+ }
+
+ // Handle comma-separated shortcuts
+ const shortcuts = shortcut.split(",").map((s) => s.trim())
+ const keyMap: Record void> = {}
+
+ // Create a handler for each shortcut
+ shortcuts.forEach((key) => {
+ keyMap[key] = (event) => {
+ event.preventDefault()
+ event.stopPropagation()
+
+ const command = getCommand(commandId)
+ if (!command) return
+
+ if (Array.isArray(args)) {
+ // It should be safe to spread the args here because we are checking if it is an array
+ // @ts-expect-error - A spread argument must either have a tuple type or be passed to a rest parameter.ts(2556)
+ command.run(...args)
+ return
+ }
+
+ if (args === undefined) {
+ // @ts-expect-error
+ command.run()
+ return
+ }
+
+ console.error("Invalid args", typeof args, args)
}
- if (args === undefined) {
- // @ts-expect-error
- command.run()
- return
- }
- console.error("Invalid args", typeof args, args)
- },
- {
- enabled: when,
- },
- )
+ })
+
+ return tinykeys(document.documentElement, keyMap)
+ }, [shortcut, commandId, when, args])
+}
+
+export const useCommandBinding = ({
+ commandId,
+ when = true,
+ args,
+}: Omit, "shortcut">) => {
+ const commandShortcut = useCommandShortcut(commandId)
+
+ return useCommandHotkey({
+ shortcut: commandShortcut,
+ commandId,
+ when,
+ args,
+ })
}
diff --git a/apps/desktop/layer/renderer/src/modules/command/registry/command.ts b/apps/desktop/layer/renderer/src/modules/command/registry/command.ts
index de30ab791..ffadc8d08 100644
--- a/apps/desktop/layer/renderer/src/modules/command/registry/command.ts
+++ b/apps/desktop/layer/renderer/src/modules/command/registry/command.ts
@@ -23,9 +23,6 @@ export function createCommand<
label = typeof label === "string" ? { title: label } : label
return label
},
- // when: !!(options.when ?? true),
- // keyBinding:
- // typeof options.keyBinding === "string" ? { binding: options.keyBinding } : options.keyBinding,
}
}
diff --git a/apps/desktop/layer/renderer/src/modules/command/types.ts b/apps/desktop/layer/renderer/src/modules/command/types.ts
index 8e84bec41..edb0121f5 100644
--- a/apps/desktop/layer/renderer/src/modules/command/types.ts
+++ b/apps/desktop/layer/renderer/src/modules/command/types.ts
@@ -8,6 +8,7 @@ export type CommandCategory =
| "follow:updates"
| "follow:help"
| "follow:general"
+ | "follow:entry-render"
export interface KeybindingOptions {
binding: string
@@ -17,36 +18,6 @@ export interface KeybindingOptions {
// skipRegister?: boolean
}
-export interface CommandKeybindingOptions<
- ID extends string,
- T extends (...args: any[]) => unknown = (...args: unknown[]) => unknown,
-> {
- /**
- * the command id.
- */
- commandId: ID
- /**
- * a set of predefined precondition strategies.
- *
- * note: this only used for keybinding and command menu.
- * command will always available when called directly.
- */
- when?: boolean
- /**
- * we use https://github.com/jamiebuilds/tinykeys so that we can use the same keybinding definition
- * for both mac and windows.
- *
- * Use `$mod` for `Cmd` on Mac and `Ctrl` on Windows and Linux.
- */
- keyBinding?: KeybindingOptions | string
- /**
- * additional arguments for the command.
- *
- * Only used when the command is called from a keybinding.
- */
- args?: Parameters
-}
-
export interface Command<
T extends { id: string; fn: (...args: any[]) => unknown } = {
id: string
@@ -61,9 +32,6 @@ export interface Command<
readonly icon?: ReactNode | ((props?: { isActive?: boolean }) => ReactNode)
readonly category: CommandCategory
readonly run: T["fn"]
-
- // readonly when: boolean
- // readonly keyBinding?: KeybindingOptions
}
export type SimpleCommand = Command<{ id: T; fn: () => void }>
@@ -87,7 +55,6 @@ export interface CommandOptions<
run: T["fn"]
when?: boolean
- keyBinding?: T["fn"] extends () => void ? KeybindingOptions | string : never
}
export type FollowCommandMap = {
diff --git a/apps/desktop/layer/renderer/src/modules/customize-toolbar/constant.ts b/apps/desktop/layer/renderer/src/modules/customize-toolbar/constant.ts
index c9826cd08..fce80b20d 100644
--- a/apps/desktop/layer/renderer/src/modules/customize-toolbar/constant.ts
+++ b/apps/desktop/layer/renderer/src/modules/customize-toolbar/constant.ts
@@ -7,24 +7,29 @@ export interface ToolbarActionOrder {
more: UniqueIdentifier[]
}
-const entryItemInMore = new Set([
- COMMAND_ID.entry.copyLink,
- COMMAND_ID.entry.openInBrowser,
- COMMAND_ID.entry.exportAsPDF,
- COMMAND_ID.entry.read,
- COMMAND_ID.entry.tts,
-])
-
-export const entryItemHideInHeader = new Set([
+export const ENTRY_ITEM_HIDE_IN_HEADER = new Set([
COMMAND_ID.entry.readAbove,
COMMAND_ID.entry.readBelow,
])
+const MAIN_ACTIONS = [
+ COMMAND_ID.entry.readability,
+ COMMAND_ID.entry.tts,
+ COMMAND_ID.entry.star,
+
+ COMMAND_ID.entry.toggleAISummary,
+ COMMAND_ID.entry.toggleAITranslation,
+
+ COMMAND_ID.entry.imageGallery,
+ COMMAND_ID.entry.share,
+]
+const MAIN_ACTIONS_SET = new Set(MAIN_ACTIONS)
+
export const DEFAULT_ACTION_ORDER: ToolbarActionOrder = {
- main: Object.values(COMMAND_ID.entry).filter((id) => !entryItemInMore.has(id)),
+ main: MAIN_ACTIONS,
more: [
...Object.values(COMMAND_ID.integration),
- ...Object.values(COMMAND_ID.entry).filter((id) => entryItemInMore.has(id)),
+ ...Object.values(COMMAND_ID.entry).filter((id) => !MAIN_ACTIONS_SET.has(id)),
COMMAND_ID.settings.customizeToolbar,
],
}
diff --git a/apps/desktop/layer/renderer/src/modules/customize-toolbar/hooks.ts b/apps/desktop/layer/renderer/src/modules/customize-toolbar/hooks.ts
index d799e6023..255e6f607 100644
--- a/apps/desktop/layer/renderer/src/modules/customize-toolbar/hooks.ts
+++ b/apps/desktop/layer/renderer/src/modules/customize-toolbar/hooks.ts
@@ -3,10 +3,11 @@ import { useMemo } from "react"
import { useUISettingSelector } from "~/atoms/settings/ui"
-import { DEFAULT_ACTION_ORDER, entryItemHideInHeader } from "./constant"
+import { DEFAULT_ACTION_ORDER, ENTRY_ITEM_HIDE_IN_HEADER } from "./constant"
export const useActionOrder = () => {
const actionOrderSetting = useUISettingSelector((s) => s.toolbarOrder)
+
return useMemo(() => {
const { main, more } = actionOrderSetting
const missingMainActions = DEFAULT_ACTION_ORDER.main.filter(
@@ -18,10 +19,10 @@ export const useActionOrder = () => {
return {
main: [...actionOrderSetting.main, ...missingMainActions].filter(
- (id) => !entryItemHideInHeader.has(id as string),
+ (id) => !ENTRY_ITEM_HIDE_IN_HEADER.has(id as string),
),
more: [...actionOrderSetting.more, ...missingMoreActions].filter(
- (id) => !entryItemHideInHeader.has(id as string),
+ (id) => !ENTRY_ITEM_HIDE_IN_HEADER.has(id as string),
),
}
}, [actionOrderSetting])
@@ -52,5 +53,6 @@ export const useToolbarOrderMap = () => {
)
return actionOrderMap
}, [actionOrder])
+
return actionOrderMap
}
diff --git a/apps/desktop/layer/renderer/src/modules/discover/DiscoverFeedCard.tsx b/apps/desktop/layer/renderer/src/modules/discover/DiscoverFeedCard.tsx
index e135ab80f..c61047cbd 100644
--- a/apps/desktop/layer/renderer/src/modules/discover/DiscoverFeedCard.tsx
+++ b/apps/desktop/layer/renderer/src/modules/discover/DiscoverFeedCard.tsx
@@ -114,7 +114,7 @@ export const DiscoverFeedCard: FC = memo(
{item.docs ? (
-
diff --git a/apps/desktop/layer/renderer/src/modules/discover/DiscoverInboxList.tsx b/apps/desktop/layer/renderer/src/modules/discover/DiscoverInboxList.tsx
index bba2ee6bc..f468ec1f5 100644
--- a/apps/desktop/layer/renderer/src/modules/discover/DiscoverInboxList.tsx
+++ b/apps/desktop/layer/renderer/src/modules/discover/DiscoverInboxList.tsx
@@ -63,7 +63,7 @@ export function DiscoverInboxList() {
{/* New Inbox */}
)
diff --git a/apps/desktop/layer/renderer/src/modules/entry-content/hooks.tsx b/apps/desktop/layer/renderer/src/modules/entry-content/hooks.tsx
index 4087e8626..b20b6308c 100644
--- a/apps/desktop/layer/renderer/src/modules/entry-content/hooks.tsx
+++ b/apps/desktop/layer/renderer/src/modules/entry-content/hooks.tsx
@@ -1,29 +1,22 @@
import { tracker } from "@follow/tracker"
-import { EventBus } from "@follow/utils/event-bus"
-import { createElement, useCallback, useEffect } from "react"
+import { createElement, useCallback, useMemo } from "react"
import { useTranslation } from "react-i18next"
import { toast } from "sonner"
+import {
+ useEntryIsInReadability,
+ useEntryIsInReadabilitySuccess,
+ useEntryReadabilityContent,
+} from "~/atoms/readability"
import { useModalStack } from "~/components/ui/modal/stacked/hooks"
+import { useAuthQuery } from "~/hooks/common/useBizQuery"
+import { Queries } from "~/queries"
+import { useEntryTranslation } from "~/store/ai/hook"
+import { useEntry } from "~/store/entry/hooks"
+import { useInboxById } from "~/store/inbox/hooks"
import { ImageGalleryContent } from "./components/ImageGalleryContent"
-declare module "@follow/utils/event-bus" {
- export interface CustomEvent {
- FOCUS_ENTRY_CONTAINER: never
- }
-}
-
-export const useFocusEntryContainerSubscriptions = (
- ref: React.RefObject
- 
+ 
