From fbf1906bd47b3b68c8b3fb062969a1ab2beafe90 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: Mon, 2 Jan 2023 03:42:11 +0800
Subject: [PATCH] fix(settings): refresh profile after initted

---
 composables/users.ts                  |  4 ++--
 pages/settings/profile/appearance.vue | 27 +++++++++++----------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/composables/users.ts b/composables/users.ts
index 67282c5c..92113b67 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -139,8 +139,8 @@ export function setAccountInfo(userId: string, account: AccountCredentials) {
 }
 
 export async function pullMyAccountInfo() {
-  const me = await useMasto().accounts.verifyCredentials()
-  setAccountInfo(currentUserId.value, me)
+  const account = await useMasto().accounts.verifyCredentials()
+  setAccountInfo(currentUserId.value, account)
 }
 
 export function getUsersIndexByUserId(userId: string) {
diff --git a/pages/settings/profile/appearance.vue b/pages/settings/profile/appearance.vue
index fe5d8cac..1b5875e2 100644
--- a/pages/settings/profile/appearance.vue
+++ b/pages/settings/profile/appearance.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-import { invoke } from '@vueuse/shared'
 import { useForm } from 'slimeform'
 
 definePageMeta({
@@ -8,24 +7,17 @@ definePageMeta({
   keepalive: false,
 })
 
-const router = useRouter()
-
-const my = $computed(() => currentUser.value?.account)
-
-watch($$(my), (value) => {
-  if (!value)
-    router.push('/')
-})
+const acccount = $computed(() => currentUser.value?.account)
 
 const onlineSrc = $computed(() => ({
-  avatar: my?.avatar || '',
-  header: my?.header || '',
+  avatar: acccount?.avatar || '',
+  header: acccount?.header || '',
 }))
 
 const { form, reset, submitter, dirtyFields, isError } = useForm({
   form: () => ({
-    displayName: my?.displayName ?? '',
-    note: my?.source.note.replaceAll('\r', '') ?? '',
+    displayName: acccount?.displayName ?? '',
+    note: acccount?.source.note.replaceAll('\r', '') ?? '',
 
     avatar: null as null | File,
     header: null as null | File,
@@ -37,8 +29,11 @@ const { form, reset, submitter, dirtyFields, isError } = useForm({
   }),
 })
 
-// Keep the information to be edited up to date
-invoke(async () => {
+watch(isMastoInitialised, async (val) => {
+  if (!val)
+    return
+
+  // Keep the information to be edited up to date
   await pullMyAccountInfo()
   reset()
 })
@@ -56,7 +51,7 @@ const { submit, submitting } = submitter(async ({ dirtyFields }) => {
     return
   }
 
-  setAccountInfo(my!.id, res.account)
+  setAccountInfo(acccount!.id, res.account)
   reset()
 })
 </script>