diff options
| author | Erik Johnston <erik@matrix.org> | 2020-07-01 16:59:31 +0100 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 10:00:33 -0400 |
| commit | 96e9afe62500310977dc3cbc99a8d16d3d2fa15c (patch) | |
| tree | c4288edea9a08b6b480d6342553724ece08c8c00 /synapse | |
| parent | Ensure that HTML pages served from Synapse include headers to avoid embedding. (diff) | |
| download | synapse-96e9afe62500310977dc3cbc99a8d16d3d2fa15c.tar.xz | |
Correctly handle outliers as prev events over federation
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/federation.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 3e60774b33..d0b62f4cf2 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -238,7 +238,7 @@ class FederationHandler(BaseHandler): logger.debug("[%s %s] min_depth: %d", room_id, event_id, min_depth) prevs = set(pdu.prev_event_ids()) - seen = await self.store.have_seen_events(prevs) + seen = await self.store.have_events_in_timeline(prevs) if min_depth is not None and pdu.depth < min_depth: # This is so that we don't notify the user about this @@ -278,7 +278,7 @@ class FederationHandler(BaseHandler): # Update the set of things we've seen after trying to # fetch the missing stuff - seen = await self.store.have_seen_events(prevs) + seen = await self.store.have_events_in_timeline(prevs) if not prevs - seen: logger.info( @@ -423,7 +423,7 @@ class FederationHandler(BaseHandler): room_id = pdu.room_id event_id = pdu.event_id - seen = await self.store.have_seen_events(prevs) + seen = await self.store.have_events_in_timeline(prevs) if not prevs - seen: return |