diff options
author | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 10:13:16 +0200 |
---|---|---|
committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 10:13:16 +0200 |
commit | 74e4fc8f8aea01159e7d24b978322545afb70e94 (patch) | |
tree | 31a6fbbafd3d4005a4e3b51aebad4c23c55c3994 /app/javascript/glitch | |
parent | 9a5418942c03f51176faaeec33d2fdc1acc5c30e (diff) |
fix custom emoji not shown in statuses
Diffstat (limited to 'app/javascript/glitch')
-rw-r--r-- | app/javascript/glitch/components/status/content.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/javascript/glitch/components/status/content.js b/app/javascript/glitch/components/status/content.js index 2aad55070..9dd34fcb2 100644 --- a/app/javascript/glitch/components/status/content.js +++ b/app/javascript/glitch/components/status/content.js @@ -131,11 +131,9 @@ export default class StatusContent extends React.PureComponent { this.state.hidden ); - const content = { __html: emojify(status.get('content')) }; + const content = { __html: status.get('contentHtml') }; const spoilerContent = { - __html: emojify(escapeTextContentForBrowser( - status.get('spoiler_text', '') - )), + __html: status.get('spoilerHtml'), }; const directionStyle = { direction: 'ltr' }; const classNames = classnames('status__content', { |