SYN-148: Add the alias after creating the room

This commit is contained in:
Mark Haines 2014-11-17 16:37:33 +00:00
parent 1b91c26409
commit cf45e57d9c
1 changed files with 9 additions and 9 deletions

View File

@ -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)