Fix exceptions when attempting to backfill

Fixes #6575
matrix-org · Dec 19, 2019 · 1f8070c · 1f8070c
1 parent e156c86
commit 1f8070c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelog.d/6576.bugfix b/changelog.d/6576.bugfix
@@ -0,0 +1 @@
+Fix errors when attempting to backfill rooms over federation.
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
@@ -797,7 +797,10 @@ def backfill(self, dest, room_id, limit, extremities):
         events_to_state = {}
         for e_id in edges:
             state, auth = yield 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})
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix errors when attempting to backfill rooms over federation.