feat(mobile): edit feed subscription

hyoban · hyoban · commit f9d48e955637 · 2025-04-28T16:27:20.000+08:00
diff --git a/apps/mobile/src/modules/context-menu/feeds.tsx b/apps/mobile/src/modules/context-menu/feeds.tsx
@@ -14,6 +14,7 @@ import { views } from "@/src/constants/views"
 import { useNavigation } from "@/src/lib/navigation/hooks"
 import type { Navigation } from "@/src/lib/navigation/Navigation"
 import { toast } from "@/src/lib/toast"
+import { FollowScreen } from "@/src/screens/(modal)/FollowScreen"
 import { FeedScreen } from "@/src/screens/(stack)/feeds/[feedId]/FeedScreen"
 import { useEntryIdsByFeedId, usePrefetchEntries } from "@/src/store/entry/hooks"
 import { getFeed } from "@/src/store/feed/getter"
@@ -170,7 +171,18 @@ const generateSubscriptionContextMenu = (navigation: Navigation, id: string) =>
         </ContextMenu.SubContent>
       </ContextMenu.Sub>
 
-      <ContextMenu.Item key="Edit">
+      <ContextMenu.Item
+        key="Edit"
+        onSelect={() => {
+          const subscription = getSubscription(id)
+          if (!subscription || !subscription.feedId) return
+
+          navigation.presentControllerView(FollowScreen, {
+            type: "feed",
+            id: subscription.feedId,
+          })
+        }}
+      >
         <ContextMenu.ItemTitle>{t("operation.edit")}</ContextMenu.ItemTitle>
         <ContextMenu.ItemIcon
           ios={{
diff --git a/apps/mobile/src/modules/feed/FollowFeed.tsx b/apps/mobile/src/modules/feed/FollowFeed.tsx
@@ -32,7 +32,7 @@ const formSchema = z.object({
   isPrivate: z.boolean().optional(),
   title: z.string().optional(),
 })
-const defaultValues = { view: FeedViewType.Articles }
+
 export function FollowFeed(props: { id: string }) {
   const { id } = props
   const feed = useFeed(id as string)
@@ -72,12 +72,18 @@ export function FollowUrl(props: { url: string }) {
 function FollowImpl(props: { feedId: string }) {
   const { feedId: id } = props
 
-  const feed = useFeed(id as string)!
-  const isSubscribed = useSubscriptionByFeedId(feed?.id || "")
+  const feed = useFeed(id)
+  const subscription = useSubscriptionByFeedId(feed?.id)
+  const isSubscribed = !!subscription
 
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
-    defaultValues,
+    defaultValues: {
+      category: subscription?.category ?? "",
+      isPrivate: subscription?.isPrivate ?? false,
+      title: subscription?.title ?? "",
+      view: subscription?.view ?? FeedViewType.Articles,
+    },
   })
 
   const [isLoading, setIsLoading] = useState(false)
@@ -89,17 +95,28 @@ function FollowImpl(props: { feedId: string }) {
     setIsLoading(true)
     const values = form.getValues()
     const body: SubscriptionForm = {
-      url: feed.url,
+      url: feed?.url,
       view: values.view,
       category: values.category ?? "",
       isPrivate: values.isPrivate ?? false,
       title: values.title ?? "",
-      feedId: feed.id,
+      feedId: feed?.id,
     }
 
-    await subscriptionSyncService.subscribe(body).finally(() => {
-      setIsLoading(false)
-    })
+    if (isSubscribed) {
+      await subscriptionSyncService
+        .edit({
+          ...subscription,
+          ...body,
+        })
+        .finally(() => {
+          setIsLoading(false)
+        })
+    } else {
+      await subscriptionSyncService.subscribe(body).finally(() => {
+        setIsLoading(false)
+      })
+    }
 
     if (canDismiss) {
       navigate.dismiss()
diff --git a/apps/mobile/src/store/subscription/hooks.ts b/apps/mobile/src/store/subscription/hooks.ts
@@ -255,8 +255,8 @@ export const getSubscriptionCategory = (view?: FeedViewType) => {
   return view === undefined ? [] : Array.from(state.categories[view])
 }
 
-export const useSubscriptionByFeedId = (feedId: string) =>
-  useSubscriptionStore(useCallback((state) => state.data[feedId] || null, [feedId]))
+export const useSubscriptionByFeedId = (feedId?: string) =>
+  useSubscriptionStore(useCallback((state) => (feedId ? state.data[feedId] : undefined), [feedId]))
 
 export const useSubscriptionByListId = (listId: string) =>
   useSubscriptionStore(useCallback((state) => state.data[listId] || null, [listId]))

Original file line number	Diff line number	Diff line change
`@@ -255,8 +255,8 @@ export const getSubscriptionCategory = (view?: FeedViewType) => {`
`255`	`255`	`return view === undefined ? [] : Array.from(state.categories[view])`
`256`	`256`	`}`
`257`	`257`
`258`		`-export const useSubscriptionByFeedId = (feedId: string) =>`
`259`		`- useSubscriptionStore(useCallback((state) => state.data[feedId] \|\| null, [feedId]))`
	`258`	`+export const useSubscriptionByFeedId = (feedId?: string) =>`
	`259`	`+ useSubscriptionStore(useCallback((state) => (feedId ? state.data[feedId] : undefined), [feedId]))`
`260`	`260`
`261`	`261`	`export const useSubscriptionByListId = (listId: string) =>`
`262`	`262`	`useSubscriptionStore(useCallback((state) => state.data[listId] \|\| null, [listId]))`