hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix custom emoji not shown in statuses

signup-info-prompt
Ondřej Hruška 2017-09-28 10:13:16 +02:00
parent 9a5418942c
commit 74e4fc8f8a
No known key found for this signature in database
GPG Key ID: 2C5FD5035250423D
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/glitch/components/status/content.js
View File

@ -131,11 +131,9 @@ export default class StatusContent extends React.PureComponent {
this.state.hidden this.state.hidden
); );
const content = { __html: emojify(status.get('content')) }; const content = { __html: status.get('contentHtml') };
const spoilerContent = { const spoilerContent = {
__html: emojify(escapeTextContentForBrowser( __html: status.get('spoilerHtml'),
status.get('spoiler_text', '')
)),
}; };
const directionStyle = { direction: 'ltr' }; const directionStyle = { direction: 'ltr' };
const classNames = classnames('status__content', { const classNames = classnames('status__content', {