Merge branch 'master' into develop

This commit is contained in:
Richard van der Hoff 2019-12-20 11:11:34 +00:00
commit 56ad230efa
4 changed files with 23 additions and 2 deletions

View file

@ -792,7 +792,10 @@ class FederationHandler(BaseHandler):
events_to_state = {}
for e_id in edges:
state, auth = await self._get_state_for_room(
destination=dest, room_id=room_id, event_id=e_id
destination=dest,
room_id=room_id,
event_id=e_id,
include_event_in_state=False,
)
auth_events.update({a.event_id: a for a in auth})
auth_events.update({s.event_id: s for s in state})