bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Conversations: Change the way otherAccounts is handled

Browse source 
Fixes #191
This commit is contained in:
Alex Gleason 2020-06-12 22:04:20 -05:00
parent 3179eacadd
commit b4532ccb40
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/soapbox/components/display_name.js
View file

@ -11,9 +11,9 @@ export default class DisplayName extends React.PureComponent {
}; };
render() { render() {
const { others } = this.props; const { account, others } = this.props;
let displayName, suffix, account; let displayName, suffix;
if (others && others.size > 1) { if (others && others.size > 1) {
displayName = others.take(2).map(a => [ displayName = others.take(2).map(a => [
@ -27,12 +27,6 @@ export default class DisplayName extends React.PureComponent {
suffix = `+${others.size - 2}`; suffix = `+${others.size - 2}`;
} }
} else { } else {
if (others && others.size > 0) {
account = others.first();
} else {
account = this.props.account;
}
displayName = ( displayName = (
<> <>
<bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi> <bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi>

2
app/soapbox/components/status.js
View file

@ -386,7 +386,7 @@ class Status extends ImmutablePureComponent {
); );
} }
if (otherAccounts && otherAccounts.size > 0) { if (otherAccounts && otherAccounts.size > 1) {
statusAvatar = <AvatarComposite accounts={otherAccounts} size={48} />; statusAvatar = <AvatarComposite accounts={otherAccounts} size={48} />;
} else if (account === undefined || account === null) { } else if (account === undefined || account === null) {
statusAvatar = <Avatar account={status.get('account')} size={48} />; statusAvatar = <Avatar account={status.get('account')} size={48} />;