fix(desktop): follow state for url

Author: hyoban

apps/desktop/layer/renderer/src/hooks/biz/useFollow.tsx

@@ -13,7 +13,7 @@ import { FeedForm } from "~/modules/discover/FeedForm"
 import type { ListFormDataValuesType } from "~/modules/discover/ListForm"
 import { ListForm } from "~/modules/discover/ListForm"
 import {
-  getSubscriptionByFeedId,
+  getSubscriptionByFeedIdOrUrl,
   useFeedSubscriptionCount,
   useListSubscriptionCount,
 } from "~/store/subscription"
@@ -73,10 +73,12 @@ export const useFollow = () => {
       } else {
         canFollowMoreInboxAndNotify("feed")
       }
-      let isFollowed = false
-      if (options?.id) {
-        isFollowed = !!getSubscriptionByFeedId(options.id)
-      }
+
+      const subscription = getSubscriptionByFeedIdOrUrl({
+        id: options?.id,
+        url: options?.url,
+      })
+      const isFollowed = !!subscription
 
       present({
         title: `${isFollowed ? `${t("common:words.edit")} ` : ""}${options?.isList ? t("words.lists") : t("words.feeds")}`,

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

@@ -15,6 +15,7 @@ import { FeedService } from "~/services"
 import { getSubscriptionByFeedId } from "../subscription"
 import { userActions } from "../user"
 import { createImmerSetter, createTransaction, createZustandStore } from "../utils/helper"
+import { feedByIdOrUrlSelector } from "./selector"
 import type { FeedQueryParams, FeedState } from "./types"
 
 export const useFeedStore = createZustandStore<FeedState>("feed")(() => ({
@@ -142,6 +143,9 @@ export const feedActions = new FeedActions()
 
 export const getFeedById = (feedId: string): Nullable<FeedOrListRespModel> =>
   useFeedStore.getState().feeds[feedId]
+export const getFeedByIdOrUrl = (feed: FeedQueryParams): Nullable<FeedOrListRespModel> => {
+  return feedByIdOrUrlSelector(feed)(get())
+}
 
 export const getPreferredTitle = (
   feed?: Pick<FeedOrListRespModel, "type" | "id" | "title"> | null,

apps/desktop/layer/renderer/src/store/subscription/getters.ts

@@ -1,5 +1,7 @@
 import type { FeedViewType } from "@follow/constants"
 
+import type { FeedQueryParams } from "../feed"
+import { getFeedByIdOrUrl } from "../feed"
 import {
   folderFeedsByFeedIdSelector,
   subscriptionByViewSelector,
@@ -12,6 +14,11 @@ export const getSubscriptionByFeedId = (feedId: FeedId) => {
   const state = get()
   return state.data[feedId]
 }
+export const getSubscriptionByFeedIdOrUrl = (params: FeedQueryParams) => {
+  const feed = getFeedByIdOrUrl(params)
+  if (!feed) return
+  return getSubscriptionByFeedId(feed.id)
+}
 
 export const isListSubscription = (feedId?: FeedId) => {
   if (!feedId) return false