diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-02-03 20:33:32 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-02-03 20:33:32 +0000 |
| commit | 17f2a512f3bfd98eea2a63244dd2f893721d8252 (patch) | |
| tree | c0bfad726743cc4e34be489360fd9cae5cba9039 /synapse/handlers/federation.py | |
| parent | Social login UI polish (#9301) (diff) | |
| parent | Clarify documentation about escaping URLs in templates. (#9310) (diff) | |
| download | synapse-17f2a512f3bfd98eea2a63244dd2f893721d8252.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.27.0' into social_login_hotfixes
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 4 |
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 |