diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 10:55:41 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 10:55:41 -0400 |
| commit | 4d978d7db4448e3cb526ee1087aeab578a31ac71 (patch) | |
| tree | 872c47b3fb4843e720b4c785cbcb9e87a95779ae /synapse/handlers/federation.py | |
| parent | Hack to add push priority to push notifications (#7765) (diff) | |
| parent | Merge tag 'v1.15.2' (diff) | |
| download | synapse-4d978d7db4448e3cb526ee1087aeab578a31ac71.tar.xz | |
Merge branch 'master' into develop
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 fa5854578d..b5aaa244dd 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -241,7 +241,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 @@ -281,7 +281,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( @@ -427,7 +427,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 |