OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3551 from maunium/fix-edit-reply-fallback 

Fix reply fallback being included in edit m.new_content
pull/21833/head
Travis Ralston 2019-10-17 18:24:33 +02:00 committed by GitHub
parent 385e83fdbc 2555fcb38f
commit 96db855e48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/rooms/EditMessageComposer.js
View File

@ -75,7 +75,7 @@ function createEditContent(model, editedEvent) {
const newContent = { const newContent = {
"msgtype": isEmote ? "m.emote" : "m.text", "msgtype": isEmote ? "m.emote" : "m.text",
"body": plainPrefix + body, "body": body,
}; };
const contentBody = { const contentBody = {
msgtype: newContent.msgtype, msgtype: newContent.msgtype,
@ -85,7 +85,7 @@ function createEditContent(model, editedEvent) {
const formattedBody = htmlSerializeIfNeeded(model, {forceHTML: isReply}); const formattedBody = htmlSerializeIfNeeded(model, {forceHTML: isReply});
if (formattedBody) { if (formattedBody) {
newContent.format = "org.matrix.custom.html"; newContent.format = "org.matrix.custom.html";
newContent.formatted_body = htmlPrefix + formattedBody; newContent.formatted_body = formattedBody;
contentBody.format = newContent.format; contentBody.format = newContent.format;
contentBody.formatted_body = `${htmlPrefix} * ${formattedBody}`; contentBody.formatted_body = `${htmlPrefix} * ${formattedBody}`;
} }