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

Merge pull request #3546 from matrix-org/dbkr/malformed_events

Browse source 
Add some type checking on event body
This commit is contained in:
David Baker 2019-10-10 17:46:26 +01:00 committed by GitHub
commit c2a5253479
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/HtmlUtils.js
View file

@ -412,11 +412,13 @@ export function bodyToHtml(content, highlights, opts={}) {
}; };
} }
let formattedBody = content.formatted_body; let formattedBody = typeof content.formatted_body === 'string' ? content.formatted_body : null;
if (opts.stripReplyFallback && formattedBody) formattedBody = ReplyThread.stripHTMLReply(formattedBody); const plainBody = typeof content.body === 'string' ? content.body : null;
strippedBody = opts.stripReplyFallback ? ReplyThread.stripPlainReply(content.body) : content.body;
bodyHasEmoji = mightContainEmoji(isHtmlMessage ? formattedBody : content.body); if (opts.stripReplyFallback && formattedBody) formattedBody = ReplyThread.stripHTMLReply(formattedBody);
strippedBody = opts.stripReplyFallback ? ReplyThread.stripPlainReply(plainBody) : plainBody;
bodyHasEmoji = mightContainEmoji(isHtmlMessage ? formattedBody : plainBody);
// Only generate safeBody if the message was sent as org.matrix.custom.html // Only generate safeBody if the message was sent as org.matrix.custom.html
if (isHtmlMessage) { if (isHtmlMessage) {