Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-09-27 19:20:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Patrick Cloke 2020-07-02 10:55:41 -04:00
commit 4d978d7db4
15 changed files with 134 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/handlers/federation.py
View file

@ -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