summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-21 12:25:33 +0000
committerErik Johnston <erik@matrix.org>2019-03-21 12:48:37 +0000
commit164798ec32a30e07bd5972ec216e7848f0928c78 (patch)
tree498b115d9eb2b96c886087d85b6140df46cae412 /synapse/handlers/federation.py
parentCorrectly handle 3PID invites in create room spam check (diff)
downloadsynapse-164798ec32a30e07bd5972ec216e7848f0928c78.tar.xz
Add 3PID invite support to spam checker
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 1f799a04c1..c106fab0dc 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -1346,7 +1346,8 @@ class FederationHandler(BaseHandler):
             raise SynapseError(403, "This server does not accept room invites")
 
         if not self.spam_checker.user_may_invite(
-            event.sender, event.state_key, event.room_id, new_room=False,
+            event.sender, event.state_key, None,
+            room_id=event.room_id, new_room=False,
         ):
             raise SynapseError(
                 403, "This user is not permitted to send invites to this server/user"