diff options
| author | Erik Johnston <erikj@jki.re> | 2018-10-24 09:40:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 09:40:27 +0100 |
| commit | cb23aa4c4275e5c286978b1660720b2f1accdba9 (patch) | |
| tree | 1233b9ca3b300c8108dc4e777f6d3378ff80958a /synapse/handlers/room.py | |
| parent | Merge pull request #3969 from turt2live/travis/fix-federated-group-requests (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-cb23aa4c4275e5c286978b1660720b2f1accdba9.tar.xz | |
Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation
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) |