Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

reduce code duplication

Browse Source
This commit is contained in:
Athou
2026-02-21 23:24:03 +01:00
parent da8d720dc4
commit b3d6ae467f
2 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
commafeed-client/src/app/store.ts
View File

@@ -1,5 +1,5 @@
import { configureStore } from "@reduxjs/toolkit" import { configureStore } from "@reduxjs/toolkit"
import { type TypedUseSelectorHook, useDispatch, useSelector } from "react-redux" import { shallowEqual, type TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"
import { entriesSlice } from "@/app/entries/slice" import { entriesSlice } from "@/app/entries/slice"
import { redirectSlice } from "@/app/redirect/slice" import { redirectSlice } from "@/app/redirect/slice"
import { serverSlice } from "@/app/server/slice" import { serverSlice } from "@/app/server/slice"
@@ -41,3 +41,4 @@ export type AppDispatch = typeof store.dispatch
export const useAppDispatch: () => AppDispatch = useDispatch export const useAppDispatch: () => AppDispatch = useDispatch
export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
export const useShallowEqualAppSelector: TypedUseSelectorHook<RootState> = selector => useSelector(selector, shallowEqual)

46
commafeed-client/src/pages/app/FeedEntriesPage.tsx
View File

@@ -8,7 +8,7 @@ import { Constants } from "@/app/constants"
import type { EntrySourceType } from "@/app/entries/slice" import type { EntrySourceType } from "@/app/entries/slice"
import { loadEntries } from "@/app/entries/thunks" import { loadEntries } from "@/app/entries/thunks"
import { redirectToCategoryDetails, redirectToFeedDetails, redirectToTagDetails } from "@/app/redirect/thunks" import { redirectToCategoryDetails, redirectToFeedDetails, redirectToTagDetails } from "@/app/redirect/thunks"
import { useAppDispatch, useAppSelector } from "@/app/store" import { useAppDispatch, useAppSelector, useShallowEqualAppSelector } from "@/app/store"
import { categoryHasNewEntries, categoryUnreadCount, flattenCategoryTree } from "@/app/utils" import { categoryHasNewEntries, categoryUnreadCount, flattenCategoryTree } from "@/app/utils"
import { FeedEntries } from "@/components/content/FeedEntries" import { FeedEntries } from "@/components/content/FeedEntries"
import { UnreadCount } from "@/components/sidebar/UnreadCount" import { UnreadCount } from "@/components/sidebar/UnreadCount"
@@ -52,39 +52,29 @@ export function FeedEntriesPage(props: Readonly<FeedEntriesPageProps>) {
const hasMore = useAppSelector(state => state.entries.hasMore) const hasMore = useAppSelector(state => state.entries.hasMore)
const mobile = useMobile() const mobile = useMobile()
const sidebarVisible = useAppSelector(state => state.tree.sidebarVisible) const sidebarVisible = useAppSelector(state => state.tree.sidebarVisible)
const unreadCount = useAppSelector(state => { const { unreadCount, hasNewEntries } = useShallowEqualAppSelector(state => {
const root = state.tree.rootCategory const root = state.tree.rootCategory
if (!root) return 0 if (!root) return { unreadCount: 0, hasNewEntries: false }
if (props.sourceType === "category") { if (props.sourceType === "category") {
if (id === Constants.categories.starred.id) return 0 const category = id === Constants.categories.all.id ? root : flattenCategoryTree(root).find(c => c.id === id)
if (id === Constants.categories.all.id) return categoryUnreadCount(root) return {
const category = flattenCategoryTree(root).find(c => c.id === id) unreadCount: categoryUnreadCount(category),
return categoryUnreadCount(category) hasNewEntries: categoryHasNewEntries(category),
}
} }
if (props.sourceType === "feed") { if (props.sourceType === "feed") {
return ( const feed = flattenCategoryTree(root)
flattenCategoryTree(root)
.flatMap(c => c.feeds)
.find(f => String(f.id) === id)?.unread ?? 0
)
}
return 0
})
const hasNewEntries = useAppSelector(state => {
const root = state.tree.rootCategory
if (!root) return false
if (props.sourceType === "category") {
if (id === Constants.categories.starred.id) return false
if (id === Constants.categories.all.id) return categoryHasNewEntries(root)
const category = flattenCategoryTree(root).find(c => c.id === id)
return categoryHasNewEntries(category)
}
if (props.sourceType === "feed") {
return !!flattenCategoryTree(root)
.flatMap(c => c.feeds) .flatMap(c => c.feeds)
.find(f => String(f.id) === id)?.hasNewEntries .find(f => f.id === +id)
return {
unreadCount: feed?.unread ?? 0,
hasNewEntries: !!feed?.hasNewEntries,
}
} }
return false
return { unreadCount: 0, hasNewEntries: false }
}) })
const showUnreadCount = mobile || !sidebarVisible const showUnreadCount = mobile || !sidebarVisible
const dispatch = useAppDispatch() const dispatch = useAppDispatch()