Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 17:01:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6823 from matrix-org/rav/redact_changes/5

Browse source 
pass room versions around
This commit is contained in:
Richard van der Hoff 2020-02-06 11:32:33 +00:00 • committed by GitHub
commit 9bcd37146e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/handlers/federation.py
View file

@ -1156,7 +1156,7 @@ class FederationHandler(BaseHandler):
Logs a warning if we can't find the given event.
"""
room_version = await self.store.get_room_version_id(room_id)
room_version = await self.store.get_room_version(room_id)
event_infos = []
@ -1962,11 +1962,7 @@ class FederationHandler(BaseHandler):
for e_id in missing_auth_events:
m_ev = await self.federation_client.get_pdu(
[origin],
e_id,
room_version=room_version.identifier,
outlier=True,
timeout=10000,
[origin], e_id, room_version=room_version, outlier=True, timeout=10000,
)
if m_ev and m_ev.event_id == e_id:
event_map[e_id] = m_ev