From cf45e57d9cf52a12e61141cf63789d61491ea425 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Mon, 17 Nov 2014 16:37:33 +0000 Subject: [PATCH] SYN-148: Add the alias after creating the room --- synapse/handlers/room.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 825957f72..cfe1061ed 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -111,15 +111,6 @@ class RoomCreationHandler(BaseHandler): user, room_id, is_public=is_public ) - if room_alias: - directory_handler = self.hs.get_handlers().directory_handler - yield directory_handler.create_association( - user_id=user_id, - room_id=room_id, - room_alias=room_alias, - servers=[self.hs.hostname], - ) - @defer.inlineCallbacks def handle_event(event): snapshot = yield self.store.snapshot_room(event) @@ -184,9 +175,18 @@ class RoomCreationHandler(BaseHandler): join_event, do_auth=False ) + result = {"room_id": room_id} + if room_alias: result["room_alias"] = room_alias.to_string() + directory_handler = self.hs.get_handlers().directory_handler + yield directory_handler.create_association( + user_id=user_id, + room_id=room_id, + room_alias=room_alias, + servers=[self.hs.hostname], + ) defer.returnValue(result)