diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-18 16:14:24 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-19 10:11:56 +0100 |
| commit | 74e761708398d5170783912f02d120f20113205e (patch) | |
| tree | 2b044faf8920130babaf9ae6ef011b822930d723 /synapse/handlers/room.py | |
| parent | Merge pull request #4057 from matrix-org/rav/use_correct_python (diff) | |
| download | synapse-74e761708398d5170783912f02d120f20113205e.tar.xz | |
Clean up room alias creation
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 c3f820b975..ab1571b27b 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -190,10 +190,11 @@ class RoomCreationHandler(BaseHandler): if room_alias: directory_handler = self.hs.get_handlers().directory_handler yield directory_handler.create_association( - user_id=user_id, + requester=requester, room_id=room_id, room_alias=room_alias, servers=[self.hs.hostname], + send_event=False, ) preset_config = config.get( @@ -289,7 +290,7 @@ class RoomCreationHandler(BaseHandler): if room_alias: result["room_alias"] = room_alias.to_string() yield directory_handler.send_room_alias_update_event( - requester, user_id, room_id + requester, room_id ) defer.returnValue(result) |