diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx index 8077308c4..2d463b9d1 100644 --- a/app/assets/javascripts/components/components/status.jsx +++ b/app/assets/javascripts/components/components/status.jsx @@ -8,6 +8,8 @@ import VideoPlayer from './video_player'; import StatusContent from './status_content'; import StatusActionBar from './status_action_bar'; import { FormattedMessage } from 'react-intl'; +import emojify from '../emoji'; +import escapeTextContentForBrowser from 'react/lib/escapeTextContentForBrowser'; const Status = React.createClass({ @@ -56,11 +58,13 @@ const Status = React.createClass({ displayName = status.getIn(['account', 'username']); } + const displayNameHTML = { __html: emojify(escapeTextContentForBrowser(displayName)) }; + return (