From aa339be2ab83d447b925ca956ed3fda20abcdaa9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 22 Jan 2023 07:04:20 +0900
Subject: [PATCH] =?UTF-8?q?fix(client):=20=E3=83=AA=E3=82=A2=E3=82=AF?=
=?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E3=82=AB=E3=82=B9=E3=82=BF?=
=?UTF-8?q?=E3=83=A0=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=8C=E8=A1=A8=E7=A4=BA?=
=?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=81=93=E3=81=A8=E3=81=8C?=
=?UTF-8?q?=E3=81=82=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fix #9683
---
packages/frontend/src/components/global/MkEmoji.vue | 4 ++--
1 file 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;