merge: upstream

2023-11-05 11:19:03 +01:00 · 2023-11-05 11:19:03 +01:00 · 35b3ac228c
commit 35b3ac228c
parent db29a5c2da f72228f428
20 changed files with 125 additions and 16 deletions
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@ -354,6 +354,8 @@ export default function(props: MfmProps) {
 				return [h(MkEmoji, {
 					key: Math.random(),
 					emoji: token.props.emoji,
+					menu: props.enableEmojiMenu,
+					menuReaction: props.enableEmojiMenuReaction,
 				})];
 			}