Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

pass room id too

Browse Source
This commit is contained in:
David Baker 2017-10-03 17:13:14 +01:00
parent c2c188b699
commit 1e375468de
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/events/spamcheck.py
View File

@ -46,7 +46,7 @@ class SpamChecker(object):
return self.spam_checker.check_event_for_spam(event) return self.spam_checker.check_event_for_spam(event)
def user_may_invite(self, userid): def user_may_invite(self, userid, roomid):
"""Checks if a given user may send an invite """Checks if a given user may send an invite
If this method returns false, the invite will be rejected. If this method returns false, the invite will be rejected.
@ -60,4 +60,4 @@ class SpamChecker(object):
if self.spam_checker is None: if self.spam_checker is None:
return True return True
return self.spam_checker.user_may_invite(userid) return self.spam_checker.user_may_invite(userid, roomid)

2
synapse/handlers/federation.py
View File

@ -1078,7 +1078,7 @@ class FederationHandler(BaseHandler):
if self.hs.config.block_non_admin_invites: if self.hs.config.block_non_admin_invites:
raise SynapseError(403, "This server does not accept room invites") raise SynapseError(403, "This server does not accept room invites")
if not self.spam_checker.user_may_invite(event.sender): if not self.spam_checker.user_may_invite(event.sender, event.room_id):
raise SynapseError( raise SynapseError(
403, "This user is not permitted to send invites to this server" 403, "This user is not permitted to send invites to this server"
) )

4
synapse/handlers/room_member.py
View File

@ -224,7 +224,9 @@ class RoomMemberHandler(BaseHandler):
) )
block_invite = True block_invite = True
if not self.spam_checker.user_may_invite(requester.user.to_string()): if not self.spam_checker.user_may_invite(
requester.user.to_string(), room_id,
):
logger.info("Blocking invite due to spam checker") logger.info("Blocking invite due to spam checker")
block_invite = True block_invite = True