diff options
| author | David Baker <dave@matrix.org> | 2017-10-10 11:20:17 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-10-10 11:20:17 +0100 |
| commit | 89fa00ddff2abe08c402267353d700cfc8aa0769 (patch) | |
| tree | 01e2b818689718d028812931d7de1544cf96ac3f /synapse/events/spamcheck.py | |
| parent | Make be faster (diff) | |
| parent | Merge pull request #2520 from matrix-org/rav/process_incoming_rooms_in_parallel (diff) | |
| download | synapse-89fa00ddff2abe08c402267353d700cfc8aa0769.tar.xz | |
Merge branch 'develop' into dbkr/channel_notifications
Diffstat (limited to 'synapse/events/spamcheck.py')
| -rw-r--r-- | synapse/events/spamcheck.py | 4 |
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 |