diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-07 09:31:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-07 09:31:07 +0200 |
| commit | 42cd363542abf0a12a4e877b3ad26024f24577ef (patch) | |
| tree | b9539c370516cf0dcf1cc64b4975a1b6e84b9e56 /app/javascript/mastodon/features/account | |
| parent | 0f0cc3f2eba9c8a701d735cd54206629eeea4ddb (diff) | |
Bot nameplates (#7391)
* Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues
Diffstat (limited to 'app/javascript/mastodon/features/account')
| -rw-r--r-- | app/javascript/mastodon/features/account/components/header.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js index 47915e6fb..7358053da 100644 --- a/app/javascript/mastodon/features/account/components/header.js +++ b/app/javascript/mastodon/features/account/components/header.js @@ -131,6 +131,7 @@ export default class Header extends ImmutablePureComponent { const content = { __html: account.get('note_emojified') }; const displayNameHtml = { __html: account.get('display_name_html') }; const fields = account.get('fields'); + const badge = account.get('bot') ? (<div className='roles'><div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Bot' /></div></div>) : null; return ( <div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${account.get('header')})` }}> @@ -139,6 +140,9 @@ export default class Header extends ImmutablePureComponent { <span className='account__header__display-name' dangerouslySetInnerHTML={displayNameHtml} /> <span className='account__header__username'>@{account.get('acct')} {lockedIcon}</span> + + {badge} + <div className='account__header__content' dangerouslySetInnerHTML={content} /> {fields.size > 0 && ( |