]> cat aescling's git repositories - mastodon.git/commitdiff
fix custom emoji not shown in statuses
authorOndřej Hruška <ondra@ondrovo.com>
Thu, 28 Sep 2017 08:13:16 +0000 (10:13 +0200)
committerOndřej Hruška <ondra@ondrovo.com>
Thu, 28 Sep 2017 08:13:16 +0000 (10:13 +0200)
app/javascript/glitch/components/status/content.js

index 2aad55070b7b49ebabda9d5a3f8c01d19c6a1b76..9dd34fcb2ae01fff185c6129ae31010e72d0914a 100644 (file)
@@ -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', {
This page took 0.022517 seconds and 3 git commands to generate.