diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-01-22 07:05:13 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-01-22 07:05:13 +0900 |
| commit | a7f43d531287939700e9e70bf494691a16a6c237 (patch) | |
| tree | 9e001d0b4961072b374347e0648b389c77fe8fa6 /packages/frontend | |
| parent | Merge branch 'develop' (diff) | |
| parent | 13.1.3 (diff) | |
| download | misskey-a7f43d531287939700e9e70bf494691a16a6c237.tar.gz misskey-a7f43d531287939700e9e70bf494691a16a6c237.tar.bz2 misskey-a7f43d531287939700e9e70bf494691a16a6c237.zip | |
Merge branch 'develop'
Diffstat (limited to 'packages/frontend')
| -rw-r--r-- | packages/frontend/src/components/global/MkEmoji.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue index f16e25624f..93f50da20e 100644 --- a/packages/frontend/src/components/global/MkEmoji.vue +++ b/packages/frontend/src/components/global/MkEmoji.vue @@ -31,11 +31,11 @@ const useOsNativeEmojis = computed(() => defaultStore.state.emojiStyle === 'nati const url = computed(() => { if (char.value) { return char2path(char.value); - } else if (props.host == null) { + } else if (props.host == null && !customEmojiName.includes('@')) { const found = customEmojis.find(x => x.name === customEmojiName); return found ? found.url : null; } else { - const rawUrl = `/emoji/${customEmojiName}@${props.host}.webp`; + const rawUrl = props.host ? `/emoji/${customEmojiName}@${props.host}.webp` : `/emoji/${customEmojiName}.webp`; return defaultStore.state.disableShowingAnimatedImages ? getStaticImageUrl(rawUrl) : rawUrl; |