From 3c550b832b104673a9423935809b3882aa9e8185 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: Fri, 25 Nov 2022 17:50:49 +0800
Subject: [PATCH] fix: user 404

---
 pages/@[account].vue       | 16 ++--------------
 pages/@[account]/index.vue | 10 +++-------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/pages/@[account].vue b/pages/@[account].vue
index 5d585867..8bc1ef27 100644
--- a/pages/@[account].vue
+++ b/pages/@[account].vue
@@ -1,20 +1,8 @@
 <script setup lang="ts">
-const props = defineProps<{
-  modelValue?: boolean
-}>()
-
 const params = useRoute().params
 const accountName = $computed(() => params.account as string)
 
-const account = await fetchAccountByName(accountName)
-const tabNames = ['Posts', 'Posts and replies'] as const
-
-// Don't use local storage because it is better to default to Posts every time you visit a user's profile.
-const tab = $ref('Posts')
-
-const paginator = $computed(() => {
-  return masto.accounts.getStatusesIterable(account.id, { excludeReplies: tab === 'Posts' } as any)
-})
+const account = await fetchAccountByName(accountName).catch(() => null)
 </script>
 
 <template>
@@ -25,7 +13,7 @@ const paginator = $computed(() => {
     </template>
 
     <CommonNotFound v-else>
-      Account @{{ params.user }} not found
+      Account @{{ accountName }} not found
     </CommonNotFound>
   </MainContent>
 </template>
diff --git a/pages/@[account]/index.vue b/pages/@[account]/index.vue
index 37fe5836..543699eb 100644
--- a/pages/@[account]/index.vue
+++ b/pages/@[account]/index.vue
@@ -1,8 +1,4 @@
 <script setup lang="ts">
-const props = defineProps<{
-  modelValue?: boolean
-}>()
-
 const params = useRoute().params
 const accountName = $computed(() => params.account as string)
 
@@ -12,11 +8,11 @@ const tabNames = ['Posts', 'Posts and replies'] as const
 // Don't use local storage because it is better to default to Posts every time you visit a user's profile.
 const tab = $ref('Posts')
 
-const paginator1 = masto.accounts.getStatusesIterable(account.id, { excludeReplies: true })
-const paginator2 = masto.accounts.getStatusesIterable(account.id, { excludeReplies: false })
+const paginatorPosts = masto.accounts.getStatusesIterable(account.id, { excludeReplies: true })
+const paginatorPostsWithReply = masto.accounts.getStatusesIterable(account.id, { excludeReplies: false })
 
 const paginator = $computed(() => {
-  return tab === 'Posts' ? paginator1 : paginator2
+  return tab === 'Posts' ? paginatorPosts : paginatorPostsWithReply
 })
 </script>