feat: allow hide private subscription in view timeline (#3773)

Author: hyoban

apps/desktop/layer/renderer/src/lib/defineQuery.ts

@@ -12,7 +12,10 @@ export type DefinedQuery<TQueryKey extends QueryKey, TData> = Readonly<{
   cancel: (key?: (key: TQueryKey) => QueryKey) => Promise<void>
   remove: (key?: (key: TQueryKey) => QueryKey) => Promise<void>
 
-  invalidate: (key?: (key: TQueryKey) => QueryKey) => Promise<void>
+  invalidate: (options?: {
+    keyExtractor?: (key: TQueryKey) => QueryKey
+    exact?: boolean
+  }) => Promise<void>
   invalidateRoot: () => void
 
   refetch: () => Promise<TData | undefined>
@@ -107,12 +110,14 @@ export function defineQuery<
       const queryKey = typeof keyExtactor === "function" ? keyExtactor(key) : key
       queryClient.removeQueries({ queryKey })
     },
-    invalidate: async (keyExtactor) => {
-      const queryKey = typeof keyExtactor === "function" ? keyExtactor(key) : key
+    invalidate: async (args) => {
+      const { keyExtractor, exact } = args || {}
+      const queryKey = typeof keyExtractor === "function" ? keyExtractor(key) : key
 
       await queryClient.invalidateQueries({
         queryKey,
         refetchType: "all",
+        exact,
       })
       options?.onInvalidate?.()
     },

apps/desktop/layer/renderer/src/modules/discover/FeedForm.tsx

@@ -25,13 +25,15 @@ import { useTranslation } from "react-i18next"
 import { toast } from "sonner"
 import { z } from "zod"
 
+import { getGeneralSettings } from "~/atoms/settings/general"
 import { Autocomplete } from "~/components/ui/auto-completion"
 import { useCurrentModal, useIsInModal } from "~/components/ui/modal/stacked/hooks"
 import { getRouteParams } from "~/hooks/biz/useRouteParams"
 import { useAuthQuery, useI18n } from "~/hooks/common"
 import { apiClient } from "~/lib/api-fetch"
 import { tipcClient } from "~/lib/client"
 import { toastFetchError } from "~/lib/error-parser"
+import { entries as entriesQuery } from "~/queries/entries"
 import { feed as feedQuery, useFeedQuery } from "~/queries/feed"
 import { subscription as subscriptionQuery } from "~/queries/subscriptions"
 import { useFeedByIdOrUrl } from "~/store/feed"
@@ -245,6 +247,16 @@ const FeedInnerForm = ({
       })
     },
     onSuccess: (_, variables) => {
+      if (getGeneralSettings().hidePrivateSubscriptionsInTimeline) {
+        entriesQuery
+          .entries({
+            feedId: "all",
+            view: Number(variables.view),
+            excludePrivate: true,
+          })
+          .invalidate({ exact: true })
+      }
+
       if (isSubscribed && variables.view !== `${subscription?.view}`) {
         feedUnreadActions.fetchUnreadByView(subscription?.view)
       } else {

apps/desktop/layer/renderer/src/modules/discover/ListForm.tsx

@@ -24,13 +24,15 @@ import { useTranslation } from "react-i18next"
 import { toast } from "sonner"
 import { z } from "zod"
 
+import { getGeneralSettings } from "~/atoms/settings/general"
 import { useCurrentModal } from "~/components/ui/modal/stacked/hooks"
 import { useI18n } from "~/hooks/common"
 import { apiClient } from "~/lib/api-fetch"
 import { tipcClient } from "~/lib/client"
 import { getFetchErrorMessage, toastFetchError } from "~/lib/error-parser"
 import { getNewIssueUrl } from "~/lib/issues"
 import { FollowSummary } from "~/modules/feed/feed-summary"
+import { entries as entriesQuery } from "~/queries/entries"
 import { lists as listsQuery, useList } from "~/queries/lists"
 import { subscription as subscriptionQuery } from "~/queries/subscriptions"
 import { useListById } from "~/store/list"
@@ -219,6 +221,16 @@ const ListInnerForm = ({
       })
     },
     onSuccess: (_, variables) => {
+      if (getGeneralSettings().hidePrivateSubscriptionsInTimeline) {
+        entriesQuery
+          .entries({
+            feedId: "all",
+            view: Number(variables.view),
+            excludePrivate: true,
+          })
+          .invalidate({ exact: true })
+      }
+
       if (isSubscribed && variables.view !== `${subscription?.view}`) {
         feedUnreadActions.fetchUnreadByView(subscription?.view)
       } else {

apps/desktop/layer/renderer/src/modules/entry-column/hooks/useEntriesByView.ts

@@ -51,6 +51,9 @@ const useRemoteEntries = (): UseEntriesReturn => {
   const isPreview = useIsPreviewFeed()
 
   const unreadOnly = useGeneralSettingKey("unreadOnly")
+  const hidePrivateSubscriptionsInTimeline = useGeneralSettingKey(
+    "hidePrivateSubscriptionsInTimeline",
+  )
 
   const folderIds = useFolderFeedsByFeedId({
     feedId,
@@ -64,14 +67,24 @@ const useRemoteEntries = (): UseEntriesReturn => {
       listId,
       view,
       ...(unreadOnly === true && !isPreview && { read: false }),
+      ...(hidePrivateSubscriptionsInTimeline === true && { excludePrivate: true }),
     }
 
     if (feedId && listId && isBizId(feedId)) {
       delete params.listId
     }
 
     return params
-  }, [feedId, folderIds, inboxId, listId, unreadOnly, view, isPreview])
+  }, [
+    feedId,
+    folderIds,
+    inboxId,
+    listId,
+    unreadOnly,
+    isPreview,
+    view,
+    hidePrivateSubscriptionsInTimeline,
+  ])
   const query = useEntries(entriesOptions)
 
   const [fetchedTime, setFetchedTime] = useState<number>()
@@ -134,6 +147,9 @@ const useLocalEntries = (): UseEntriesReturn => {
   const { feedId, view, inboxId, listId, isAllFeeds } = useRouteParams()
 
   const unreadOnly = useGeneralSettingKey("unreadOnly")
+  const hidePrivateSubscriptionsInTimeline = useGeneralSettingKey(
+    "hidePrivateSubscriptionsInTimeline",
+  )
 
   const folderIds = useFolderFeedsByFeedId({
     feedId,
@@ -145,6 +161,7 @@ const useLocalEntries = (): UseEntriesReturn => {
     {
       unread: unreadOnly,
       view,
+      excludePrivate: hidePrivateSubscriptionsInTimeline,
     },
   )
 

apps/desktop/layer/renderer/src/modules/entry-column/hooks/useMarkAll.ts

@@ -1,3 +1,4 @@
+import { getGeneralSettings } from "~/atoms/settings/general"
 import { getRouteParams } from "~/hooks/biz/useRouteParams"
 import { getFolderFeedsByFeedId, subscriptionActions } from "~/store/subscription"
 
@@ -17,7 +18,12 @@ export const markAllByRoute = async (filter?: MarkAllFilter) => {
   if (!routerParams) return
 
   if (typeof routerParams.feedId === "number" || routerParams.isAllFeeds) {
-    subscriptionActions.markReadByView(view, filter)
+    const { hidePrivateSubscriptionsInTimeline } = getGeneralSettings()
+    subscriptionActions.markReadByView({
+      view,
+      filter,
+      excludePrivate: hidePrivateSubscriptionsInTimeline,
+    })
   } else if (inboxId) {
     subscriptionActions.markReadByFeedIds({
       inboxId,

apps/desktop/layer/renderer/src/modules/settings/tabs/general.tsx

@@ -103,11 +103,14 @@ export const SettingGeneral = () => {
             label: t("general.auto_group.label"),
             description: t("general.auto_group.description"),
           }),
-
           defineSettingItem("hideAllReadSubscriptions", {
             label: t("general.hide_all_read_subscriptions.label"),
             description: t("general.hide_all_read_subscriptions.description"),
           }),
+          defineSettingItem("hidePrivateSubscriptionsInTimeline", {
+            label: t("general.hide_private_subscriptions_in_timeline.label"),
+            description: t("general.hide_private_subscriptions_in_timeline.description"),
+          }),
 
           {
             type: "title",

apps/desktop/layer/renderer/src/queries/entries.ts

@@ -13,24 +13,27 @@ export const entries = {
     listId,
     view,
     read,
+    excludePrivate,
     limit,
   }: {
     feedId?: number | string
     inboxId?: number | string
     listId?: number | string
     view?: number
     read?: boolean
+    excludePrivate?: boolean
     limit?: number
   }) =>
     defineQuery(
-      ["entries", inboxId || listId || feedId, view, read, limit],
+      ["entries", inboxId || listId || feedId, view, read, excludePrivate, limit],
       async ({ pageParam }) =>
         entryActions.fetchEntries({
           feedId,
           inboxId,
           listId,
           view,
           read,
+          excludePrivate,
           limit,
           pageParam: pageParam as string,
         }),
@@ -130,30 +133,35 @@ export const useEntries = ({
   listId,
   view,
   read,
+  excludePrivate,
 }: {
   feedId?: number | string
   inboxId?: number | string
   listId?: number | string
   view?: number
   read?: boolean
+  excludePrivate?: boolean
 }) => {
   const fetchUnread = read === false
   const feedUnreadDirty = useFeedUnreadIsDirty((feedId as string) || "")
 
-  return useAuthInfiniteQuery(entries.entries({ feedId, inboxId, listId, view, read }), {
-    enabled: feedId !== undefined || inboxId !== undefined || listId !== undefined,
-    getNextPageParam: (lastPage) => lastPage.data?.at(-1)?.entries.publishedAt,
-    initialPageParam: undefined,
-    refetchOnWindowFocus: false,
-    refetchOnReconnect: false,
-    // DON'T refetch when the router is pop to previous page
-    refetchOnMount: fetchUnread && feedUnreadDirty && !history.isPop ? "always" : false,
+  return useAuthInfiniteQuery(
+    entries.entries({ feedId, inboxId, listId, view, read, excludePrivate }),
+    {
+      enabled: feedId !== undefined || inboxId !== undefined || listId !== undefined,
+      getNextPageParam: (lastPage) => lastPage.data?.at(-1)?.entries.publishedAt,
+      initialPageParam: undefined,
+      refetchOnWindowFocus: false,
+      refetchOnReconnect: false,
+      // DON'T refetch when the router is pop to previous page
+      refetchOnMount: fetchUnread && feedUnreadDirty && !history.isPop ? "always" : false,
 
-    staleTime:
-      // Force refetch unread entries when feed is dirty
-      // HACK: disable refetch when the router is pop to previous page
-      history.isPop ? Infinity : fetchUnread && feedUnreadDirty ? 0 : defaultStaleTime,
-  })
+      staleTime:
+        // Force refetch unread entries when feed is dirty
+        // HACK: disable refetch when the router is pop to previous page
+        history.isPop ? Infinity : fetchUnread && feedUnreadDirty ? 0 : defaultStaleTime,
+    },
+  )
 }
 
 export const useEntriesPreview = ({ id }: { id?: string }) =>

apps/desktop/layer/renderer/src/store/entry/hooks.ts

@@ -5,7 +5,7 @@ import { useCallback } from "react"
 import { FEED_COLLECTION_LIST, ROUTE_FEED_IN_FOLDER } from "~/constants"
 
 import { useListsFeedIds } from "../list"
-import { useFeedIdByView } from "../subscription"
+import { useFeedIdByView, useNonPrivateSubscriptionIds } from "../subscription"
 import { getEntryIsInView, getFilteredFeedIds } from "./helper"
 import { useEntryStore } from "./store"
 import type { EntryFilter, FlatEntryModel } from "./types"
@@ -82,12 +82,15 @@ export const useEntryIdsByFeedId = (feedId: string, filter?: EntryFilter) =>
 
 export const useEntryIdsByView = (view: FeedViewType, filter?: EntryFilter) => {
   const feedIds = useFeedIdByView(view)
-  const listFeedIds = useListsFeedIds(feedIds)
+  const nonPrivateFeedIds = useNonPrivateSubscriptionIds(feedIds)
+  const finalFeedIds = filter?.excludePrivate ? nonPrivateFeedIds : feedIds
+  const listFeedIds = useListsFeedIds(finalFeedIds)
 
   return useEntryStore(
     useCallback(
-      () => getFilteredFeedIds(Array.from(new Set([...feedIds, ...listFeedIds])), filter) || [],
-      [feedIds, listFeedIds, filter],
+      () =>
+        getFilteredFeedIds(Array.from(new Set([...finalFeedIds, ...listFeedIds])), filter) || [],
+      [finalFeedIds, listFeedIds, filter],
     ),
   )
 }

apps/desktop/layer/renderer/src/store/entry/store.ts

@@ -113,6 +113,7 @@ class EntryActions {
     listId,
     view,
     read,
+    excludePrivate,
     limit,
     pageParam,
   }: {
@@ -121,6 +122,7 @@ class EntryActions {
     listId?: number | string
     view?: number
     read?: boolean
+    excludePrivate?: boolean
     limit?: number
     pageParam?: string
   }) {
@@ -163,6 +165,7 @@ class EntryActions {
         publishedAfter: pageParam,
         read,
         limit,
+        excludePrivate,
         ...params,
       },
     })

apps/desktop/layer/renderer/src/store/entry/types.ts

@@ -31,4 +31,5 @@ export interface EntryState {
 export interface EntryFilter {
   unread?: boolean
   view?: FeedViewType
+  excludePrivate?: boolean
 }