remove wrong emojify usage in old glitch components

This commit is contained in:
Ondřej Hruška
2017-09-28 11:03:23 +02:00
parent 74e4fc8f8a
commit cf24ce7e03
4 changed files with 9 additions and 28 deletions

View File

@@ -11,11 +11,9 @@ import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import escapeTextContentForBrowser from 'escape-html';
import ImmutablePureComponent from 'react-immutable-pure-component';
// Mastodon imports.
import emojify from '../../../mastodon/emoji';
import Permalink from '../../../mastodon/components/permalink';
import AccountContainer from '../../../mastodon/containers/account_container';
@@ -39,15 +37,14 @@ export default class NotificationFollow extends ImmutablePureComponent {
const { account, notification } = this.props;
// Links to the display name.
const displayName = account.get('display_name') || account.get('username');
const displayNameHTML = { __html: emojify(escapeTextContentForBrowser(displayName)) };
const displayName = account.get('display_name_html') || account.get('username');
const link = (
<Permalink
className='notification__display-name'
href={account.get('url')}
title={account.get('acct')}
to={`/accounts/${account.get('id')}`}
dangerouslySetInnerHTML={displayNameHTML}
dangerouslySetInnerHTML={{ __html: displayName }}
/>
);