From 31a6aafd2cfc3ec3a62233daf49fed3400d85f4b Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 6 Sep 2024 18:26:52 +0900
Subject: [PATCH] =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=82=92twemoji?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

クライアントデフォルトにあわせるため
---
 packages/frontend-embed/src/components/EmEmoji.vue        | 8 +++-----
 .../src/scripts => frontend-shared/js}/emoji-base.ts      | 0
 packages/frontend/src/components/MkAutocomplete.vue       | 2 +-
 packages/frontend/src/components/global/MkEmoji.vue       | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename packages/{frontend/src/scripts => frontend-shared/js}/emoji-base.ts (100%)

diff --git a/packages/frontend-embed/src/components/EmEmoji.vue b/packages/frontend-embed/src/components/EmEmoji.vue
index 5b3f36f2fc..224979707b 100644
--- a/packages/frontend-embed/src/components/EmEmoji.vue
+++ b/packages/frontend-embed/src/components/EmEmoji.vue
@@ -4,20 +4,18 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<span :alt="props.emoji">{{ colorizedNativeEmoji }}</span>
+<img :class="$style.root" :src="url" :alt="props.emoji" decoding="async"/>
 </template>
 
 <script lang="ts" setup>
 import { computed } from 'vue';
-import { colorizeEmoji } from '@@/js/emojilist.js';
+import { char2twemojiFilePath } from '@@/js/emoji-base.js';
 
 const props = defineProps<{
 	emoji: string;
-	menu?: boolean;
-	menuReaction?: boolean;
 }>();
 
-const colorizedNativeEmoji = computed(() => colorizeEmoji(props.emoji));
+const url = computed(() => char2twemojiFilePath(props.emoji));
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/scripts/emoji-base.ts b/packages/frontend-shared/js/emoji-base.ts
similarity index 100%
rename from packages/frontend/src/scripts/emoji-base.ts
rename to packages/frontend-shared/js/emoji-base.ts
diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue
index 14e74f896e..17af9e9273 100644
--- a/packages/frontend/src/components/MkAutocomplete.vue
+++ b/packages/frontend/src/components/MkAutocomplete.vue
@@ -48,7 +48,7 @@ import { markRaw, ref, shallowRef, computed, onUpdated, onMounted, onBeforeUnmou
 import sanitizeHtml from 'sanitize-html';
 import { emojilist, getEmojiName } from '@@/js/emojilist.js';
 import contains from '@/scripts/contains.js';
-import { char2twemojiFilePath, char2fluentEmojiFilePath } from '@/scripts/emoji-base.js';
+import { char2twemojiFilePath, char2fluentEmojiFilePath } from '@@/js/emoji-base.js';
 import { acct } from '@/filters/user.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue
index 08e44e72e4..fc3745c009 100644
--- a/packages/frontend/src/components/global/MkEmoji.vue
+++ b/packages/frontend/src/components/global/MkEmoji.vue
@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { computed, inject } from 'vue';
 import { colorizeEmoji, getEmojiName } from '@@/js/emojilist.js';
-import { char2fluentEmojiFilePath, char2twemojiFilePath } from '@/scripts/emoji-base.js';
+import { char2fluentEmojiFilePath, char2twemojiFilePath } from '@@/js/emoji-base.js';
 import { defaultStore } from '@/store.js';
 import * as os from '@/os.js';
 import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';