diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-07 19:07:00 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-07 19:07:00 +0100 |
| commit | 89c0cd4accbf6d809cc9d3fdce4df4d8e4f39d35 (patch) | |
| tree | 019dd15780bbd432e099c748fecd2a16b645b470 /synapse/federation/federation_server.py | |
| parent | Merge pull request #124 from matrix-org/hotfixes-v0.8.1-r4 (diff) | |
| parent | Slight rewording (diff) | |
| download | synapse-89c0cd4accbf6d809cc9d3fdce4df4d8e4f39d35.tar.xz | |
Merge branch 'release-v0.9.0' of github.com:matrix-org/synapse v0.9.0
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 25c0014f97..2b46188c91 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -417,13 +417,13 @@ class FederationServer(FederationBase): pdu.internal_metadata.outlier = True elif min_depth and pdu.depth > min_depth: if get_missing and prevs - seen: - latest_tuples = yield self.store.get_latest_events_in_room( + latest = yield self.store.get_latest_event_ids_in_room( pdu.room_id ) # We add the prev events that we have seen to the latest # list to ensure the remote server doesn't give them to us - latest = set(e_id for e_id, _, _ in latest_tuples) + latest = set(latest) latest |= seen missing_events = yield self.get_missing_events( |