summary refs log tree commit diff
path: root/synapse/rest/client/v1/directory.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-03-03 17:02:48 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-03-03 17:02:48 +0000
commit0b3083c75b0eb256df8dc1f5f71db134c3428035 (patch)
treeee0061a97caacbbbcd43aebcc4bc295facc05fbd /synapse/rest/client/v1/directory.py
parentMerge pull request #620 from matrix-org/erikj/jenkins (diff)
parentPass whole requester to ratelimiting (diff)
downloadsynapse-0b3083c75b0eb256df8dc1f5f71db134c3428035.tar.xz
Merge pull request #621 from matrix-org/daniel/ratelimiting
Pass whole requester to ratelimiting
Diffstat (limited to 'synapse/rest/client/v1/directory.py')
-rw-r--r--synapse/rest/client/v1/directory.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/directory.py b/synapse/rest/client/v1/directory.py
index 74ec1e50e0..8c1a2614a0 100644
--- a/synapse/rest/client/v1/directory.py
+++ b/synapse/rest/client/v1/directory.py
@@ -75,7 +75,11 @@ class ClientDirectoryServer(ClientV1RestServlet):
                 yield dir_handler.create_association(
                     user_id, room_alias, room_id, servers
                 )
-                yield dir_handler.send_room_alias_update_event(user_id, room_id)
+                yield dir_handler.send_room_alias_update_event(
+                    requester,
+                    user_id,
+                    room_id
+                )
             except SynapseError as e:
                 raise e
             except: