Browse Source

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
pull/4/head
ThibG 5 years ago
committed by Eugen Rochko
parent
commit
8e7fc7ec73
3 changed files with 4 additions and 3 deletions
  1. +1
    -1
      app/javascript/mastodon/components/display_name.js
  2. +1
    -1
      app/javascript/mastodon/components/status.js
  3. +2
    -1
      app/models/account_conversation.rb

+ 1
- 1
app/javascript/mastodon/components/display_name.js View File

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

+ 1
- 1
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} />;
} else if (account === undefined || account === null) {
statusAvatar = <Avatar account={status.get('account')} size={48} />;

+ 2
- 1
app/models/account_conversation.rb View File

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

Loading…
Cancel
Save