feat: compatible with feeds without siteURL

RSSNext · Aug 28, 2024 · 87dc225 · 87dc225
1 parent 085f30d
commit 87dc225
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/src/renderer/src/components/feed-icon.tsx b/src/renderer/src/components/feed-icon.tsx
@@ -65,6 +65,18 @@ export function FeedIcon({
       )
       break
     }
+    default: {
+      ImageElement = (
+        <i
+          className="i-mgc-link-cute-re mr-2 shrink-0"
+          style={{
+            width: size,
+            height: size,
+          }}
+        />
+      )
+      break
+    }
   }
 
   const colors = useMemo(

diff --git a/src/renderer/src/queries/feed.ts b/src/renderer/src/queries/feed.ts
@@ -1,3 +1,4 @@
+import { ROUTE_FEED_PENDING } from "@renderer/constants"
 import { useAuthQuery } from "@renderer/hooks/common"
 import { apiClient, getFetchErrorMessage } from "@renderer/lib/api-fetch"
 import { defineQuery } from "@renderer/lib/defineQuery"
@@ -44,7 +45,7 @@ export const useFeed = ({ id, url }: FeedQueryParams) =>
       url,
     }),
     {
-      enabled: !!id || !!url,
+      enabled: (!!id || !!url) && id !== ROUTE_FEED_PENDING,
     },
   )
 

diff --git a/src/renderer/src/store/subscription/store.ts b/src/renderer/src/store/subscription/store.ts
@@ -36,11 +36,14 @@ function morphResponseData(data: SubscriptionModel[]): SubscriptionFlatModel[] {
     const cloned: SubscriptionFlatModel = { ...subscription }
     if (!subscription.category && subscription.feeds) {
       const { siteUrl } = subscription.feeds
-      if (!siteUrl) continue
-      const parsed = parse(siteUrl)
+      if (!siteUrl) {
+        cloned.defaultCategory = subscription.feedId
+      } else {
+        const parsed = parse(siteUrl)
 
-      if (parsed.domain) {
-        cloned.defaultCategory = capitalizeFirstLetter(parsed.domain)
+        if (parsed.domain) {
+          cloned.defaultCategory = capitalizeFirstLetter(parsed.domain)
+        }
       }
     }
     result.push(cloned)