summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-02-03 10:17:37 +0000
committerGitHub <noreply@github.com>2021-02-03 10:17:37 +0000
commitff55300b916b09fef83feb1f8ecaa07d90879c57 (patch)
tree8d1cf49eaafc56355504c82f4c95bf0a223580f6 /synapse/handlers/federation.py
parentUpdate changelog (diff)
downloadsynapse-ff55300b916b09fef83feb1f8ecaa07d90879c57.tar.xz
Honour ratelimit flag for application services for invite ratelimiting (#9302)
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index dbdfd56ff5..eddc7582d0 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1619,7 +1619,9 @@ class FederationHandler(BaseHandler):
 
         # We retrieve the room member handler here as to not cause a cyclic dependency
         member_handler = self.hs.get_room_member_handler()
-        member_handler.ratelimit_invite(event.room_id, event.state_key)
+        # We don't rate limit based on room ID, as that should be done by
+        # sending server.
+        member_handler.ratelimit_invite(None, event.state_key)
 
         # keep a record of the room version, if we don't yet know it.
         # (this may get overwritten if we later get a different room version in a