diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-12-30 08:41:22 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-12-30 08:41:22 +0900 |
| commit | dcfc526453ccaa5e5a4e0cb237c3380d80eb1a42 (patch) | |
| tree | 73f9a5e8e14c405625804d890a44c0a8b6ee9062 /packages | |
| parent | 13.0.0-beta.7 (diff) | |
| download | sharkey-dcfc526453ccaa5e5a4e0cb237c3380d80eb1a42.tar.gz sharkey-dcfc526453ccaa5e5a4e0cb237c3380d80eb1a42.tar.bz2 sharkey-dcfc526453ccaa5e5a4e0cb237c3380d80eb1a42.zip | |
fix 912791b3ab
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/frontend/src/components/global/MkEmoji.vue | 3 | ||||
| -rw-r--r-- | packages/frontend/src/components/global/MkUserName.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/mfm.ts | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue index 9a8418758d..bf6be7491d 100644 --- a/packages/frontend/src/components/global/MkEmoji.vue +++ b/packages/frontend/src/components/global/MkEmoji.vue @@ -17,6 +17,7 @@ const props = defineProps<{ normal?: boolean; noStyle?: boolean; isReaction?: boolean; + host?: string | null; }>(); const char2path = defaultStore.state.emojiStyle === 'twemoji' ? char2twemojiFilePath : char2fluentEmojiFilePath; @@ -29,7 +30,7 @@ const url = computed(() => { if (char.value) { return char2path(char.value); } else { - const rawUrl = '/emoji/' + customEmojiName + '.webp'; + const rawUrl = props.host ? `/emoji/${customEmojiName}@${props.host}.webp` : `/emoji/${customEmojiName}.webp`; return defaultStore.state.disableShowingAnimatedImages ? getStaticImageUrl(rawUrl) : rawUrl; diff --git a/packages/frontend/src/components/global/MkUserName.vue b/packages/frontend/src/components/global/MkUserName.vue index c5fc61a182..fc08310acc 100644 --- a/packages/frontend/src/components/global/MkUserName.vue +++ b/packages/frontend/src/components/global/MkUserName.vue @@ -1,5 +1,5 @@ <template> -<Mfm :text="user.name || user.username" :plain="true" :nowrap="nowrap"/> +<Mfm :text="user.name ?? user.username" :author="user" :plain="true" :nowrap="nowrap"/> </template> <script lang="ts" setup> diff --git a/packages/frontend/src/components/mfm.ts b/packages/frontend/src/components/mfm.ts index c077d84441..d248ec9f43 100644 --- a/packages/frontend/src/components/mfm.ts +++ b/packages/frontend/src/components/mfm.ts @@ -273,6 +273,7 @@ export default defineComponent({ key: Math.random(), emoji: `:${token.props.name}:`, normal: this.plain, + host: this.author?.host, })]; } |