RSSNext
diff --git a/‎apps/desktop/src/renderer/src/hooks/biz/useEntryActions.tsx
Copy file name to clipboard
+14-4Lines changed: 14 additions & 4 deletions b/‎apps/desktop/src/renderer/src/hooks/biz/useEntryActions.tsx
Copy file name to clipboard
+14-4Lines changed: 14 additions & 4 deletions
diff --git a/‎apps/desktop/src/renderer/src/modules/command/commands/entry.tsx
Copy file name to clipboard
+21Lines changed: 21 additions & 0 deletions b/‎apps/desktop/src/renderer/src/modules/command/commands/entry.tsx
Copy file name to clipboard
+21Lines changed: 21 additions & 0 deletions
diff --git a/‎apps/desktop/src/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎apps/desktop/src/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎apps/desktop/src/renderer/src/modules/command/commands/types.ts
Copy file name to clipboard
+17-5Lines changed: 17 additions & 5 deletions b/‎apps/desktop/src/renderer/src/modules/command/commands/types.ts
Copy file name to clipboard
+17-5Lines changed: 17 additions & 5 deletions
diff --git a/‎apps/desktop/src/renderer/src/modules/customize-toolbar/constant.ts
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎apps/desktop/src/renderer/src/modules/customize-toolbar/constant.ts
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎apps/desktop/src/renderer/src/modules/customize-toolbar/hooks.ts
Copy file name to clipboard
+7-3Lines changed: 7 additions & 3 deletions b/‎apps/desktop/src/renderer/src/modules/customize-toolbar/hooks.ts
Copy file name to clipboard
+7-3Lines changed: 7 additions & 3 deletions
diff --git a/‎apps/desktop/src/renderer/src/modules/entry-column/components/DateItem.tsx
Copy file name to clipboard
+5-7Lines changed: 5 additions & 7 deletions b/‎apps/desktop/src/renderer/src/modules/entry-column/components/DateItem.tsx
Copy file name to clipboard
+5-7Lines changed: 5 additions & 7 deletions
diff --git a/‎apps/desktop/src/renderer/src/modules/entry-column/components/mark-all-button.tsx
Copy file name to clipboard
+4-7Lines changed: 4 additions & 7 deletions b/‎apps/desktop/src/renderer/src/modules/entry-column/components/mark-all-button.tsx
Copy file name to clipboard
+4-7Lines changed: 4 additions & 7 deletions
diff --git a/‎apps/desktop/src/renderer/src/modules/entry-column/hooks/useMarkAll.ts
Copy file name to clipboard
+34-38Lines changed: 34 additions & 38 deletions b/‎apps/desktop/src/renderer/src/modules/entry-column/hooks/useMarkAll.ts
Copy file name to clipboard
+34-38Lines changed: 34 additions & 38 deletions
diff --git a/‎apps/desktop/src/renderer/src/store/subscription/getters.ts
Copy file name to clipboard
+13-1Lines changed: 13 additions & 1 deletion b/‎apps/desktop/src/renderer/src/store/subscription/getters.ts
Copy file name to clipboard
+13-1Lines changed: 13 additions & 1 deletion
@@ -285,6 +285,11 @@ export const useEntryActions = ({
         shortcut: shortcuts.entry.share.key,
         entryId,
       }),
