feat: sort list by insertedat

realSunyz · Sep 23, 2024 · 36fbbdd · 36fbbdd
1 parent d8ddffb
commit 36fbbdd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/apps/renderer/src/modules/entry-column/hooks.ts b/apps/renderer/src/modules/entry-column/hooks.ts
@@ -8,7 +8,7 @@ import { useRouteParams, useRouteParamsSelector } from "~/hooks/biz/useRoutePara
 import { useAuthQuery } from "~/hooks/common"
 import { entries, useEntries } from "~/queries/entries"
 import { entryActions, useEntryIdsByFeedIdOrView } from "~/store/entry"
-import { isSubscriptionList, useFolderFeedsByFeedId } from "~/store/subscription"
+import { isListSubscription, useFolderFeedsByFeedId } from "~/store/subscription"
 import { feedUnreadActions } from "~/store/unread"
 
 export const useEntryMarkReadHandler = (entriesIds: string[]) => {
@@ -60,6 +60,7 @@ export const useEntriesByView = ({
   const unreadOnly = useGeneralSettingKey("unreadOnly")
 
   const { feedId, view, isAllFeeds, isCollection } = routeParams
+  const isList = isListSubscription(feedId)
 
   const folderIds = useFolderFeedsByFeedId({
     feedId,
@@ -71,7 +72,7 @@ export const useEntriesByView = ({
     view,
     ...(unreadOnly === true && { read: false }),
     isArchived,
-    isList: isSubscriptionList(feedId),
+    isList,
   }
   const query = useEntries(entriesOptions)
 
@@ -166,7 +167,9 @@ export const useEntriesByView = ({
 
   const sortEntries = isCollection
     ? sortEntriesIdByStarAt(mergedEntries[view])
-    : sortEntriesIdByEntryPublishedAt(mergedEntries[view])
+    : isList
+      ? sortEntriesIdByEntryInsertedAt(mergedEntries[view])
+      : sortEntriesIdByEntryPublishedAt(mergedEntries[view])
 
   const groupByDate = useGeneralSettingKey("groupByDate")
   const groupedCounts: number[] | undefined = useMemo(() => {
@@ -184,7 +187,9 @@ export const useEntriesByView = ({
       if (!entry) {
         continue
       }
-      const date = new Date(entry.entries.publishedAt).toDateString()
+      const date = new Date(
+        isList ? entry.entries.insertedAt : entry.entries.publishedAt,
+      ).toDateString()
       if (date !== lastDate) {
         counts.push(1)
         lastDate = date
@@ -249,3 +254,12 @@ function sortEntriesIdByStarAt(entries: string[]) {
     return bStar.localeCompare(aStar)
   })
 }
+
+function sortEntriesIdByEntryInsertedAt(entries: string[]) {
+  const entriesId2Map = entryActions.getFlattenMapEntries()
+  return entries
+    .slice()
+    .sort((a, b) =>
+      entriesId2Map[b]?.entries.insertedAt.localeCompare(entriesId2Map[a]?.entries.insertedAt),
+    )
+}
diff --git a/apps/renderer/src/store/subscription/store.ts b/apps/renderer/src/store/subscription/store.ts
@@ -355,7 +355,7 @@ export const getSubscriptionByFeedId = (feedId: FeedId) => {
   return state.data[feedId]
 }
 
-export const isSubscriptionList = (feedId?: FeedId) => {
+export const isListSubscription = (feedId?: FeedId) => {
   if (!feedId) return false
   const subscription = getSubscriptionByFeedId(feedId)
   if (!subscription) return false