diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-17 11:25:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-17 11:25:23 +0100 |
| commit | ac08316548cf02c5991d455e96915959af603e0e (patch) | |
| tree | 6d4028791cc5656b90be063abdc2f7b2e73f68f4 /synapse/handlers/room_member.py | |
| parent | Bump version and changelog (diff) | |
| parent | Merge pull request #2228 from matrix-org/erikj/speed_up_get_hosts (diff) | |
| download | synapse-ac08316548cf02c5991d455e96915959af603e0e.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.21.0
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index ab87632d99..1ca88517a2 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -739,10 +739,11 @@ class RoomMemberHandler(BaseHandler): if len(current_state_ids) == 1 and create_event_id: defer.returnValue(self.hs.is_mine_id(create_event_id)) - for (etype, state_key), event_id in current_state_ids.items(): + for etype, state_key in current_state_ids: if etype != EventTypes.Member or not self.hs.is_mine_id(state_key): continue + event_id = current_state_ids[(etype, state_key)] event = yield self.store.get_event(event_id, allow_none=True) if not event: continue |