diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-18 15:48:30 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-18 15:48:30 +0000 |
| commit | e9f587ecbaf5b60183d7c56108d76bb5f76a98f4 (patch) | |
| tree | 5cf7df273b613b88902016722ca8f2d1c222cf19 /synapse/rest | |
| parent | Include room members' presence in room initialSync (diff) | |
| parent | Null check when determining default power levels (diff) | |
| download | synapse-e9f587ecbaf5b60183d7c56108d76bb5f76a98f4.tar.xz | |
Merge remote-tracking branch 'origin/develop' into room-initial-sync
Diffstat (limited to '')
| -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: |