imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5121 from matrix-org/t3chguy/null-guard-group-inviter

Browse source 
Add null guard to group inviter for corrupted groups
This commit is contained in:
Michael Telatynski 2020-08-18 12:45:06 +01:00 • committed by GitHub
commit aef8784b78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/GroupView.js
View file

@ -1003,9 +1003,10 @@ export default createReactClass({
this.state.inviterProfile.avatarUrl, 36, 36, this.state.inviterProfile.avatarUrl, 36, 36,
) : null; ) : null;
let inviterName = group.inviter.userId; const inviter = group.inviter || {};
let inviterName = inviter.userId;
if (this.state.inviterProfile) { if (this.state.inviterProfile) {
inviterName = this.state.inviterProfile.displayName || group.inviter.userId; inviterName = this.state.inviterProfile.displayName || inviter.userId;
} }
return <div className="mx_GroupView_membershipSection mx_GroupView_membershipSection_invited"> return <div className="mx_GroupView_membershipSection mx_GroupView_membershipSection_invited">
<div className="mx_GroupView_membershipSubSection"> <div className="mx_GroupView_membershipSubSection">
@ -1016,7 +1017,7 @@ export default createReactClass({
height={36} height={36}
/> />
{ _t("%(inviter)s has invited you to join this community", { { _t("%(inviter)s has invited you to join this community", {
inviter: inviterName, inviter: inviterName || _t("Someone"),
}) } }) }
</div> </div>
<div className="mx_GroupView_membership_buttonContainer"> <div className="mx_GroupView_membership_buttonContainer">