Merge remote-tracking branch 'origin/develop' into room-initial-sync

This commit is contained in:
Paul "LeoNerd" Evans 2014-11-18 15:48:30 +00:00
commit e9f587ecba
8 changed files with 209 additions and 167 deletions

View file

@ -70,9 +70,11 @@ class ClientDirectoryServer(RestServlet):
dir_handler = self.handlers.directory_handler
try:
user_id = user.to_string()
yield dir_handler.create_association(
user.to_string(), room_alias, room_id, servers
user_id, room_alias, room_id, servers
)
yield dir_handler.send_room_alias_update_event(user_id, room_id)
except SynapseError as e:
raise e
except: