From ce3a019d8116a30b9bd005064388144486c7a53d Mon Sep 17 00:00:00 2001
From: mattyatea <mattyatea@pm.me>
Date: Fri, 17 May 2024 11:44:57 +0900
Subject: [PATCH] update

---
 packages/frontend/src/components/MkEmojiEditDialog.vue         | 2 +-
 packages/frontend/src/components/MkNoteSimple.vue              | 3 ++-
 .../src/components/global/MkMisskeyFlavoredMarkdown.ts         | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkEmojiEditDialog.vue b/packages/frontend/src/components/MkEmojiEditDialog.vue
index f0ab622f0e..c185683b51 100644
--- a/packages/frontend/src/components/MkEmojiEditDialog.vue
+++ b/packages/frontend/src/components/MkEmojiEditDialog.vue
@@ -79,7 +79,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkInput v-model="text">
 						<template #label>テスト文章</template>
 					</MkInput><br/>
-					<MkNoteSimple :note="{isHidden:false,replyId:null,renoteId:null,files:[],user: $i,text:text,cw:null, emojis: {[name]: imgUrl}}"/>
+					<MkNoteSimple :emojireq="true" :note="{isHidden:false,replyId:null,renoteId:null,files:[],user: $i,text:text,cw:null, emojis: {[name]: imgUrl}}"/>
 					<p v-if="speed ">基準より眩しい可能性があります。</p>
 					<p v-if="!speed">問題は見つかりませんでした。</p>
 					<p>※上記の物は問題がないことを保証するものではありません。</p>
diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue
index 45410c26d6..4227b47fa2 100644
--- a/packages/frontend/src/components/MkNoteSimple.vue
+++ b/packages/frontend/src/components/MkNoteSimple.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkNoteHeader :class="$style.header" :note="note" :mini="true"/>
 		<div>
 			<p v-if="note.cw != null" :class="$style.cw">
-				<Mfm v-if="note.cw != ''" style="margin-right: 8px;" :text="note.cw" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis"/>
+				<Mfm v-if="note.cw != ''" :emojireq="emojireq" style="margin-right: 8px;" :text="note.cw" :author="note.user" :nyaize="'respect'" :emojiUrls="note.emojis"/>
 				<MkCwButton v-model="showContent" :text="note.text" :files="note.files" :poll="note.poll"/>
 			</p>
 			<div v-show="note.cw == null || showContent">
@@ -42,6 +42,7 @@ const props = defineProps<{
 		isSchedule?: boolean;
 		scheduledNoteId?: string;
 	};
+	emojireq:boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 895cb87183..6fbd2a68e3 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -39,6 +39,7 @@ type MfmProps = {
 	text: string;
 	plain?: boolean;
 	nowrap?: boolean;
+	emojireq?: boolean;
 	author?: {
 		id: ID;
 		username: string;
@@ -474,7 +475,7 @@ export default function (props: MfmProps, { emit }: { emit: SetupContext<MfmEven
 
 			case 'emojiCode': {
 				// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-				if (props.author?.host == null ) {
+				if (props.author?.host == null && props.emojireq ) {
 					return [h(MkCustomEmoji, {
 						key: Math.random(),
 						name: token.props.name,