From e0cea2facc76ca3486cd5793e21b286ab3d18b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Sun, 18 Sep 2022 14:06:47 +0900 Subject: [PATCH] wip --- packages/client/src/components/global/MkEmoji.vue | 2 +- packages/client/src/scripts/reactionImportMenu.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/client/src/components/global/MkEmoji.vue b/packages/client/src/components/global/MkEmoji.vue index c17e00a5e..0834b5a9e 100644 --- a/packages/client/src/components/global/MkEmoji.vue +++ b/packages/client/src/components/global/MkEmoji.vue @@ -39,7 +39,7 @@ const url = computed(() => { const alt = computed(() => customEmoji.value ? `:${customEmoji.value.name}:` : char.value); const onContextmenu = (e: MouseEvent) => { - openReactionImportMenu(e, props.emoji); + openReactionImportMenu(e, customEmoji.value?.id ?? props.emoji); }; diff --git a/packages/client/src/scripts/reactionImportMenu.ts b/packages/client/src/scripts/reactionImportMenu.ts index 29f468566..63dd7ae5b 100644 --- a/packages/client/src/scripts/reactionImportMenu.ts +++ b/packages/client/src/scripts/reactionImportMenu.ts @@ -90,7 +90,7 @@ export async function openReactionImportMenu(ev: MouseEvent, reaction: string) { }); }, }]; - const emojiId = await getEmojiId(reaction); + const emojiId = await getEmojiId(reaction)? await getEmojiId(reaction) : reaction; if (reaction.startsWith(':') && emojiId) { menuItems.push({ type: 'button', @@ -99,7 +99,9 @@ export async function openReactionImportMenu(ev: MouseEvent, reaction: string) { action: async () => { const duplication: boolean = await os.api('meta').then(meta => { const emojis = meta.emojis; - return emojis.some(emoji => emoji.name === reaction.match(/(?<=:).*(?=@.*\.*(?=:))/g)[0]); + return emojis.some((emoji) => { + return (emoji.name === reaction.match(/(?<=:).*(?=@.*\.*(?=:))/g)[0]); + }); }); console.log(await duplication);