diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-18 15:03:01 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-18 15:03:13 +0000 |
| commit | a5b88c489ebf23e076a99306e7c95e9b60e83864 (patch) | |
| tree | 9e6d493cec26f95f3e92bc83e447589a638f81f7 /synapse/rest/directory.py | |
| parent | warn about memory (diff) | |
| download | synapse-a5b88c489ebf23e076a99306e7c95e9b60e83864.tar.xz | |
Split out sending the room alias events from creating the alias so that we can do them in the right point when creating a room
Diffstat (limited to 'synapse/rest/directory.py')
| -rw-r--r-- | synapse/rest/directory.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/directory.py b/synapse/rest/directory.py index 6c260e7102..5aaac05e28 100644 --- a/synapse/rest/directory.py +++ b/synapse/rest/directory.py @@ -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: |