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

Merge pull request #213 from matrix-org/dbkr/redacted_3pid_invite_crash 

Don't crash on redacted (or otherwise invalid) 3pid invites
pull/21833/head
David Baker 2016-03-11 14:39:43 +00:00
parent fc062072b0 1131b82414
commit e0c416ee01
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/rooms/MemberList.js
View File

@ -348,6 +348,7 @@ module.exports = React.createClass({
);
});
// XXX: surely this is not the right home for this logic.
if (membership === "invite") {
// include 3pid invites (m.room.third_party_invite) state events.
// The HS may have already converted these into m.room.member invites so
@ -358,6 +359,12 @@ module.exports = React.createClass({
if (room) {
room.currentState.getStateEvents("m.room.third_party_invite").forEach(
function(e) {
// any events without these keys are not valid 3pid invites, so we ignore them
var required_keys = ['key_validity_url', 'public_key', 'display_name'];
for (var i = 0; i < required_keys.length; ++i) {
if (e.getContent()[required_keys[i]] === undefined) return;
}
// discard all invites which have a m.room.member event since we've
// already added them.
var memberEvent = room.currentState.getInviteForThreePidToken(e.getStateKey());