diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx index 8077308c44..2d463b9d1e 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 (
- {displayName} }} /> + }} />
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss index c15a827a40..ba091c15e0 100644 --- a/app/assets/stylesheets/components.scss +++ b/app/assets/stylesheets/components.scss @@ -183,6 +183,12 @@ strong { color: #fff; } + + &.muted { + .emojione { + opacity: 0.5; + } + } } .status__display-name, .reply-indicator__display-name, .detailed-status__display-name, .account__display-name {