From a590839aff05b2bc9f2b89eb522141b99cd1ff93 Mon Sep 17 00:00:00 2001 From: zerosoul Date: Wed, 6 Apr 2022 16:27:53 +0800 Subject: [PATCH] fix: relpy markdown message --- src/common/component/Message/Reply.js | 3 +++ src/common/component/Send/Replying.js | 3 +++ src/common/component/Send/index.js | 29 +++++++++++++++++++-------- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/common/component/Message/Reply.js b/src/common/component/Message/Reply.js index a941f69c..5af0b499 100644 --- a/src/common/component/Message/Reply.js +++ b/src/common/component/Message/Reply.js @@ -72,6 +72,9 @@ const renderContent = (data) => { case ContentTypes.text: res = {content}; break; + case ContentTypes.markdown: + res = [markdown]; + break; case ContentTypes.image: case ContentTypes.imageJPG: res = ; diff --git a/src/common/component/Send/Replying.js b/src/common/component/Send/Replying.js index bbcafbae..dd4ff6d1 100644 --- a/src/common/component/Send/Replying.js +++ b/src/common/component/Send/Replying.js @@ -69,6 +69,9 @@ const renderContent = (data) => { case ContentTypes.text: res = content; break; + case ContentTypes.markdown: + res = `[markdown]`; + break; case ContentTypes.image: case ContentTypes.imageJPG: res = ; diff --git a/src/common/component/Send/index.js b/src/common/component/Send/index.js index 0d54091b..1314f41d 100644 --- a/src/common/component/Send/index.js +++ b/src/common/component/Send/index.js @@ -96,14 +96,27 @@ function Send({ } } }; - const sendMarkdown = (content) => { - sendMessage({ - id, - type: "markdown", - content, - from_uid, - properties: { local_id: new Date().getTime() }, - }); + const sendMarkdown = async (content) => { + if (replying_mid) { + console.log("replying", replying_mid); + await replyMessage({ + id, + reply_mid: replying_mid, + type: "markdown", + content, + context, + from_uid, + }); + dispatch(removeReplyingMessage(id)); + } else { + sendMessage({ + id, + type: "markdown", + content, + from_uid, + properties: { local_id: new Date().getTime() }, + }); + } }; const toggleMode = () => { dispatch(updateInputMode(mode == Modes.text ? Modes.markdown : Modes.text));