diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-10-07 12:20:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-07 12:20:44 +0100 |
| commit | 43c622885c94d0864ce4ff44ca3dfb753af88a6e (patch) | |
| tree | c6b6e1bf84bc9aa923b5813841bfcf6cee214495 /synapse/handlers/room.py | |
| parent | Combine `SpamCheckerApi` with the more generic `ModuleApi`. (#8464) (diff) | |
| parent | update wording (diff) | |
| download | synapse-43c622885c94d0864ce4ff44ca3dfb753af88a6e.tar.xz | |
Merge pull request #8463 from matrix-org/rav/clean_up_event_handling
Reduce inconsistencies between codepaths for membership and non-membership events.
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index f14f791586..d0530a446c 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -185,6 +185,7 @@ class RoomCreationHandler(BaseHandler): ShadowBanError if the requester is shadow-banned. """ user_id = requester.user.to_string() + assert self.hs.is_mine_id(user_id), "User must be our own: %s" % (user_id,) # start by allocating a new room id r = await self.store.get_room(old_room_id) @@ -229,8 +230,8 @@ class RoomCreationHandler(BaseHandler): ) # now send the tombstone - await self.event_creation_handler.send_nonmember_event( - requester, tombstone_event, tombstone_context + await self.event_creation_handler.handle_new_client_event( + requester=requester, event=tombstone_event, context=tombstone_context, ) old_room_state = await tombstone_context.get_current_state_ids() |