PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1279 from matrix-org/luke/fix-quoting-messages-with-mentions

Browse source 
Always use message `body` when quoting
This commit is contained in:
David Baker 2017-08-08 17:47:25 +01:00 committed by GitHub
commit b76b6791b2
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/components/views/rooms/MessageComposerInput.js
View file

@ -279,10 +279,13 @@ export default class MessageComposerInput extends React.Component {
} }
break; break;
case 'quote': { case 'quote': {
let {body, formatted_body} = payload.event.getContent(); let {body} = payload.event.getContent();
formatted_body = formatted_body || escape(body); /// XXX: Not doing rich-text quoting from formatted-body because draft-js
if (formatted_body) { /// has regressed such that when links are quoted, errors are thrown. See
let content = RichText.htmlToContentState(`<blockquote>${formatted_body}</blockquote>`); /// https://github.com/vector-im/riot-web/issues/4756.
body = escape(body);
if (body) {
let content = RichText.htmlToContentState(`<blockquote>${body}</blockquote>`);
if (!this.state.isRichtextEnabled) { if (!this.state.isRichtextEnabled) {
content = ContentState.createFromText(RichText.stateToMarkdown(content)); content = ContentState.createFromText(RichText.stateToMarkdown(content));
} }