Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 04:44:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Allow spam checker to reject invites too

Browse source
This commit is contained in:
David Baker 2017-10-03 13:53:09 +01:00
parent e4779be97a
commit 84716d267c
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
synapse/handlers/room_member.py
View file

@ -48,6 +48,7 @@ class RoomMemberHandler(BaseHandler):
self.member_linearizer = Linearizer(name="member")
self.clock = hs.get_clock()
self.spam_checker = hs.get_spam_checker()
self.distributor = hs.get_distributor()
self.distributor.declare("user_joined_room")
@ -210,12 +211,19 @@ class RoomMemberHandler(BaseHandler):
if is_blocked:
raise SynapseError(403, "This room has been blocked on this server")
if (effective_membership_state == "invite" and
self.hs.config.block_non_admin_invites):
is_requester_admin = yield self.auth.is_server_admin(
requester.user,
)
if not is_requester_admin:
if effective_membership_state == "invite":
block_invite = False
if self.hs.config.block_non_admin_invites:
is_requester_admin = yield self.auth.is_server_admin(
requester.user,
)
if not is_requester_admin:
block_invite = True
if not self.spam_checker.user_may_invite(requester.user):
block_invite = True
if block_invite:
raise SynapseError(
403, "Invites have been disabled on this server",
)