summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-18 14:02:46 +0000
committerErik Johnston <erik@matrix.org>2016-03-18 14:02:46 +0000
commit916227b4df907c87a5c7b2c18c759fd8be80fa51 (patch)
tree003bdca42f8d6ea160742b5446713ae6d3ef9b55 /synapse/rest
parentMerge pull request #650 from matrix-org/dbkr/register_idempotent_with_username (diff)
parentCheck canonical alias event exists (diff)
downloadsynapse-916227b4df907c87a5c7b2c18c759fd8be80fa51.tar.xz
Merge pull request #652 from matrix-org/erikj/delete_alias
Update aliases event after deletion
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/directory.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/directory.py b/synapse/rest/client/v1/directory.py

index 60c5ec77aa..59a23d6cb6 100644 --- a/synapse/rest/client/v1/directory.py +++ b/synapse/rest/client/v1/directory.py
@@ -127,8 +127,9 @@ class ClientDirectoryServer(ClientV1RestServlet): room_alias = RoomAlias.from_string(room_alias) yield dir_handler.delete_association( - user.to_string(), room_alias + requester, user.to_string(), room_alias ) + logger.info( "User %s deleted alias %s", user.to_string(),