From 74e4fc8f8aea01159e7d24b978322545afb70e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Thu, 28 Sep 2017 10:13:16 +0200
Subject: [PATCH] fix custom emoji not shown in statuses

---
 app/javascript/glitch/components/status/content.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/javascript/glitch/components/status/content.js b/app/javascript/glitch/components/status/content.js
index 2aad55070b7..9dd34fcb2ae 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', {