From acdb94de62719998e1a24e1d7c8e57000447c95c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?=
 <sxzz@sxzz.moe>
Date: Fri, 6 Jan 2023 00:48:20 +0800
Subject: [PATCH] fix: type errors (#802)

---
 components/account/AccountMoved.vue           |  7 +++--
 components/command/CommandPanel.vue           | 18 +++++++++--
 components/common/CommonBlurhash.vue          | 14 ++++-----
 components/common/CommonCropImage.vue         |  2 +-
 components/common/CommonInputImage.vue        |  2 +-
 components/modal/ModalContainer.vue           |  3 +-
 .../notification/NotificationPaginator.vue    | 10 +++++--
 components/publish/PublishWidget.vue          |  2 +-
 components/search/SearchResult.vue            | 14 +++++----
 components/search/SearchWidget.vue            | 30 ++++++++++++++++---
 components/search/types.ts                    | 22 ++++++++------
 components/status/StatusActions.vue           |  6 ++--
 components/status/StatusActionsMore.vue       |  3 +-
 components/status/StatusBody.vue              |  7 +++--
 components/status/StatusCard.vue              |  2 +-
 components/status/StatusMedia.vue             |  4 +--
 components/status/edit/StatusEditPreview.vue  |  5 +---
 composables/gestures/index.ts                 |  1 -
 composables/translate.ts                      |  9 ++++--
 html.d.ts                                     | 13 --------
 pages/[[server]]/@[account]/[status].vue      |  3 +-
 .../[[server]]/@[account]/index/followers.vue |  2 +-
 .../[[server]]/@[account]/index/following.vue |  2 +-
 pages/[[server]]/tags/[tag].vue               |  6 ++--
 24 files changed, 113 insertions(+), 74 deletions(-)
 delete mode 100644 html.d.ts

diff --git a/components/account/AccountMoved.vue b/components/account/AccountMoved.vue
index 32e79389..ac3b79e4 100644
--- a/components/account/AccountMoved.vue
+++ b/components/account/AccountMoved.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+// type used in <template>
+// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type { Account } from 'masto'
 
 defineProps<{
@@ -14,8 +16,9 @@ defineProps<{
     </div>
 
     <div flex>
-      <NuxtLink :to="getAccountRoute(account.moved as any)">
-        <AccountInfo :account="account.moved" />
+      <!-- type error of masto.js -->
+      <NuxtLink :to="getAccountRoute(account.moved as unknown as Account)">
+        <AccountInfo :account="account.moved as unknown as Account" />
       </NuxtLink>
       <div flex-auto />
       <div flex items-center>
diff --git a/components/command/CommandPanel.vue b/components/command/CommandPanel.vue
index 29987eb0..ed60ff4f 100644
--- a/components/command/CommandPanel.vue
+++ b/components/command/CommandPanel.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { SearchResult as SearchResultType } from '@/components/search/types'
+import type { AccountResult, HashTagResult, SearchResult as SearchResultType } from '@/components/search/types'
 import type { CommandScope, QueryResult, QueryResultItem } from '@/composables/command'
 
 const emit = defineEmits<{
@@ -37,11 +37,23 @@ const searchResult = $computed<QueryResult>(() => {
   if (query.length === 0 || loading.value)
     return { length: 0, items: [], grouped: {} as any }
 
+  // TODO extract this scope
+  // duplicate in SearchWidget.vue
   const hashtagList = hashtags.value.slice(0, 3)
-    .map<SearchResultType>(hashtag => ({ type: 'hashtag', hashtag, to: `/tags/${hashtag.name}` }))
+    .map<HashTagResult>(hashtag => ({
+      type: 'hashtag',
+      id: hashtag.id,
+      hashtag,
+      to: getTagRoute(hashtag.name),
+    }))
     .map(toSearchQueryResultItem)
   const accountList = accounts.value
-    .map<SearchResultType>(account => ({ type: 'account', account, to: `/@${account.acct}` }))
+    .map<AccountResult>(account => ({
+      type: 'account',
+      id: account.id,
+      account,
+      to: getAccountRoute(account),
+    }))
     .map(toSearchQueryResultItem)
 
   const grouped: QueryResult['grouped'] = new Map()
diff --git a/components/common/CommonBlurhash.vue b/components/common/CommonBlurhash.vue
index 4602a1b8..89624d49 100644
--- a/components/common/CommonBlurhash.vue
+++ b/components/common/CommonBlurhash.vue
@@ -2,7 +2,7 @@
 import { decode } from 'blurhash'
 
 const { blurhash, src, srcset } = defineProps<{
-  blurhash: string
+  blurhash?: string | null | undefined
   src: string
   srcset?: string
 }>()
@@ -11,8 +11,13 @@ defineOptions({
   inheritAttrs: false,
 })
 
-const placeholderSrc = ref<string>()
 const isLoaded = ref(false)
+const placeholderSrc = $computed(() => {
+  if (!blurhash)
+    return ''
+  const pixels = decode(blurhash, 32, 32)
+  return getDataUrlFromArr(pixels, 32, 32)
+})
 
 onMounted(() => {
   const img = document.createElement('img')
@@ -29,11 +34,6 @@ onMounted(() => {
   setTimeout(() => {
     isLoaded.value = true
   }, 3_000)
-
-  if (blurhash) {
-    const pixels = decode(blurhash, 32, 32)
-    placeholderSrc.value = getDataUrlFromArr(pixels, 32, 32)
-  }
 })
 </script>
 
diff --git a/components/common/CommonCropImage.vue b/components/common/CommonCropImage.vue
index adee86d6..a0557210 100644
--- a/components/common/CommonCropImage.vue
+++ b/components/common/CommonCropImage.vue
@@ -5,7 +5,7 @@ import 'vue-advanced-cropper/dist/style.css'
 
 export interface Props {
   /** Images to be cropped */
-  modelValue?: File
+  modelValue?: File | null
   /** Crop frame aspect ratio (width/height), default 1/1 */
   stencilAspectRatio?: number
   /** The ratio of the longest edge of the cut box to the length of the cut screen, default 0.9, not more than 1 */
diff --git a/components/common/CommonInputImage.vue b/components/common/CommonInputImage.vue
index 49a51db2..3d88734a 100644
--- a/components/common/CommonInputImage.vue
+++ b/components/common/CommonInputImage.vue
@@ -3,7 +3,7 @@ import { fileOpen } from 'browser-fs-access'
 import type { FileWithHandle } from 'browser-fs-access'
 
 const props = withDefaults(defineProps<{
-  modelValue?: FileWithHandle
+  modelValue?: FileWithHandle | null
   /** The image src before change */
   original?: string
   /** Allowed file types */
diff --git a/components/modal/ModalContainer.vue b/components/modal/ModalContainer.vue
index 2ef41456..31ba7cb3 100644
--- a/components/modal/ModalContainer.vue
+++ b/components/modal/ModalContainer.vue
@@ -53,6 +53,7 @@ const handlePublishClose = () => {
     >
       <!-- This `w-0` style is used to avoid overflow problems in flex layouts，so don't remove it unless you know what you're doing -->
       <PublishWidget
+        v-if="dialogDraftKey"
         :draft-key="dialogDraftKey" expanded flex-1 w-0
         @published="handlePublished"
       />
@@ -65,7 +66,7 @@ const handlePublishClose = () => {
       <ModalMediaPreview v-if="isMediaPreviewOpen" @close="closeMediaPreview()" />
     </ModalDialog>
     <ModalDialog v-model="isEditHistoryDialogOpen" max-w-125>
-      <StatusEditPreview :edit="statusEdit" />
+      <StatusEditPreview v-if="statusEdit" :edit="statusEdit" />
     </ModalDialog>
     <ModalDialog v-model="isCommandPanelOpen" max-w-fit flex>
       <CommandPanel @close="closeCommandPanel()" />
diff --git a/components/notification/NotificationPaginator.vue b/components/notification/NotificationPaginator.vue
index d4a8e287..2f36aded 100644
--- a/components/notification/NotificationPaginator.vue
+++ b/components/notification/NotificationPaginator.vue
@@ -1,5 +1,11 @@
 <script setup lang="ts">
+// type used in <template>
+// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type { Notification, Paginator, WsEvents } from 'masto'
+// type used in <template>
+// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+import type { GroupedLikeNotifications } from '~/types'
+
 import type { GroupedAccountLike, NotificationSlot } from '~/types'
 
 const { paginator, stream } = defineProps<{
@@ -118,12 +124,12 @@ const { formatNumber } = useHumanReadableNumber()
         />
         <NotificationGroupedLikes
           v-else-if="item.type === 'grouped-reblogs-and-favourites'"
-          :group="item"
+          :group="item as GroupedLikeNotifications"
           border="b base"
         />
         <NotificationCard
           v-else
-          :notification="item"
+          :notification="item as Notification"
           hover:bg-active
           border="b base"
         />
diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 6d814b71..0e9dbfd2 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -269,7 +269,7 @@ defineExpose({
           <PublishAttachment
             v-for="(att, idx) in draft.attachments" :key="att.id"
             :attachment="att"
-            :dialog-labelled-by="dialogLabelledBy ?? (draft.editingStatus ? 'state-editing' : null)"
+            :dialog-labelled-by="dialogLabelledBy ?? (draft.editingStatus ? 'state-editing' : undefined)"
             @remove="removeAttachment(idx)"
             @set-description="setDescription(att, $event)"
           />
diff --git a/components/search/SearchResult.vue b/components/search/SearchResult.vue
index 0ee21e10..e4b17eff 100644
--- a/components/search/SearchResult.vue
+++ b/components/search/SearchResult.vue
@@ -1,6 +1,10 @@
 <script setup lang="ts">
 import type { SearchResult } from './types'
-defineProps<{ result: SearchResult; active: boolean }>()
+
+defineProps<{
+  result: SearchResult
+  active: boolean
+}>()
 
 const onActivate = () => {
   (document.activeElement as HTMLElement).blur()
@@ -10,10 +14,10 @@ const onActivate = () => {
 <template>
   <CommonScrollIntoView as="RouterLink" :active="active" :to="result.to" py2 block px2 :aria-selected="active" :class="{ 'bg-active': active }" hover:bg-active @click="() => onActivate()">
     <SearchHashtagInfo v-if="result.type === 'hashtag'" :hashtag="result.hashtag" />
-    <AccountInfo v-else-if="result.type === 'account'" :account="result.account" />
-    <StatusCard v-else-if="result.type === 'status'" :status="result.status" :actions="false" :show-reply-to="false" />
-    <div v-else-if="result.type === 'action'" text-center>
+    <AccountInfo v-else-if="result.type === 'account' && result.account" :account="result.account" />
+    <StatusCard v-else-if="result.type === 'status' && result.status" :status="result.status" :actions="false" :show-reply-to="false" />
+    <!-- <div v-else-if="result.type === 'action'" text-center>
       {{ result.action!.label }}
-    </div>
+    </div> -->
   </CommonScrollIntoView>
 </template>
diff --git a/components/search/SearchWidget.vue b/components/search/SearchWidget.vue
index ce667442..f364542b 100644
--- a/components/search/SearchWidget.vue
+++ b/components/search/SearchWidget.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { AccountResult, HashTagResult, StatusResult } from './types'
+
 const query = ref('')
 const { accounts, hashtags, loading, statuses } = useSearch(query)
 const index = ref(0)
@@ -13,9 +15,24 @@ const results = computed(() => {
     return []
 
   const results = [
-    ...hashtags.value.slice(0, 3).map(hashtag => ({ type: 'hashtag', hashtag, to: getTagRoute(hashtag.name) })),
-    ...accounts.value.map(account => ({ type: 'account', account, to: getAccountRoute(account) })),
-    ...statuses.value.map(status => ({ type: 'status', status, to: getStatusRoute(status) })),
+    ...hashtags.value.slice(0, 3).map<HashTagResult>(hashtag => ({
+      type: 'hashtag',
+      id: hashtag.id,
+      hashtag,
+      to: getTagRoute(hashtag.name),
+    })),
+    ...accounts.value.map<AccountResult>(account => ({
+      type: 'account',
+      id: account.id,
+      account,
+      to: getAccountRoute(account),
+    })),
+    ...statuses.value.map<StatusResult>(status => ({
+      type: 'status',
+      id: status.id,
+      status,
+      to: getStatusRoute(status),
+    })),
 
     // Disable until search page is implemented
     // {
@@ -79,7 +96,12 @@ const activate = () => {
           {{ t('search.search_desc') }}
         </span>
         <template v-if="!loading">
-          <SearchResult v-for="(result, i) in results" :key="result.to" :active="index === parseInt(i.toString())" :result="result" :tabindex="focused ? 0 : -1" />
+          <SearchResult
+            v-for="(result, i) in results" :key="result.id"
+            :active="index === parseInt(i.toString())"
+            :result="result"
+            :tabindex="focused ? 0 : -1"
+          />
         </template>
         <div v-else>
           <SearchResultSkeleton />
diff --git a/components/search/types.ts b/components/search/types.ts
index 7d030821..66f54e0d 100644
--- a/components/search/types.ts
+++ b/components/search/types.ts
@@ -1,13 +1,17 @@
 import type { Account, Status } from 'masto'
+import type { RouteLocation } from 'vue-router'
 
-export interface SearchResult {
-  type: 'account' | 'hashtag' | 'action' | 'status'
-  to: string
-  label?: string
-  account?: Account
-  status?: Status
-  hashtag?: any
-  action?: {
-    label: string
+export type BuildResult<K extends keyof any, T> = {
+  [P in K]: T
+} & {
+  id: string
+  type: K
+  to: RouteLocation & {
+    href: string
   }
 }
+export type HashTagResult = BuildResult<'hashtag', any>
+export type AccountResult = BuildResult<'account', Account>
+export type StatusResult = BuildResult<'status', Status>
+
+export type SearchResult = HashTagResult | AccountResult | StatusResult
diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 328d8fdf..c78ea293 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -64,7 +64,7 @@ const reply = () => {
         color="text-green" hover="text-green" group-hover="bg-green/10"
         icon="i-ri:repeat-line"
         active-icon="i-ri:repeat-fill"
-        :active="status.reblogged"
+        :active="!!status.reblogged"
         :disabled="isLoading.reblogged"
         :command="command"
         @click="toggleReblog()"
@@ -88,7 +88,7 @@ const reply = () => {
         color="text-rose" hover="text-rose" group-hover="bg-rose/10"
         icon="i-ri:heart-3-line"
         active-icon="i-ri:heart-3-fill"
-        :active="status.favourited"
+        :active="!!status.favourited"
         :disabled="isLoading.favourited"
         :command="command"
         @click="toggleFavourite()"
@@ -111,7 +111,7 @@ const reply = () => {
         color="text-yellow" hover="text-yellow" group-hover="bg-yellow/10"
         icon="i-ri:bookmark-line"
         active-icon="i-ri:bookmark-fill"
-        :active="status.bookmarked"
+        :active="!!status.bookmarked"
         :disabled="isLoading.bookmarked"
         :command="command"
         @click="toggleBookmark()"
diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index 0fcbda85..4c0c3aa9 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -186,9 +186,8 @@ async function editStatus() {
           @click="toggleMute()"
         />
 
-        <NuxtLink :to="status.url" external target="_blank">
+        <NuxtLink v-if="status.url" :to="status.url" external target="_blank">
           <CommonDropdownItem
-            v-if="status.url"
             :text="$t('menu.open_in_original_site')"
             icon="i-ri:arrow-right-up-line"
             :command="command"
diff --git a/components/status/StatusBody.vue b/components/status/StatusBody.vue
index f1f85cc8..75139659 100644
--- a/components/status/StatusBody.vue
+++ b/components/status/StatusBody.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { Status, StatusEdit } from 'masto'
 
 const { status, withAction = true } = defineProps<{
-  status: Status
+  status: Status | StatusEdit
   withAction?: boolean
 }>()
+
 const { translation } = useTranslation(status)
 </script>
 
@@ -15,7 +16,7 @@ const { translation } = useTranslation(status)
       class="line-compact"
       :content="status.content"
       :emojis="status.emojis"
-      :lang="status.language"
+      :lang="'language' in status && status.language"
     />
     <div v-else />
     <template v-if="translation.visible">
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 0187da6b..c70dab69 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -113,7 +113,7 @@ const isDM = $computed(() => status.visibility === 'direct')
         </div>
         <div v-else />
       </slot>
-      <StatusReplyingTo v-if="!directReply && !collapseReplyingTo" :status="status" :simplified="simplifyReplyingTo" :class="faded ? 'text-secondary-light' : ''" pt1 />
+      <StatusReplyingTo v-if="!directReply && !collapseReplyingTo" :status="status" :simplified="!!simplifyReplyingTo" :class="faded ? 'text-secondary-light' : ''" pt1 />
     </div>
     <div flex gap-3 :class="{ 'text-secondary': faded }">
       <div relative>
diff --git a/components/status/StatusMedia.vue b/components/status/StatusMedia.vue
index bd72b795..6507231f 100644
--- a/components/status/StatusMedia.vue
+++ b/components/status/StatusMedia.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
+import type { Status, StatusEdit } from 'masto'
 
 const { status } = defineProps<{
-  status: Status
+  status: Status | StatusEdit
   fullSize?: boolean
 }>()
 </script>
diff --git a/components/status/edit/StatusEditPreview.vue b/components/status/edit/StatusEditPreview.vue
index 92c18b0b..fe6a44d9 100644
--- a/components/status/edit/StatusEditPreview.vue
+++ b/components/status/edit/StatusEditPreview.vue
@@ -22,10 +22,7 @@ const { edit } = defineProps<{
         {{ edit.spoilerText }}
       </template>
       <StatusBody :status="edit" />
-      <StatusMedia
-        v-if="edit.mediaAttachments.length"
-        :status="edit"
-      />
+      <StatusMedia v-if="edit.mediaAttachments.length" :status="edit" />
     </StatusSpoiler>
   </div>
 </template>
diff --git a/composables/gestures/index.ts b/composables/gestures/index.ts
index 2b04ae5b..5cb2b747 100644
--- a/composables/gestures/index.ts
+++ b/composables/gestures/index.ts
@@ -24,7 +24,6 @@ export const useImageGesture = (
 
   const { set } = useSpring(motionProperties as Partial<PermissiveMotionProperties>)
 
-  // @ts-expect-error we need to fix types: just suppress it for now
   const handlers: Handlers = {
     onPinch({ offset: [d] }) {
       set({ scale: 1 + d / 200 })
diff --git a/composables/translate.ts b/composables/translate.ts
index a275453f..79e9625d 100644
--- a/composables/translate.ts
+++ b/composables/translate.ts
@@ -1,4 +1,4 @@
-import type { Status } from 'masto'
+import type { Status, StatusEdit } from 'masto'
 
 export interface TranslationResponse {
   translatedText: string
@@ -24,15 +24,18 @@ export async function translateText(text: string, from?: string | null, to?: str
   return translatedText
 }
 
-const translations = new WeakMap<Status, { visible: boolean; text: string }>()
+const translations = new WeakMap<Status | StatusEdit, { visible: boolean; text: string }>()
 
-export function useTranslation(status: Status) {
+export function useTranslation(status: Status | StatusEdit) {
   if (!translations.has(status))
     translations.set(status, reactive({ visible: false, text: '' }))
 
   const translation = translations.get(status)!
 
   async function toggle() {
+    if (!('language' in status))
+      return
+
     if (!translation.text)
       translation.text = await translateText(status.content, status.language)
 
diff --git a/html.d.ts b/html.d.ts
deleted file mode 100644
index 343ccfd9..00000000
--- a/html.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// for UnoCSS attributify mode compact in Volar
-// refer: https://github.com/johnsoncodehk/volar/issues/1077#issuecomment-1145361472
-declare module '@vue/runtime-dom' {
-  interface HTMLAttributes {
-    [key: string]: any
-  }
-}
-declare module '@vue/runtime-core' {
-  interface AllowedComponentProps {
-    [key: string]: any
-  }
-}
-export {}
diff --git a/pages/[[server]]/@[account]/[status].vue b/pages/[[server]]/@[account]/[status].vue
index 467278fc..7c11f52a 100644
--- a/pages/[[server]]/@[account]/[status].vue
+++ b/pages/[[server]]/@[account]/[status].vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { Status } from 'masto'
 import type { ComponentPublicInstance } from 'vue'
 
 definePageMeta({
@@ -93,7 +92,7 @@ onReactivated(() => {
         </template>
       </div>
 
-      <StatusNotFound v-else :account="route.params.account" :status="id" />
+      <StatusNotFound v-else :account="route.params.account as string" :status="id" />
     </template>
 
     <StatusCardSkeleton v-else border="b base" />
diff --git a/pages/[[server]]/@[account]/index/followers.vue b/pages/[[server]]/@[account]/index/followers.vue
index 3369f252..5456d0fe 100644
--- a/pages/[[server]]/@[account]/index/followers.vue
+++ b/pages/[[server]]/@[account]/index/followers.vue
@@ -16,7 +16,7 @@ if (account) {
 </script>
 
 <template>
-  <template v-if="account">
+  <template v-if="paginator">
     <AccountPaginator :paginator="paginator" />
   </template>
 </template>
diff --git a/pages/[[server]]/@[account]/index/following.vue b/pages/[[server]]/@[account]/index/following.vue
index 6de806b1..ef4bed73 100644
--- a/pages/[[server]]/@[account]/index/following.vue
+++ b/pages/[[server]]/@[account]/index/following.vue
@@ -16,7 +16,7 @@ if (account) {
 </script>
 
 <template>
-  <template v-if="account">
+  <template v-if="paginator">
     <AccountPaginator :paginator="paginator" />
   </template>
 </template>
diff --git a/pages/[[server]]/tags/[tag].vue b/pages/[[server]]/tags/[tag].vue
index 412408d8..fa2d057e 100644
--- a/pages/[[server]]/tags/[tag].vue
+++ b/pages/[[server]]/tags/[tag].vue
@@ -32,8 +32,10 @@ onReactivated(() => {
       <span text-lg font-bold>#{{ tagName }}</span>
     </template>
 
-    <template v-if="typeof tag?.following === 'boolean'" #actions>
-      <TagActionButton :tag="tag" @change="refresh()" />
+    <template #actions>
+      <template v-if="typeof tag?.following === 'boolean'">
+        <TagActionButton :tag="tag" @change="refresh()" />
+      </template>
     </template>
 
     <slot>