From cc25c6785e98f7a200904bdac2b36ff03cf358dd Mon Sep 17 00:00:00 2001 From: Stephen Zhou Date: Sun, 15 Sep 2024 09:22:10 +0800 Subject: [PATCH] fix: sort by preferred title, fix #390 --- src/renderer/src/modules/feed-column/category.tsx | 6 +++--- src/renderer/src/modules/feed-column/list.tsx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/modules/feed-column/category.tsx b/src/renderer/src/modules/feed-column/category.tsx index c20a196eb..7ad22ef25 100644 --- a/src/renderer/src/modules/feed-column/category.tsx +++ b/src/renderer/src/modules/feed-column/category.tsx @@ -8,7 +8,7 @@ import { stopPropagation } from "@renderer/lib/dom" import type { FeedViewType } from "@renderer/lib/enum" import { showNativeMenu } from "@renderer/lib/native-menu" import { cn, sortByAlphabet } from "@renderer/lib/utils" -import { useFeedStore } from "@renderer/store/feed" +import { getPreferredTitle, useFeedStore } from "@renderer/store/feed" import { subscriptionActions, useSubscriptionByFeedId } from "@renderer/store/subscription" import { useFeedUnreadStore } from "@renderer/store/unread" import { useMutation } from "@tanstack/react-query" @@ -372,8 +372,8 @@ const SortByAlphabeticalList = (props: SortListProps) => { const isDesc = useFeedListSortSelector((s) => s.order === "desc") const sortedFeedList = useFeedStore((state) => { const res = ids.sort((a, b) => { - const feedTitleA = state.feeds[a]?.title || "" - const feedTitleB = state.feeds[b]?.title || "" + const feedTitleA = getPreferredTitle(state.feeds[a]) || "" + const feedTitleB = getPreferredTitle(state.feeds[b]) || "" return sortByAlphabet(feedTitleA, feedTitleB) }) diff --git a/src/renderer/src/modules/feed-column/list.tsx b/src/renderer/src/modules/feed-column/list.tsx index fb2f9991e..153350302 100644 --- a/src/renderer/src/modules/feed-column/list.tsx +++ b/src/renderer/src/modules/feed-column/list.tsx @@ -10,7 +10,7 @@ import { stopPropagation } from "@renderer/lib/dom" import type { FeedViewType } from "@renderer/lib/enum" import { cn, sortByAlphabet } from "@renderer/lib/utils" import { Queries } from "@renderer/queries" -import { useFeedStore } from "@renderer/store/feed" +import { getPreferredTitle, useFeedStore } from "@renderer/store/feed" import { getSubscriptionByFeedId, useSubscriptionByView } from "@renderer/store/subscription" import { useFeedUnreadStore } from "@renderer/store/unread" import { AnimatePresence, m } from "framer-motion" @@ -305,7 +305,7 @@ const SortByAlphabeticalList = ({ view, expansion, data }: FeedListProps) => { if (!isSingle || hascategoryNameNotDefault) { map[categoryName] = categoryName } else { - map[categoryName] = feed.title! + map[categoryName] = getPreferredTitle(feed)! } } return map