diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-01-16 19:47:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-16 19:47:46 +0100 |
commit | bc642ac24b49c14dca382e7aabbc16130293d2f4 (patch) | |
tree | 1bf55901185d1cac954ef216f7394d09c10df1f3 /app/javascript/mastodon/components/display_name.js | |
parent | 4ab42287c0bbcbd259bff229d66da8964a261aff (diff) |
Redesign public hashtag page to use a masonry layout (#9822)
Diffstat (limited to 'app/javascript/mastodon/components/display_name.js')
-rw-r--r-- | app/javascript/mastodon/components/display_name.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/javascript/mastodon/components/display_name.js b/app/javascript/mastodon/components/display_name.js index c2c40cb3f..acddf77c5 100644 --- a/app/javascript/mastodon/components/display_name.js +++ b/app/javascript/mastodon/components/display_name.js @@ -1,15 +1,17 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; +import PropTypes from 'prop-types'; export default class DisplayName extends React.PureComponent { static propTypes = { account: ImmutablePropTypes.map.isRequired, others: ImmutablePropTypes.list, + localDomain: PropTypes.string, }; render () { - const { account, others } = this.props; + const { account, others, localDomain } = this.props; const displayNameHtml = { __html: account.get('display_name_html') }; let suffix; @@ -17,7 +19,13 @@ export default class DisplayName extends React.PureComponent { if (others && others.size > 1) { suffix = `+${others.size}`; } else { - suffix = <span className='display-name__account'>@{account.get('acct')}</span>; + let acct = account.get('acct'); + + if (acct.indexOf('@') === -1 && localDomain) { + acct = `${acct}@${localDomain}`; + } + + suffix = <span className='display-name__account'>@{acct}</span>; } return ( |