PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

don't NPE on invites from Dendrite

Browse source
This commit is contained in:
Matthew Hodgson 2020-05-10 11:17:21 +01:00
parent 347e3a0dd0
commit ad2f704e76
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.