diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-03-03 19:05:54 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-03-03 19:05:54 +0000 |
| commit | a85179aff3bf2bc1b132e9918cd8222a61a8bcc2 (patch) | |
| tree | aac1ff9e5bdca7ddc0fdc9d2cae5a5dcf13e8733 /synapse/handlers/directory.py | |
| parent | Empty commit (diff) | |
| parent | Merge pull request #621 from matrix-org/daniel/ratelimiting (diff) | |
| download | synapse-a85179aff3bf2bc1b132e9918cd8222a61a8bcc2.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/SYN-642
Diffstat (limited to 'synapse/handlers/directory.py')
| -rw-r--r-- | synapse/handlers/directory.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index e0a778e7ff..88166f0187 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -212,17 +212,21 @@ class DirectoryHandler(BaseHandler): ) @defer.inlineCallbacks - def send_room_alias_update_event(self, user_id, room_id): + def send_room_alias_update_event(self, requester, user_id, room_id): aliases = yield self.store.get_aliases_for_room(room_id) msg_handler = self.hs.get_handlers().message_handler - yield msg_handler.create_and_send_nonmember_event({ - "type": EventTypes.Aliases, - "state_key": self.hs.hostname, - "room_id": room_id, - "sender": user_id, - "content": {"aliases": aliases}, - }, ratelimit=False) + yield msg_handler.create_and_send_nonmember_event( + requester, + { + "type": EventTypes.Aliases, + "state_key": self.hs.hostname, + "room_id": room_id, + "sender": user_id, + "content": {"aliases": aliases}, + }, + ratelimit=False + ) @defer.inlineCallbacks def get_association_from_room_alias(self, room_alias): |