diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue index 9a8418758..bf6be7491 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 c5fc61a18..fc08310ac 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 c077d8444..d248ec9f4 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, })]; }