diff --git a/changelog.d/6576.bugfix b/changelog.d/6576.bugfix
new file mode 100644
index 0000000000..f5414fce4d
--- /dev/null
+++ b/changelog.d/6576.bugfix
@@ -0,0 +1 @@
+Fix errors when attempting to backfill rooms over federation.
diff --git a/synapse/handlers/deactivate_account.py b/synapse/handlers/deactivate_account.py
index eb15a83b40..72634eafef 100644
--- a/synapse/handlers/deactivate_account.py
+++ b/synapse/handlers/deactivate_account.py
@@ -106,7 +106,7 @@ class DeactivateAccountHandler(BaseHandler):
await self.store.user_set_password_hash(user_id, None)
user = UserID.from_string(user_id)
- yield self._profile_handler.set_active(user, False, False)
+ await self._profile_handler.set_active(user, False, False)
# Add the user to a table of users pending deactivation (ie.
# removal from all the rooms they're a member of)
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index c6346c680b..0fc62c1063 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -789,7 +789,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})
|
