summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-23 17:03:35 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-23 17:03:35 +0000
commitbea0e0df7618b3b70c3d6ca6fe0022247c47ba6e (patch)
treec102a7957860ae2c4c2d0bd9ccf5013d889eb33b /synapse
parentpass room version into FederationHandler.on_invite_request (#6805) (diff)
parentFix bug with getting missing auth event during join 500'ed (#6810) (diff)
downloadsynapse-bea0e0df7618b3b70c3d6ca6fe0022247c47ba6e.tar.xz
Fix bug with getting missing auth event during join 500'ed (#6810)
* commit '7d846e870':
  Fix bug with getting missing auth event during join 500'ed (#6810)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/federation.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index 76c34bf840..5338e4a0f1 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -1940,7 +1940,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