+      new EntryActionMenuItem({
+        id: COMMAND_ID.entry.readAbove,
+        onClick: runCmdFn(COMMAND_ID.entry.readAbove, [{ publishedAt: entry.entries.publishedAt }]),
+        entryId,
+      }),
       new EntryActionMenuItem({
         id: COMMAND_ID.entry.read,
         onClick: runCmdFn(COMMAND_ID.entry.read, [{ entryId }]),
@@ -293,6 +298,11 @@ export const useEntryActions = ({
         shortcut: shortcuts.entry.toggleRead.key,
         entryId,
       }),
+      new EntryActionMenuItem({
+        id: COMMAND_ID.entry.readBelow,
+        onClick: runCmdFn(COMMAND_ID.entry.readBelow, [{ publishedAt: entry.entries.publishedAt }]),
+        entryId,
+      }),
       MENU_ITEM_SEPARATOR,
       new EntryActionMenuItem({
         id: COMMAND_ID.entry.delete,
@@ -304,7 +314,7 @@ export const useEntryActions = ({
       new EntryActionMenuItem({
         id: COMMAND_ID.entry.tts,
         onClick: runCmdFn(COMMAND_ID.entry.tts, [
-          { entryId, entryContent: entry?.entries.content },
+          { entryId, entryContent: entry?.entries.content! },
         ]),
         hide: !IN_ELECTRON || compact || !entry?.entries.content,
         shortcut: shortcuts.entry.tts.key,
@@ -313,7 +323,7 @@ export const useEntryActions = ({
       new EntryActionMenuItem({
         id: COMMAND_ID.entry.readability,
         onClick: runCmdFn(COMMAND_ID.entry.readability, [
-          { entryId, entryUrl: entry?.entries.url },
+          { entryId, entryUrl: entry?.entries.url! },
         ]),
         hide:
           !!entry.settings?.readability ||
@@ -342,6 +352,7 @@ export const useEntryActions = ({
     compact,
     entry?.collections,
     entry?.entries.content,
+    entry?.entries.publishedAt,
     entry?.entries.url,
     entry?.read,
     entry?.settings?.readability,
@@ -410,8 +421,7 @@ export const useSortedEntryActions = ({
             return false
           }
           const order = orderMap.get(item.id)
-          // If the order is not set, it should be in the "more" menu
-          if (!order) return true
+          if (!order) return false
           return order.type !== "main"
         })
         // .filter((item) => item.id !== COMMAND_ID.settings.customizeToolbar)
 
@@ -22,6 +22,7 @@ import { getRouteParams } from "~/hooks/biz/useRouteParams"
 import { tipcClient } from "~/lib/client"
 import { parseHtml } from "~/lib/parse-html"
 import { useActivationModal } from "~/modules/activation"
+import { markAllByRoute } from "~/modules/entry-column/hooks/useMarkAll"
 import { useGalleryModal } from "~/modules/entry-content/hooks"
 import { useTipModal } from "~/modules/wallet/hooks"
 import { entryActions, useEntryStore } from "~/store/entry"
@@ -295,6 +296,16 @@ export const useRegisterEntryCommands = () => {
           return
         },
       },
+      {
+        id: COMMAND_ID.entry.readAbove,
+        label: t("entry_actions.mark_above_as_read"),
+        run: ({ publishedAt }: { publishedAt: string }) => {
+          return markAllByRoute({
+            startTime: new Date(publishedAt).getTime(),
+            endTime: Date.now(),
+          })
+        },
+      },
       {
         id: COMMAND_ID.entry.read,
         label: t("entry_actions.mark_as_read"),
@@ -314,6 +325,16 @@ export const useRegisterEntryCommands = () => {
           }
         },
       },
+      {
+        id: COMMAND_ID.entry.readBelow,
+        label: t("entry_actions.mark_below_as_read"),
+        run: ({ publishedAt }: { publishedAt: string }) => {
+          return markAllByRoute({
+            startTime: 1,
+            endTime: new Date(publishedAt).getTime() - 1,
+          })
+        },
+      },
       {
         id: COMMAND_ID.entry.imageGallery,
         label: t("entry_actions.image_gallery"),
 
@@ -1,6 +1,8 @@
 export const COMMAND_ID = {
   entry: {
     read: "entry:read",
+    readAbove: "entry:read-above",
+    readBelow: "entry:read-below",
     viewSourceContent: "entry:view-source-content",
     readability: "entry:ability",
     openInBrowser: "entry:open-in-browser",
 
@@ -47,12 +47,22 @@ export type ViewSourceContentCommand = Command<{
 
 export type ShareCommand = Command<{
   id: typeof COMMAND_ID.entry.share
-  fn: ({ entryId }) => void
+  fn: (data: { entryId: string }) => void
 }>
 
 export type ReadCommand = Command<{
   id: typeof COMMAND_ID.entry.read
-  fn: ({ entryId }) => void
+  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<{
@@ -67,17 +77,17 @@ export type ToggleAITranslationCommand = Command<{
 
 export type ImageGalleryCommand = Command<{
   id: typeof COMMAND_ID.entry.imageGallery
-  fn: ({ entryId }) => void
+  fn: (data: { entryId: string }) => void
 }>
 
 export type TTSCommand = Command<{
   id: typeof COMMAND_ID.entry.tts
-  fn: ({ entryId, entryContent }) => void
+  fn: (data: { entryId: string; entryContent: string }) => void
 }>
 
 export type ReadabilityCommand = Command<{
   id: typeof COMMAND_ID.entry.readability
-  fn: ({ entryId, entryUrl }) => void
+  fn: (data: { entryId: string; entryUrl: string }) => void
 }>
 
 export type EntryCommand =
@@ -91,6 +101,8 @@ export type EntryCommand =
   | ViewSourceContentCommand
   | ShareCommand
   | ReadCommand
+  | ReadAboveCommand
+  | ReadBelowCommand
   | ToggleAISummaryCommand
   | ToggleAITranslationCommand
   | ImageGalleryCommand
 
@@ -15,10 +15,16 @@ const entryItemInMore = new Set<string>([
   COMMAND_ID.entry.tts,
 ])
 
+export const entryItemHideInHeader = new Set<string>([
+  COMMAND_ID.entry.readAbove,
+  COMMAND_ID.entry.readBelow,
+])
+
 export const DEFAULT_ACTION_ORDER: ToolbarActionOrder = {
   main: Object.values(COMMAND_ID.entry).filter((id) => !entryItemInMore.has(id)),
   more: [
     ...Object.values(COMMAND_ID.integration),
     ...Object.values(COMMAND_ID.entry).filter((id) => entryItemInMore.has(id)),
+    COMMAND_ID.settings.customizeToolbar,
   ],
 }
@@ -3,7 +3,7 @@ import { useMemo } from "react"
 
 import { useUISettingSelector } from "~/atoms/settings/ui"
 
-import { DEFAULT_ACTION_ORDER } from "./constant"
+import { DEFAULT_ACTION_ORDER, entryItemHideInHeader } from "./constant"
 
 export const useActionOrder = () => {
   const actionOrderSetting = useUISettingSelector((s) => s.toolbarOrder)
@@ -17,8 +17,12 @@ export const useActionOrder = () => {
     )
 
     return {
-      main: [...actionOrderSetting.main, ...missingMainActions],
-      more: [...actionOrderSetting.more, ...missingMoreActions],
+      main: [...actionOrderSetting.main, ...missingMainActions].filter(
+        (id) => !entryItemHideInHeader.has(id as string),
+      ),
+      more: [...actionOrderSetting.more, ...missingMoreActions].filter(
+        (id) => !entryItemHideInHeader.has(id as string),
+      ),
     }
   }, [actionOrderSetting])
 }
 
@@ -14,7 +14,7 @@ import { IconScaleTransition } from "~/components/ux/transition/icon"
 import { useRouteParams } from "~/hooks/biz/useRouteParams"
 import { isListSubscription } from "~/store/subscription"
 
-import { useMarkAllByRoute } from "../hooks/useMarkAll"
+import { markAllByRoute } from "../hooks/useMarkAll"
 
 interface DateItemInnerProps {
   date: Date
@@ -79,11 +79,6 @@ const DateItemInner: FC<DateItemInnerProps> = ({
     [date, rid],
   )
 
-  const handleMarkAllAsRead = useMarkAllByRoute({
-    startTime,
-    endTime,
-  })
-
   const [confirmMark, setConfirmMark] = useState(false)
   const removeConfirm = useDebounceCallback(
     () => {
@@ -127,7 +122,10 @@ const DateItemInner: FC<DateItemInnerProps> = ({
           onClick={() => {
             if (confirmMark) {
               clearTimeout(timerRef.current)
-              handleMarkAllAsRead()
+              markAllByRoute({
+                startTime,
+                endTime,
+              })
               setConfirmMark(false)
             } else {
               setConfirmMark(true)
 
@@ -13,7 +13,7 @@ import { shortcuts } from "~/constants/shortcuts"
 import { useI18n } from "~/hooks/common"
 
 import type { MarkAllFilter } from "../hooks/useMarkAll"
-import { useMarkAllByRoute } from "../hooks/useMarkAll"
+import { markAllByRoute } from "../hooks/useMarkAll"
 
 interface MarkAllButtonProps {
   className?: string
@@ -26,8 +26,6 @@ export const MarkAllReadButton = forwardRef<HTMLButtonElement, MarkAllButtonProp
     const { t } = useTranslation()
     const { t: commonT } = useTranslation("common")
 
-    const handleMarkAllAsRead = useMarkAllByRoute()
-
     useHotkeys(
       shortcuts.entries.markAllAsRead.key,
       () => {
@@ -42,7 +40,7 @@ export const MarkAllReadButton = forwardRef<HTMLButtonElement, MarkAllButtonProp
           duration: 3000,
           onAutoClose() {
             if (cancel) return
-            handleMarkAllAsRead()
+            markAllByRoute()
           },
           action: {
             label: (
@@ -85,7 +83,7 @@ export const MarkAllReadButton = forwardRef<HTMLButtonElement, MarkAllButtonProp
         className={className}
         ref={ref}
         onClick={() => {
-          handleMarkAllAsRead()
+          markAllByRoute()
         }}
       >
         <i className="i-mgc-check-circle-cute-re" />
@@ -125,7 +123,6 @@ export const FlatMarkAllReadButton: FC<
 
   const { className, filter, which, buttonClassName, iconClassName } = props
   const [status, setStatus] = useState<"initial" | "confirm" | "done">("initial")
-  const handleMarkAll = useMarkAllByRoute(filter)
 
   const animate = {
     initial: { rotate: -30, opacity: 0.9 },
@@ -143,7 +140,7 @@ export const FlatMarkAllReadButton: FC<
         className,
       )}
       onClick={() => {
-        handleMarkAll()
+        markAllByRoute(filter)
           .then(() => setStatus("done"))
           .catch(() => setStatus("initial"))
       }}
 
@@ -1,50 +1,46 @@
-import { useCallback } from "react"
-
-import { useRouteParams } from "~/hooks/biz/useRouteParams"
-import { subscriptionActions } from "~/store/subscription"
-import { useFolderFeedsByFeedId } from "~/store/subscription/hooks"
+import { getRouteParams } from "~/hooks/biz/useRouteParams"
+import { getFolderFeedsByFeedId, subscriptionActions } from "~/store/subscription"
 
 export interface MarkAllFilter {
   startTime: number
   endTime: number
 }
-export const useMarkAllByRoute = (filter?: MarkAllFilter) => {
-  const routerParams = useRouteParams()
+
+export const markAllByRoute = async (filter?: MarkAllFilter) => {
+  const routerParams = getRouteParams()
   const { feedId, view, inboxId, listId } = routerParams
-  const folderIds = useFolderFeedsByFeedId({
+  const folderIds = getFolderFeedsByFeedId({
     feedId,
     view,
   })
 
-  return useCallback(async () => {
-    if (!routerParams) return
+  if (!routerParams) return
 
-    if (typeof routerParams.feedId === "number" || routerParams.isAllFeeds) {
-      subscriptionActions.markReadByView(view, filter)
-    } else if (inboxId) {
-      subscriptionActions.markReadByFeedIds({
-        inboxId,
-        view,
-        filter,
-      })
-    } else if (listId) {
-      subscriptionActions.markReadByFeedIds({
-        listId,
-        view,
-        filter,
-      })
-    } else if (folderIds?.length) {
-      subscriptionActions.markReadByFeedIds({
-        feedIds: folderIds,
-        view,
-        filter,
-      })
-    } else if (routerParams.feedId) {
-      subscriptionActions.markReadByFeedIds({
-        feedIds: routerParams.feedId?.split(","),
-        view,
-        filter,
-      })
-    }
-  }, [routerParams, inboxId, folderIds, view, filter])
+  if (typeof routerParams.feedId === "number" || routerParams.isAllFeeds) {
+    subscriptionActions.markReadByView(view, filter)
+  } else if (inboxId) {
+    subscriptionActions.markReadByFeedIds({
+      inboxId,
+      view,
+      filter,
+    })
+  } else if (listId) {
+    subscriptionActions.markReadByFeedIds({
+      listId,
+      view,
+      filter,
+    })
+  } else if (folderIds?.length) {
+    subscriptionActions.markReadByFeedIds({
+      feedIds: folderIds,
+      view,
+      filter,
+    })
+  } else if (routerParams.feedId) {
+    subscriptionActions.markReadByFeedIds({
+      feedIds: routerParams.feedId?.split(","),
+      view,
+      filter,
+    })
+  }
 }
@@ -1,4 +1,10 @@
-import { subscriptionCategoryExistSelector } from "./selector"
+import type { FeedViewType } from "@follow/constants"
+
+import {
+  folderFeedsByFeedIdSelector,
+  subscriptionByViewSelector,
+  subscriptionCategoryExistSelector,
+} from "./selector"
 import { useSubscriptionStore } from "./store"
 
 const get = useSubscriptionStore.getState
@@ -16,3 +22,9 @@ export const isListSubscription = (feedId?: FeedId) => {
 
 export const subscriptionCategoryExist = (name: string) =>
   subscriptionCategoryExistSelector(name)(get())
+
+export const getFolderFeedsByFeedId = ({ feedId, view }: { feedId?: string; view: FeedViewType }) =>
+  folderFeedsByFeedIdSelector({ feedId, view })(get()) || []
+
+export const getSubscriptionByView = (view: FeedViewType) =>
+  subscriptionByViewSelector(view)(get()) || []
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { useMemo } from "react"`
`3`	`3`
`4`	`4`	`import { useUISettingSelector } from "~/atoms/settings/ui"`
`5`	`5`
`6`		`-import { DEFAULT_ACTION_ORDER } from "./constant"`
	`6`	`+import { DEFAULT_ACTION_ORDER, entryItemHideInHeader } from "./constant"`
`7`	`7`
`8`	`8`	`export const useActionOrder = () => {`
`9`	`9`	`const actionOrderSetting = useUISettingSelector((s) => s.toolbarOrder)`
`@@ -17,8 +17,12 @@ export const useActionOrder = () => {`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`return {`
`20`		`- main: [...actionOrderSetting.main, ...missingMainActions],`
`21`		`- more: [...actionOrderSetting.more, ...missingMoreActions],`
	`20`	`+ main: [...actionOrderSetting.main, ...missingMainActions].filter(`
	`21`	`+ (id) => !entryItemHideInHeader.has(id as string),`
	`22`	`+ ),`
	`23`	`+ more: [...actionOrderSetting.more, ...missingMoreActions].filter(`
	`24`	`+ (id) => !entryItemHideInHeader.has(id as string),`
	`25`	`+ ),`
`22`	`26`	`}`
`23`	`27`	`}, [actionOrderSetting])`
`24`	`28`	`}`