diff options
Diffstat (limited to 'app/javascript/flavours/glitch/components/status_header.js')
-rw-r--r-- | app/javascript/flavours/glitch/components/status_header.js | 65 |
1 files changed, 23 insertions, 42 deletions
diff --git a/app/javascript/flavours/glitch/components/status_header.js b/app/javascript/flavours/glitch/components/status_header.js index cc476139b..990dea536 100644 --- a/app/javascript/flavours/glitch/components/status_header.js +++ b/app/javascript/flavours/glitch/components/status_header.js @@ -15,7 +15,6 @@ export default class StatusHeader extends React.PureComponent { status: ImmutablePropTypes.map.isRequired, friend: ImmutablePropTypes.map, parseClick: PropTypes.func.isRequired, - otherAccounts: ImmutablePropTypes.list, }; // Handles clicks on account name/image @@ -34,57 +33,39 @@ export default class StatusHeader extends React.PureComponent { const { status, friend, - otherAccounts, } = this.props; const account = status.get('account'); let statusAvatar; - if (otherAccounts && otherAccounts.size > 0) { - statusAvatar = <AvatarComposite accounts={otherAccounts} size={48} onAccountClick={this.handleClick} />; - } else if (friend === undefined || friend === null) { + if (friend === undefined || friend === null) { statusAvatar = <Avatar account={account} size={48} />; } else { statusAvatar = <AvatarOverlay account={account} friend={friend} />; } - if (!otherAccounts) { - return ( - <div className='status__info__account'> - <a - href={account.get('url')} - target='_blank' - className='status__avatar' - onClick={this.handleAccountClick} - rel='noopener noreferrer' - > - {statusAvatar} - </a> - <a - href={account.get('url')} - target='_blank' - className='status__display-name' - onClick={this.handleAccountClick} - rel='noopener noreferrer' - > - <DisplayName account={account} others={otherAccounts} /> - </a> - </div> - ); - } else { - // This is a DM conversation - return ( - <div className='status__info__account'> - <span className='status__avatar'> - {statusAvatar} - </span> - - <span className='status__display-name'> - <DisplayName account={account} others={otherAccounts} onAccountClick={this.handleClick} /> - </span> - </div> - ); - } + return ( + <div className='status__info__account'> + <a + href={account.get('url')} + target='_blank' + className='status__avatar' + onClick={this.handleAccountClick} + rel='noopener noreferrer' + > + {statusAvatar} + </a> + <a + href={account.get('url')} + target='_blank' + className='status__display-name' + onClick={this.handleAccountClick} + rel='noopener noreferrer' + > + <DisplayName account={account} /> + </a> + </div> + ); } } |