mstdn.y-zu.org/mastodon
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix removed otherAccounts referred in status.js

Browse Source
This commit is contained in:
kyori19 2022-11-15 05:25:11 +00:00 committed by GitHub
parent ae2190b9a5
commit 5d59901b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/mastodon/components/status.js
View File

@ -597,7 +597,7 @@ class Status extends ImmutablePureComponent {
return null; return null;
}; };
const statusAvatar = (status, account, otherAccounts, quote = false) => { const statusAvatar = (status, account, quote = false) => {
if (account === undefined || account === null) { if (account === undefined || account === null) {
return <Avatar account={status.get('account')} size={quote ? 18 : 48} />; return <Avatar account={status.get('account')} size={quote ? 18 : 48} />;
} else { } else {
@ -605,13 +605,13 @@ class Status extends ImmutablePureComponent {
} }
}; };
const identity = (status, account, otherAccounts, quote = false) => ( const identity = (status, account, quote = false) => (
<a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'> <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
<div className='status__avatar'> <div className='status__avatar'>
{statusAvatar(status, account, otherAccounts, quote)} {statusAvatar(status, account, quote)}
</div> </div>
<DisplayName account={status.get('account')} others={otherAccounts} /> <DisplayName account={status.get('account')} />
</a> </a>
); );
@ -636,7 +636,7 @@ class Status extends ImmutablePureComponent {
<RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>} <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
</a> </a>
{identity(status, account, otherAccounts, false)} {identity(status, account, false)}
</div> </div>
<StatusContent <StatusContent