From d386a2dbbe531c59aa7c7e16508a1bab4d5a2b99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 7 Jan 2023 22:21:48 +0800
Subject: [PATCH] fix: hashtag id

---
 components/command/CommandPanel.vue     | 2 +-
 components/search/SearchHashtagInfo.vue | 4 +++-
 components/search/SearchWidget.vue      | 2 +-
 components/search/types.ts              | 4 ++--
 composables/masto/search.ts             | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/components/command/CommandPanel.vue b/components/command/CommandPanel.vue
index ed60ff4f..b5c927a2 100644
--- a/components/command/CommandPanel.vue
+++ b/components/command/CommandPanel.vue
@@ -42,7 +42,7 @@ const searchResult = $computed<QueryResult>(() => {
   const hashtagList = hashtags.value.slice(0, 3)
     .map<HashTagResult>(hashtag => ({
       type: 'hashtag',
-      id: hashtag.id,
+      id: `hashtag-${hashtag.name}`,
       hashtag,
       to: getTagRoute(hashtag.name),
     }))
diff --git a/components/search/SearchHashtagInfo.vue b/components/search/SearchHashtagInfo.vue
index 0fe2d1fd..f41350c7 100644
--- a/components/search/SearchHashtagInfo.vue
+++ b/components/search/SearchHashtagInfo.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
 import type { Tag } from 'masto'
 
-const { hashtag } = defineProps<{ hashtag: Tag }>()
+const { hashtag } = defineProps<{
+  hashtag: Tag
+}>()
 
 const totalTrend = $computed(() =>
   hashtag.history?.reduce((total: number, item) => total + (Number(item.accounts) || 0), 0),
diff --git a/components/search/SearchWidget.vue b/components/search/SearchWidget.vue
index 2eaca6a8..8110b642 100644
--- a/components/search/SearchWidget.vue
+++ b/components/search/SearchWidget.vue
@@ -17,7 +17,7 @@ const results = computed(() => {
   const results = [
     ...hashtags.value.slice(0, 3).map<HashTagResult>(hashtag => ({
       type: 'hashtag',
-      id: hashtag.id,
+      id: `hashtag-${hashtag.name}`,
       hashtag,
       to: getTagRoute(hashtag.name),
     })),
diff --git a/components/search/types.ts b/components/search/types.ts
index 66f54e0d..a29a5d8e 100644
--- a/components/search/types.ts
+++ b/components/search/types.ts
@@ -1,4 +1,4 @@
-import type { Account, Status } from 'masto'
+import type { Account, Status, Tag } from 'masto'
 import type { RouteLocation } from 'vue-router'
 
 export type BuildResult<K extends keyof any, T> = {
@@ -10,7 +10,7 @@ export type BuildResult<K extends keyof any, T> = {
     href: string
   }
 }
-export type HashTagResult = BuildResult<'hashtag', any>
+export type HashTagResult = BuildResult<'hashtag', Tag>
 export type AccountResult = BuildResult<'account', Account>
 export type StatusResult = BuildResult<'status', Status>
 
diff --git a/composables/masto/search.ts b/composables/masto/search.ts
index 8eca9016..7dad7ff5 100644
--- a/composables/masto/search.ts
+++ b/composables/masto/search.ts
@@ -1,5 +1,5 @@
 import type { MaybeRef } from '@vueuse/core'
-import type { Account, Paginator, Results, SearchParams, Status } from 'masto'
+import type { Account, Paginator, Results, SearchParams, Status, Tag } from 'masto'
 
 export interface UseSearchOptions {
   type?: MaybeRef<'accounts' | 'hashtags' | 'statuses'>
@@ -11,7 +11,7 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
   const loading = ref(false)
   const statuses = ref<Status[]>([])
   const accounts = ref<Account[]>([])
-  const hashtags = ref<any[]>([])
+  const hashtags = ref<Tag[]>([])
 
   let paginator: Paginator<SearchParams, Results> | undefined