From 4cbe2a2d816e1a56bd89206d1026fc19d86d47b1 Mon Sep 17 00:00:00 2001
From: Innei <i@innei.in>
Date: Thu, 12 Sep 2024 21:21:12 +0800
Subject: [PATCH] fix: search entries

Signed-off-by: Innei <i@innei.in>
---
 src/renderer/src/modules/panel/cmdk.tsx |  2 +-
 src/renderer/src/store/search/index.ts  | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/modules/panel/cmdk.tsx b/src/renderer/src/modules/panel/cmdk.tsx
index cd7893ab6..1e1aaf181 100644
--- a/src/renderer/src/modules/panel/cmdk.tsx
+++ b/src/renderer/src/modules/panel/cmdk.tsx
@@ -334,7 +334,7 @@ const SearchOptions: Component = memo(({ children }) => {
         <SelectTrigger size="sm">
           <SelectValue />
         </SelectTrigger>
-        <SelectContent>
+        <SelectContent position="item-aligned">
           <SelectItem
             className="hover:bg-theme-item-hover"
             value={`${SearchType.All}`}
diff --git a/src/renderer/src/store/search/index.ts b/src/renderer/src/store/search/index.ts
index 30f348c93..5d3a249a1 100644
--- a/src/renderer/src/store/search/index.ts
+++ b/src/renderer/src/store/search/index.ts
@@ -1,7 +1,5 @@
 import type { EntryModel } from "@renderer/models"
 import {
-  EntryRelatedKey,
-  EntryRelatedService,
   EntryService,
   FeedService,
   SubscriptionService,
@@ -40,15 +38,16 @@ class SearchActions {
   }
 
   async createLocalDbSearch() {
-    const [entries, feeds, subscriptions, entryRelated] = await Promise.all([
+    const [entries, feeds, subscriptions] = await Promise.all([
       EntryService.findAll(),
       FeedService.findAll(),
       SubscriptionService.findAll(),
-      EntryRelatedService.findAll(EntryRelatedKey.FEED_ID),
     ])
 
+    const feedsMap = new Map(feeds.map((feed) => [feed.id, feed]))
+
     const entriesFuse = this.createFuse(entries, ["title", "content", "description", "id"])
-    const feedsFuse = this.createFuse(feeds, ["title", "description", "id"])
+    const feedsFuse = this.createFuse(feeds, ["title", "description", "id", "siteUrl", "url"])
     const subscriptionsFuse = this.createFuse(subscriptions, ["title", "category"])
 
     return defineSearchInstance({
@@ -67,7 +66,7 @@ class SearchActions {
 
         const processedEntries = [] as SearchResult<EntryModel, { feedId: string }>[]
         for (const entry of entries) {
-          const feedId = entryRelated[entry.item.id]
+          const feedId = feedsMap.get(entry.item.feedId)?.id
           if (feedId) {
             processedEntries.push({ item: entry.item, feedId })
           }