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

Fix stream test. Make sure we add join to auth_events for invitiations

Browse source
This commit is contained in:
Erik Johnston 2014-12-12 10:42:27 +00:00
parent cde840a82c
commit fa4b610ae3
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/api/auth.py
View file

@ -61,6 +61,8 @@ class Auth(object):
if event.type == RoomAliasesEvent.TYPE:
return True
logger.debug("Auth events: %s", auth_events)
if event.type == RoomMemberEvent.TYPE:
allowed = self.is_membership_change_allowed(
event, auth_events
@ -389,8 +391,12 @@ class Auth(object):
if join_rule_event:
auth_ids.append(join_rule_event.event_id)
if e_type == Membership.JOIN:
if member_event and not is_public:
auth_ids.append(member_event.event_id)
else:
if member_event:
auth_ids.append(member_event.event_id)
elif member_event:
if member_event.content["membership"] == Membership.JOIN:
auth_ids.append(member_event.event_id)