about summary refs log tree commit diff
path: root/app/javascript/glitch/components/status/prepend.js
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-09-28 11:03:23 +0200
committerOndřej Hruška <ondra@ondrovo.com>2017-09-28 11:03:23 +0200
commitcf24ce7e0300b8280631efddd58ce576e5cccabf (patch)
treefb4cd42377619ffb703e436dfb5588a62ba0d183 /app/javascript/glitch/components/status/prepend.js
parent74e4fc8f8aea01159e7d24b978322545afb70e94 (diff)
remove wrong emojify usage in old glitch components
Diffstat (limited to 'app/javascript/glitch/components/status/prepend.js')
-rw-r--r--app/javascript/glitch/components/status/prepend.js8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/javascript/glitch/components/status/prepend.js b/app/javascript/glitch/components/status/prepend.js
index 6213e4c8d..8c0aed0f4 100644
--- a/app/javascript/glitch/components/status/prepend.js
+++ b/app/javascript/glitch/components/status/prepend.js
@@ -22,12 +22,8 @@ Imports:
 import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import escapeTextContentForBrowser from 'escape-html';
 import { FormattedMessage } from 'react-intl';
 
-//  Mastodon imports  //
-import emojify from '../../../mastodon/emoji';
-
                             /* * * * */
 
 /*
@@ -99,9 +95,7 @@ generate the message.
       >
         <b
           dangerouslySetInnerHTML={{
-            __html : emojify(escapeTextContentForBrowser(
-              account.get('display_name') || account.get('username')
-            )),
+            __html : account.get('display_name_html') || account.get('username'),
           }}
         />
       </a>