summary refs log tree commit diff
path: root/synapse/events/spamcheck.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2017-10-05 14:02:28 +0100
committerDavid Baker <dave@matrix.org>2017-10-05 14:02:28 +0100
commitf878e6f8af9e80cfa4be717c03cc4f9853a93794 (patch)
tree6c829162c74a5d9f1abcd36bc55a0883ac164e5a /synapse/events/spamcheck.py
parentMerge pull request #2500 from matrix-org/dbkr/fix_word_boundary_mentions (diff)
downloadsynapse-f878e6f8af9e80cfa4be717c03cc4f9853a93794.tar.xz
Spam checking: add the invitee to user_may_invite
Diffstat (limited to 'synapse/events/spamcheck.py')
-rw-r--r--synapse/events/spamcheck.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index 595b1760f8..dccc579eac 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -46,7 +46,7 @@ class SpamChecker(object):
 
         return self.spam_checker.check_event_for_spam(event)
 
-    def user_may_invite(self, userid, room_id):
+    def user_may_invite(self, inviter_userid, invitee_userid, room_id):
         """Checks if a given user may send an invite
 
         If this method returns false, the invite will be rejected.
@@ -60,7 +60,7 @@ class SpamChecker(object):
         if self.spam_checker is None:
             return True
 
-        return self.spam_checker.user_may_invite(userid, room_id)
+        return self.spam_checker.user_may_invite(inviter_userid, invitee_userid, room_id)
 
     def user_may_create_room(self, userid):
         """Checks if a given user may create a room