OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4565 from matrix-org/matthew/invite-npe 

Fix crash for broken invites
pull/21833/head
Michael Telatynski 2020-05-11 17:12:38 +01:00 committed by GitHub
parent b1e266823f f02ce176dd
commit c2fea7d4d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/RoomView.js
View File

@ -1717,8 +1717,11 @@ export default createReactClass({
} else { } else {
const myUserId = this.context.credentials.userId; const myUserId = this.context.credentials.userId;
const myMember = this.state.room.getMember(myUserId); const myMember = this.state.room.getMember(myUserId);
const inviteEvent = myMember.events.member; const inviteEvent = myMember ? myMember.events.member : null;
var inviterName = inviteEvent.sender ? inviteEvent.sender.name : inviteEvent.getSender(); let inviterName = _t("Unknown");
if (inviteEvent) {
inviterName = inviteEvent.sender ? inviteEvent.sender.name : inviteEvent.getSender();
}
// We deliberately don't try to peek into invites, even if we have permission to peek // We deliberately don't try to peek into invites, even if we have permission to peek
// as they could be a spam vector. // as they could be a spam vector.