mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-20 10:55:09 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix comments

Browse source
This commit is contained in:
Erik Johnston 2019-03-21 15:31:31 +00:00
parent aefb7a1146
commit f5c944c7f2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/events/spamcheck.py
View file

@ -57,8 +57,8 @@ class SpamChecker(object):
invitee_userid (str|None): The user ID of the invitee. Is None invitee_userid (str|None): The user ID of the invitee. Is None
if this is a third party invite and the 3PID is not bound to a if this is a third party invite and the 3PID is not bound to a
user ID. user ID.
invitee_userid (dict|None): If a third party invite then is a dict third_party_invite (dict|None): If a third party invite then is a
containing the medium and address of the invitee. dict containing the medium and address of the invitee.
room_id (str) room_id (str)
new_room (bool): Wether the user is being invited to the room as new_room (bool): Wether the user is being invited to the room as
part of a room creation, if so the invitee would have been part of a room creation, if so the invitee would have been

4
synapse/rulecheck/domain_rule_checker.py
View file

@ -84,7 +84,9 @@ class DomainRuleChecker(object):
if not self.can_invite_by_third_party_id and third_party_invite: if not self.can_invite_by_third_party_id and third_party_invite:
return False return False
if third_party_invite and not invitee_userid: # This is a third party invite (without a bound mxid), so unless we have
# banned all third party invites (above) we allow it.
if not invitee_userid:
return True return True
inviter_domain = self._get_domain_from_id(inviter_userid) inviter_domain = self._get_domain_from_id(inviter_userid)