Skip to content

Commit 8c71232

Browse files
ClearlyClairekadoshita
authored andcommitted
Remove unnused otherAccounts property (mastodon#18556)
Leftover from before mastodon#11896
1 parent 2670bcb commit 8c71232

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

app/javascript/mastodon/components/status.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
33
import PropTypes from 'prop-types';
44
import Avatar from './avatar';
55
import AvatarOverlay from './avatar_overlay';
6-
import AvatarComposite from './avatar_composite';
76
import RelativeTimestamp from './relative_timestamp';
87
import DisplayName from './display_name';
98
import StatusContent from './status_content';
@@ -70,7 +69,6 @@ class Status extends ImmutablePureComponent {
7069
static propTypes = {
7170
status: ImmutablePropTypes.map,
7271
account: ImmutablePropTypes.map,
73-
otherAccounts: ImmutablePropTypes.list,
7472
onClick: PropTypes.func,
7573
onReply: PropTypes.func,
7674
onFavourite: PropTypes.func,
@@ -297,7 +295,7 @@ class Status extends ImmutablePureComponent {
297295
let media = null;
298296
let statusAvatar, prepend, rebloggedByText;
299297

300-
const { intl, hidden, featured, otherAccounts, unread, showThread, scrollKey, pictureInPicture } = this.props;
298+
const { intl, hidden, featured, unread, showThread, scrollKey, pictureInPicture } = this.props;
301299

302300
let { status, account, ...other } = this.props;
303301

@@ -456,9 +454,7 @@ class Status extends ImmutablePureComponent {
456454
);
457455
}
458456

459-
if (otherAccounts && otherAccounts.size > 0) {
460-
statusAvatar = <AvatarComposite accounts={otherAccounts} size={48} />;
461-
} else if (account === undefined || account === null) {
457+
if (account === undefined || account === null) {
462458
statusAvatar = <Avatar account={status.get('account')} size={48} />;
463459
} else {
464460
statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
@@ -492,7 +488,7 @@ class Status extends ImmutablePureComponent {
492488
{statusAvatar}
493489
</div>
494490

495-
<DisplayName account={status.get('account')} others={otherAccounts} />
491+
<DisplayName account={status.get('account')} />
496492
</a>
497493
</div>
498494

0 commit comments

Comments
 (0)