feat(mobile): auto group

hyoban · hyoban · commit c418dea39677 · 2025-04-28T15:48:25.000+08:00
diff --git a/apps/mobile/src/modules/settings/routes/General.tsx b/apps/mobile/src/modules/settings/routes/General.tsx
@@ -99,8 +99,7 @@ export const GeneralScreen: NavigationControllerView = () => {
 
   const translation = useGeneralSettingKey("translation")
   const summary = useGeneralSettingKey("summary")
-  // TODO: support autoGroup
-  // const autoGroup = useGeneralSettingKey("autoGroup")
+  const autoGroup = useGeneralSettingKey("autoGroup")
   const showUnreadOnLaunch = useGeneralSettingKey("unreadOnly")
   // const groupByDate = useGeneralSettingKey("groupByDate")
   const expandLongSocialMedia = useGeneralSettingKey("autoExpandLongSocialMedia")
@@ -147,7 +146,7 @@ export const GeneralScreen: NavigationControllerView = () => {
 
       {/* Subscriptions */}
 
-      {/* <GroupedInsetListSectionHeader label={t("general.subscriptions")} />
+      <GroupedInsetListSectionHeader label={t("general.subscriptions")} />
       <GroupedInsetListCard>
         <GroupedInsetListCell
           label={t("general.auto_group.label")}
@@ -161,7 +160,7 @@ export const GeneralScreen: NavigationControllerView = () => {
             }}
           />
         </GroupedInsetListCell>
-      </GroupedInsetListCard> */}
+      </GroupedInsetListCard>
 
       {/* Timeline */}
 
diff --git a/apps/mobile/src/store/entry/store.ts b/apps/mobile/src/store/entry/store.ts
@@ -12,6 +12,7 @@ import { collectionActions } from "../collection/store"
 import { feedActions } from "../feed/store"
 import { createImmerSetter, createTransaction, createZustandStore } from "../internal/helper"
 import { getSubscription } from "../subscription/getter"
+import { getDefaultCategory } from "../subscription/utils"
 import type { PublishAtTimeRangeFilter } from "../unread/types"
 import { getEntry } from "./getter"
 import type { EntryModel, FetchEntriesProps } from "./types"
@@ -93,13 +94,13 @@ class EntryActions {
   }) {
     if (!feedId) return
     const subscription = getSubscription(feedId)
-    if (subscription?.category) {
-      const entryIdSetByCategory = draft.entryIdByCategory[subscription.category]
-      if (!entryIdSetByCategory) {
-        draft.entryIdByCategory[subscription.category] = new Set([entryId])
-      } else {
-        entryIdSetByCategory.add(entryId)
-      }
+    const category = subscription?.category || getDefaultCategory(subscription)
+    if (!category) return
+    const entryIdSetByCategory = draft.entryIdByCategory[category]
+    if (!entryIdSetByCategory) {
+      draft.entryIdByCategory[category] = new Set([entryId])
+    } else {
+      entryIdSetByCategory.add(entryId)
     }
   }
 
diff --git a/apps/mobile/src/store/subscription/getter.ts b/apps/mobile/src/store/subscription/getter.ts
@@ -3,6 +3,7 @@ import type { FeedViewType } from "@follow/constants"
 import { getListFeedIds } from "../list/getters"
 import type { SubscriptionModel } from "./store"
 import { useSubscriptionStore } from "./store"
+import { getDefaultCategory } from "./utils"
 
 const get = useSubscriptionStore.getState
 export const getSubscription = (id?: string): SubscriptionModel | undefined => {
@@ -33,7 +34,10 @@ export const getSubscriptionByCategory = ({
 
   const ids = [] as string[]
   for (const id of Object.keys(state.data)) {
-    if (state.data[id]!.category === category && state.data[id]!.view === view) {
+    const subscriptionCategory = state.data[id]
+      ? state.data[id].category || getDefaultCategory(state.data[id])
+      : null
+    if (subscriptionCategory === category && state.data[id]!.view === view) {
       ids.push(id)
     }
   }
diff --git a/apps/mobile/src/store/subscription/hooks.ts b/apps/mobile/src/store/subscription/hooks.ts
@@ -3,6 +3,7 @@ import { sortByAlphabet } from "@follow/utils"
 import { useQuery } from "@tanstack/react-query"
 import { useCallback } from "react"
 
+import { getGeneralSettings } from "@/src/atoms/settings/general"
 import { views } from "@/src/constants/views"
 
 import { getFeed } from "../feed/getter"
@@ -15,6 +16,7 @@ import {
   getSubscriptionByView,
 } from "./getter"
 import { subscriptionSyncService, useSubscriptionStore } from "./store"
+import { getDefaultCategory } from "./utils"
 
 export const usePrefetchSubscription = (view?: FeedViewType) => {
   return useQuery({
@@ -61,13 +63,23 @@ export const useGroupedSubscription = (view: FeedViewType) => {
 
         const grouped = {} as Record<string, string[]>
         const unGrouped = []
+        const { autoGroup } = getGeneralSettings()
+        const autoGrouped = {} as Record<string, string[]>
 
         for (const feedId of feedIds) {
           const subscription = state.data[feedId]
           if (!subscription) continue
           const { category } = subscription
           if (!category) {
-            unGrouped.push(feedId)
+            const defaultCategory = getDefaultCategory(subscription)
+            if (defaultCategory && autoGroup) {
+              if (!autoGrouped[defaultCategory]) {
+                autoGrouped[defaultCategory] = []
+              }
+              autoGrouped[defaultCategory].push(feedId)
+            } else {
+              unGrouped.push(feedId)
+            }
             continue
           }
           if (!grouped[category]) {
@@ -76,6 +88,16 @@ export const useGroupedSubscription = (view: FeedViewType) => {
           grouped[category].push(feedId)
         }
 
+        if (autoGroup) {
+          for (const category of Object.keys(autoGrouped)) {
+            if (autoGrouped[category] && autoGrouped[category].length > 1) {
+              grouped[category] = autoGrouped[category]
+            } else {
+              unGrouped.push(...autoGrouped[category]!)
+            }
+          }
+        }
+
         return {
           grouped,
           unGrouped,
diff --git a/apps/mobile/src/store/subscription/utils.ts b/apps/mobile/src/store/subscription/utils.ts
@@ -1,3 +1,6 @@
+import { capitalizeFirstLetter, parseUrl } from "@follow/utils"
+
+import { getFeed } from "../feed/getter"
 import type { SubscriptionModel } from "./store"
 
 export const getInboxStoreId = (inboxId: string) => `inbox/${inboxId}`
@@ -8,3 +11,13 @@ export const getSubscriptionStoreId = (subscription: SubscriptionModel) => {
   if (subscription.inboxId) return getInboxStoreId(subscription.inboxId)
   throw new Error("Invalid subscription")
 }
+
+export const getDefaultCategory = (subscription?: SubscriptionModel) => {
+  if (!subscription) return null
+  const { feedId } = subscription
+  if (!feedId) return null
+  const siteUrl = getFeed(feedId)?.siteUrl
+  if (!siteUrl) return null
+  const parsed = parseUrl(siteUrl)
+  return parsed?.domain ? capitalizeFirstLetter(parsed.domain) : null
+}
