xiaoxue_admin
/
Folo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(subscription): deduplicate feed IDs when feeds exist in both subscriptions and lists 

Previously, if a feed was both directly subscribed and existed in a subscribed list,
it would appear twice in the subscription IDs array, causing unread counts to be
doubled in SubscriptionTabButton.

Fixed by using Set to deduplicate feed IDs in:
- getSubscriptionIdsByViewSelector
- getSubscribedFeedIdAndInboxHandlesByView

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
DIYgod 2025-08-20 19:53:10 +08:00
parent e3dafbc7cc
commit bdc17c0f12
No known key found for this signature in database
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/internal/store/src/modules/subscription/getter.ts
View File

@ -38,16 +38,20 @@ export const getSubscribedFeedIdAndInboxHandlesByView = ({
}): string[] => {
if (typeof view !== "number") return []
const state = useSubscriptionStore.getState()
return Array.from(state.feedIdByView[view])
const feedIds = Array.from(state.feedIdByView[view])
.filter((i) => !excludePrivate || !state.data[i]?.isPrivate)
.filter((i) => !excludeHidden || !state.data[i]?.hideFromTimeline)
.concat(view === FeedViewType.Articles ? getInboxList().map((i) => i.id) : [])
.concat(
Array.from(state.listIdByView[view])
.filter((i) => !excludePrivate || !state.data[i]?.isPrivate)
.filter((i) => !excludeHidden || !state.data[i]?.hideFromTimeline)
.flatMap((id) => getListFeedIds(id) ?? []),
)
const inboxIds = view === FeedViewType.Articles ? getInboxList().map((i) => i.id) : []
const listFeedIds = Array.from(state.listIdByView[view])
.filter((i) => !excludePrivate || !state.data[i]?.isPrivate)
.filter((i) => !excludeHidden || !state.data[i]?.hideFromTimeline)
.flatMap((id) => getListFeedIds(id) ?? [])
// Use Set to remove duplicates when feeds exist in both subscriptions and lists
return Array.from(new Set([...feedIds, ...inboxIds, ...listFeedIds]))
}
export const getSubscribedFeedIdsByView = (view: FeedViewType): string[] => {
@ -151,9 +155,12 @@ const sortGroupedSubscriptionByUnread = (
// Store selector functions (for React hooks)
export const getSubscriptionIdsByViewSelector = (state: StateType) => (view: FeedViewType) => {
return Array.from(state.feedIdByView[view])
.concat(view === FeedViewType.Articles ? getInboxList().map((i) => i.id) : [])
.concat(Array.from(state.listIdByView[view]).flatMap((id) => getListFeedIds(id) ?? []))
const feedIds = Array.from(state.feedIdByView[view])
const inboxIds = view === FeedViewType.Articles ? getInboxList().map((i) => i.id) : []
const listFeedIds = Array.from(state.listIdByView[view]).flatMap((id) => getListFeedIds(id) ?? [])
// Use Set to remove duplicates when feeds exist in both subscriptions and lists
return Array.from(new Set([...feedIds, ...inboxIds, ...listFeedIds]))
}
export const getFeedSubscriptionIdsByViewSelector =