diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-23 17:09:33 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-23 17:09:33 +0000 |
| commit | 97962c40288f6b814f573c757177d8ed126258e4 (patch) | |
| tree | 4f9f2a12b0e0f5fe96c0e4d9c8a75d405614db03 /synapse/handlers | |
| parent | 1.10.0rc2 (diff) | |
| parent | Merge pull request #6823 from matrix-org/rav/redact_changes/5 (diff) | |
| download | synapse-97962c40288f6b814f573c757177d8ed126258e4.tar.xz | |
Merge pull request #6823 from matrix-org/rav/redact_changes/5
* commit '9bcd37146': Update changelog Update changelog Update changelog Newsfile Simplify `room_version` handling in `FederationClient.send_invite` Pass room version object into `FederationClient.get_pdu`
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/federation.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index e9811ef2c7..fb5e5245ff 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1160,7 +1160,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 = [] @@ -1973,11 +1973,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 |