nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crash when conversations have no valid participants (#10078) 

* Never return empty participants for conversations

Fixes #10068

* Fix client-side crash when conversations have no participants
This commit is contained in:
ThibG 2019-02-19 20:00:41 +01:00 committed by Eugen Rochko
parent 359d26a053
commit 8e7fc7ec73
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/components/display_name.js
View File

@ -22,7 +22,7 @@ export default class DisplayName extends React.PureComponent {
suffix = `+${others.size - 2}`; suffix = `+${others.size - 2}`;
} }
} else { } else {
if (others) { if (others && others.size > 0) {
account = others.first(); account = others.first();
} else { } else {
account = this.props.account; account = this.props.account;

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

@ -326,7 +326,7 @@ class Status extends ImmutablePureComponent {
); );
} }
if (otherAccounts) { if (otherAccounts && otherAccounts.size > 0) {
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} />;

3
app/models/account_conversation.rb
View File

@ -30,7 +30,8 @@ class AccountConversation < ApplicationRecord
if participant_account_ids.empty? if participant_account_ids.empty?
[account] [account]
else else
Account.where(id: participant_account_ids) participants = Account.where(id: participant_account_ids)
participants.empty? ? [account] : participants
end end
end end