From 1816530f845dddd000d65d76689f7a83804d13d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= Date: Tue, 3 Jan 2023 08:11:10 +0800 Subject: [PATCH] wip --- components/user/UserPicker.vue | 4 +-- components/user/UserSignIn.vue | 27 ++++++++++++---- composables/command.ts | 7 ++--- composables/masto.ts | 8 +++-- composables/users.ts | 56 +++++++++++++++++++--------------- locales/en-GB.json | 1 + locales/en-US.json | 1 + locales/zh-CN.json | 1 + types/index.ts | 7 ++--- unocss.config.ts | 2 +- 10 files changed, 70 insertions(+), 44 deletions(-) diff --git a/components/user/UserPicker.vue b/components/user/UserPicker.vue index 37cfedd5..ab1b237b 100644 --- a/components/user/UserPicker.vue +++ b/components/user/UserPicker.vue @@ -6,7 +6,7 @@ const all = useUsers() const router = useRouter() const masto = useMasto() const switchUser = (user: UserLogin) => { - if (user.account.id === currentUser.value?.account.id) + if (!user.guest && !currentUser.value?.guest && user.account.id === currentUser.value?.account.id) router.push(getAccountRoute(user.account)) else masto.loginTo(user) @@ -21,7 +21,7 @@ const switchUser = (user: UserLogin) => { flex rounded cursor-pointer aria-label="Switch user" - :class="user.account.id === currentUser?.account.id ? '' : 'op25 grayscale'" + :class="user.account?.id === currentUser?.account?.id ? '' : 'op25 grayscale'" hover="filter-none op100" @click="switchUser(user)" > diff --git a/components/user/UserSignIn.vue b/components/user/UserSignIn.vue index b9ae3589..c42b7594 100644 --- a/components/user/UserSignIn.vue +++ b/components/user/UserSignIn.vue @@ -1,7 +1,8 @@