diff options
| -rw-r--r-- | apps/web/app/reader/_components/sidebar-content.tsx | 14 | ||||
| -rw-r--r-- | supabase/schema.sql | 7 |
2 files changed, 12 insertions, 9 deletions
diff --git a/apps/web/app/reader/_components/sidebar-content.tsx b/apps/web/app/reader/_components/sidebar-content.tsx index bd11470..c490cf4 100644 --- a/apps/web/app/reader/_components/sidebar-content.tsx +++ b/apps/web/app/reader/_components/sidebar-content.tsx @@ -150,16 +150,20 @@ export function SidebarContent() { (subscription) => !subscription.folderIdentifier ) - const totalUnreadCount = Object.values(unreadCounts ?? {}).reduce( - (sum, count) => sum + count, - 0 - ) + const totalUnreadCount = subscriptions + .filter((subscription) => !subscription.hiddenFromTimeline) + .reduce( + (sum, subscription) => + sum + (unreadCounts?.[subscription.feedIdentifier] ?? 0), + 0 + ) function getFolderUnreadCount(folderIdentifier: string): number { return subscriptions .filter( (subscription) => - subscription.folderIdentifier === folderIdentifier + subscription.folderIdentifier === folderIdentifier && + !subscription.hiddenFromTimeline ) .reduce( (sum, subscription) => diff --git a/supabase/schema.sql b/supabase/schema.sql index 449976e..506c127 100644 --- a/supabase/schema.sql +++ b/supabase/schema.sql @@ -2,7 +2,7 @@ -- PostgreSQL database dump -- --- \restrict W2cBW1TPQUb3U4lgbznQs959iNXBLp2VCiLY9C9QxhpgmdbQT0imaeM9WBwSLF7 +-- \restrict 0mmsTcufp2FI3XpIMChzPAZKFqddFPKhI5BSvb2hP6z6YzXtiBKaTn2Wpanvc7Q -- Dumped from database version 17.6 -- Dumped by pg_dump version 17.6 @@ -818,8 +818,7 @@ CREATE OR REPLACE FUNCTION "public"."get_unread_counts"() RETURNS TABLE("feed_id SELECT e.feed_id, COUNT(*) AS unread_count FROM entries e INNER JOIN subscriptions s ON s.feed_id = e.feed_id AND s.user_id = auth.uid() - WHERE s.hidden_from_timeline = false - AND NOT EXISTS ( + WHERE NOT EXISTS ( SELECT 1 FROM user_entry_states ues WHERE ues.entry_id = e.id AND ues.user_id = auth.uid() @@ -3720,5 +3719,5 @@ ALTER DEFAULT PRIVILEGES FOR ROLE "postgres" IN SCHEMA "public" GRANT ALL ON TAB -- PostgreSQL database dump complete -- --- \unrestrict W2cBW1TPQUb3U4lgbznQs959iNXBLp2VCiLY9C9QxhpgmdbQT0imaeM9WBwSLF7 +-- \unrestrict 0mmsTcufp2FI3XpIMChzPAZKFqddFPKhI5BSvb2hP6z6YzXtiBKaTn2Wpanvc7Q |