diff options
| author | Kagami Sascha Rosylight <saschanaz@outlook.com> | 2023-03-13 01:46:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-13 09:46:33 +0900 |
| commit | 0d2bee787d52b875b474f9fa9eedc49951dce0ee (patch) | |
| tree | fa88d549022a5d7e8cd11a41e7f30470c933b15d /packages/frontend/src/components/global | |
| parent | 空文字列のobjectStorageEndtpoinをnullと同様に扱う (#10312) (diff) | |
| download | misskey-0d2bee787d52b875b474f9fa9eedc49951dce0ee.tar.gz misskey-0d2bee787d52b875b474f9fa9eedc49951dce0ee.tar.bz2 misskey-0d2bee787d52b875b474f9fa9eedc49951dce0ee.zip | |
fix(frontend/XHome): fall back to user.uri if user.url does not exist (#10313)
* fix(frontend/XHome): fall back to user.uri if user.url does not exist
* Update CHANGELOG.md
Diffstat (limited to 'packages/frontend/src/components/global')
| -rw-r--r-- | packages/frontend/src/components/global/MkAvatar.vue | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/frontend/src/components/global/MkAvatar.vue b/packages/frontend/src/components/global/MkAvatar.vue index d392ec6d6f..7fb830d537 100644 --- a/packages/frontend/src/components/global/MkAvatar.vue +++ b/packages/frontend/src/components/global/MkAvatar.vue @@ -1,5 +1,5 @@ <template> -<span v-if="!link" v-user-preview="preview ? user.id : undefined" class="_noSelect" :class="[$style.root, { [$style.cat]: user.isCat, [$style.square]: $store.state.squareAvatars }]" :style="{ color }" :title="acct(user)" @click="onClick"> +<span v-if="!link" v-user-preview="preview ? user.id : undefined" class="_noSelect" :class="[$style.root, { [$style.cat]: user.isCat, [$style.square]: squareAvatars }]" :style="{ color }" :title="acct(user)" @click="onClick"> <img :class="$style.inner" :src="url" decoding="async"/> <MkUserOnlineIndicator v-if="indicator" :class="$style.indicator" :user="user"/> <template v-if="user.isCat"> @@ -7,7 +7,7 @@ <div :class="$style.earRight"/> </template> </span> -<MkA v-else v-user-preview="preview ? user.id : undefined" class="_noSelect" :class="[$style.root, { [$style.cat]: user.isCat, [$style.square]: $store.state.squareAvatars }]" :style="{ color }" :title="acct(user)" :to="userPage(user)" :target="target"> +<MkA v-else v-user-preview="preview ? user.id : undefined" class="_noSelect" :class="[$style.root, { [$style.cat]: user.isCat, [$style.square]: squareAvatars }]" :style="{ color }" :title="acct(user)" :to="userPage(user)" :target="target"> <img :class="$style.inner" :src="url" decoding="async"/> <MkUserOnlineIndicator v-if="indicator" :class="$style.indicator" :user="user"/> <template v-if="user.isCat"> @@ -26,6 +26,8 @@ import { acct, userPage } from '@/filters/user'; import MkUserOnlineIndicator from '@/components/MkUserOnlineIndicator.vue'; import { defaultStore } from '@/store'; +const squareAvatars = $ref(defaultStore.state.squareAvatars); + const props = withDefaults(defineProps<{ user: misskey.entities.User; target?: string | null; |