From 7565f7bec60f37d5229ebd1cf602fc0a42ecba3b Mon Sep 17 00:00:00 2001 From: tamaina Date: Thu, 29 Feb 2024 11:47:24 +0000 Subject: fix(client): use colorizeEmoji when unicodeEmojisMap.get --- packages/frontend/src/components/MkEmojiPicker.vue | 3 ++- packages/frontend/src/components/MkReactionsViewer.reaction.vue | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'packages/frontend/src/components') diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue index 061afa66ac..e8ad351a23 100644 --- a/packages/frontend/src/components/MkEmojiPicker.vue +++ b/packages/frontend/src/components/MkEmojiPicker.vue @@ -114,6 +114,7 @@ import { unicodeEmojiCategories as categories, getEmojiName, CustomEmojiFolderTree, + getUnicodeEmoji, } from '@/scripts/emojilist.js'; import MkRippleEffect from '@/components/MkRippleEffect.vue'; import * as os from '@/os.js'; @@ -382,7 +383,7 @@ function getDef(emoji: string) { if (emoji.includes(':')) { return customEmojisMap.get(emoji.replace(/:/g, ''))!; } else { - return unicodeEmojisMap.get(emoji)!; + return getUnicodeEmoji(emoji)!; } } diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue index bccee5109d..acfc37ebb7 100644 --- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue +++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue @@ -34,7 +34,7 @@ import { i18n } from '@/i18n.js'; import * as sound from '@/scripts/sound.js'; import { checkReactionPermissions } from '@/scripts/check-reaction-permissions.js'; import { customEmojisMap } from '@/custom-emojis.js'; -import { unicodeEmojisMap } from '@/scripts/emojilist.js'; +import { getUnicodeEmoji, unicodeEmojisMap } from '@/scripts/emojilist.js'; const props = defineProps<{ reaction: string; @@ -52,7 +52,7 @@ const emit = defineEmits<{ const buttonEl = shallowRef(); const emojiName = computed(() => props.reaction.replace(/:/g, '').replace(/@\./, '')); -const emoji = computed(() => customEmojisMap.get(emojiName.value) ?? unicodeEmojisMap.get(props.reaction)); +const emoji = computed(() => customEmojisMap.get(emojiName.value) ?? getUnicodeEmoji(props.reaction)); const canToggle = computed(() => { return !props.reaction.match(/@\w/) && $i && emoji.value && checkReactionPermissions($i, props.note, emoji.value); -- cgit v1.2.3-freya