diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-29 22:58:38 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-29 22:58:38 +0000 |
| commit | 67b82f133631879244773421988d52b1eb626d78 (patch) | |
| tree | b62b1658804c8f76cde6f5a9d24e7aff3af56438 /synapse/handlers/room_member.py | |
| parent | Fixup comment (diff) | |
| parent | Merge pull request #4514 from matrix-org/erikj/remove_event_id (diff) | |
| download | synapse-67b82f133631879244773421988d52b1eb626d78.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions_eiah
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 9ed5a05cca..2beffdf41e 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -940,7 +940,8 @@ class RoomMemberHandler(object): # first member event? create_event_id = current_state_ids.get(("m.room.create", "")) if len(current_state_ids) == 1 and create_event_id: - defer.returnValue(self.hs.is_mine_id(create_event_id)) + # We can only get here if we're in the process of creating the room + defer.returnValue(True) for etype, state_key in current_state_ids: if etype != EventTypes.Member or not self.hs.is_mine_id(state_key): |