summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-29 16:11:19 +0000
committerErik Johnston <erik@matrix.org>2019-01-29 16:15:02 +0000
commitb1fffca3458c6ba26da1e61e4e70ac6f7419d839 (patch)
tree4d67fc39dfc16cebbfef9cd8a75d7e18006ce364 /synapse
parentOnly check event IDs domain signed event for V1 and V2 (diff)
downloadsynapse-b1fffca3458c6ba26da1e61e4e70ac6f7419d839.tar.xz
Remove event ID usage when checking if new room
The event ID is changing, so we can no longer get the domain from it. On
the other hand, the check is unnecessary.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/room_member.py3
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):