From 775f5a0e5b711a2452221fd5ecb988949e65bcb7 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Mon, 3 Jul 2017 15:47:03 +0100 Subject: [PATCH] Strip out "/me" after committing to RTE history So that history can include emotes Fixes https://github.com/vector-im/riot-web/issues/4472 --- .../views/rooms/MessageComposerInput.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index aae91620d8..7f68e0aec6 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -548,14 +548,6 @@ export default class MessageComposerInput extends React.Component { let sendHtmlFn = this.client.sendHtmlMessage; let sendTextFn = this.client.sendTextMessage; - if (contentText.startsWith('/me')) { - contentText = contentText.substring(4); - // bit of a hack, but the alternative would be quite complicated - if (contentHTML) contentHTML = contentHTML.replace(/\/me ?/, ''); - sendHtmlFn = this.client.sendHtmlEmote; - sendTextFn = this.client.sendEmoteMessage; - } - if (this.state.isRichtextEnabled) { this.historyManager.addItem( contentHTML ? contentHTML : contentText, @@ -566,6 +558,14 @@ export default class MessageComposerInput extends React.Component { this.historyManager.addItem(contentText, 'markdown'); } + if (contentText.startsWith('/me')) { + contentText = contentText.substring(4); + // bit of a hack, but the alternative would be quite complicated + if (contentHTML) contentHTML = contentHTML.replace(/\/me ?/, ''); + sendHtmlFn = this.client.sendHtmlEmote; + sendTextFn = this.client.sendEmoteMessage; + } + let sendMessagePromise; if (contentHTML) { sendMessagePromise = sendHtmlFn.call(