summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-31 09:49:13 +0000
committerGitHub <noreply@github.com>2020-01-31 09:49:13 +0000
commit7d846e870422c65f3fb436e5b0e543dae17719fc (patch)
tree48c1fbadb8513a54efb9317f7e798967e4db0109
parentpass room version into FederationHandler.on_invite_request (#6805) (diff)
downloadsynapse-7d846e870422c65f3fb436e5b0e543dae17719fc.tar.xz
Fix bug with getting missing auth event during join 500'ed (#6810)
-rw-r--r--changelog.d/6810.misc1
-rw-r--r--synapse/handlers/federation.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/changelog.d/6810.misc b/changelog.d/6810.misc
new file mode 100644

index 0000000000..5537355bea --- /dev/null +++ b/changelog.d/6810.misc
@@ -0,0 +1 @@ +Record room versions in the `rooms` table. diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 01372f6d47..1f92640f86 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -1929,7 +1929,11 @@ class FederationHandler(BaseHandler): for e_id in missing_auth_events: m_ev = yield self.federation_client.get_pdu( - [origin], e_id, room_version=room_version, outlier=True, timeout=10000 + [origin], + e_id, + room_version=room_version.identifier, + outlier=True, + timeout=10000, ) if m_ev and m_ev.event_id == e_id: event_map[e_id] = m_ev