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

Merge pull request #5519 from matrix-org/jryans/big-emoji-html-release

Browse source 
[Release] Look for emoji in the body that will be displayed
This commit is contained in:
J. Ryan Stinnett 2020-12-21 16:26:45 +00:00 committed by GitHub
commit f806443b7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/HtmlUtils.tsx
View file

@ -438,13 +438,14 @@ export function bodyToHtml(content: IContent, highlights: string[], opts: IOpts
delete sanitizeParams.textFilter; delete sanitizeParams.textFilter;
} }
const contentBody = isDisplayedWithHtml ? safeBody : strippedBody;
if (opts.returnString) { if (opts.returnString) {
return isDisplayedWithHtml ? safeBody : strippedBody; return contentBody;
} }
let emojiBody = false; let emojiBody = false;
if (!opts.disableBigEmoji && bodyHasEmoji) { if (!opts.disableBigEmoji && bodyHasEmoji) {
let contentBodyTrimmed = strippedBody !== undefined ? strippedBody.trim() : ''; let contentBodyTrimmed = contentBody !== undefined ? contentBody.trim() : '';
// Ignore spaces in body text. Emojis with spaces in between should // Ignore spaces in body text. Emojis with spaces in between should
// still be counted as purely emoji messages. // still be counted as purely emoji messages.