diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 19:22:24 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 19:22:24 +0000 |
commit | 638820f5713e67cc43e65f25ce09aefcd703450e (patch) | |
tree | 06b32ec4c5174d5e4f35ee862b30fa3ef80260f6 /synapse/handlers/room.py | |
parent | Merge pull request #6294 from matrix-org/erikj/add_state_storage (diff) | |
parent | Update black to 19.10b0 (#6304) (diff) | |
download | synapse-638820f5713e67cc43e65f25ce09aefcd703450e.tar.xz |
Update black to 19.10b0 (#6304)
* commit '020add509': Update black to 19.10b0 (#6304)
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r-- | synapse/handlers/room.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 1fec1a1f31..22d46c353e 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -149,21 +149,22 @@ class RoomCreationHandler(BaseHandler): # we create and auth the tombstone event before properly creating the new # room, to check our user has perms in the old room. - tombstone_event, tombstone_context = ( - yield self.event_creation_handler.create_event( - requester, - { - "type": EventTypes.Tombstone, - "state_key": "", - "room_id": old_room_id, - "sender": user_id, - "content": { - "body": "This room has been replaced", - "replacement_room": new_room_id, - }, + ( + tombstone_event, + tombstone_context, + ) = yield self.event_creation_handler.create_event( + requester, + { + "type": EventTypes.Tombstone, + "state_key": "", + "room_id": old_room_id, + "sender": user_id, + "content": { + "body": "This room has been replaced", + "replacement_room": new_room_id, }, - token_id=requester.access_token_id, - ) + }, + token_id=requester.access_token_id, ) old_room_version = yield self.store.get_room_version(old_room_id) yield self.auth.check_from_context( |