diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 11:01:47 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 11:02:42 -0400 |
| commit | f2bcc6ecbfcb5e9486e3ab53dd41fd458d61587f (patch) | |
| tree | d9f3c46ff7f20b373ee6b74562a8657718eea9ae /synapse/handlers/federation.py | |
| parent | Fix new metric where we used ms instead of seconds (#7771) (diff) | |
| parent | Merge tag 'v1.15.2' (diff) | |
| download | synapse-f2bcc6ecbfcb5e9486e3ab53dd41fd458d61587f.tar.xz | |
Merge branch 'master' into release-v1.16.0
Diffstat (limited to 'synapse/handlers/federation.py')
| -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 3828ff0ef0..4dbd8e1d98 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -240,7 +240,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 @@ -280,7 +280,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( @@ -426,7 +426,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 |