hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-02-28 13:53:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly cut out join and leave events

Browse source
This commit is contained in:
Eric Eastwood 2020-12-31 17:02:21 -06:00
parent 810dd7842c
commit 9e4fd0157f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
syncapi/storage/shared/syncserver.go
View file

@ -991,7 +991,7 @@ func (d *Database) getLeaveResponseForCompleteSync(
} }
break break
} else if membership == gomatrixserverlib.Leave { } else if membership == gomatrixserverlib.Leave {
leaveEventIndex = i - 1 leaveEventIndex = i
} }
if joinEventIndex != -1 && leaveEventIndex != -1 { if joinEventIndex != -1 && leaveEventIndex != -1 {
@ -999,11 +999,12 @@ func (d *Database) getLeaveResponseForCompleteSync(
} }
} }
} }
// We can assume that if the person joined, they also left and will only show the events between (inclusive) // We can assume that if the person joined, they also left and will only show the events between (inclusive)
if joinEventIndex != -1 && leaveEventIndex != -1 { if joinEventIndex != -1 && leaveEventIndex != -1 {
// cut all events earlier than the join (but not the join itself) // cut all events earlier the join (exclude the join itself too)
// and cut all events after the person left // and cut all events after the person left (exclude the leave itself too)
recentStreamEvents = recentStreamEvents[joinEventIndex:leaveEventIndex] recentStreamEvents = recentStreamEvents[joinEventIndex+1 : leaveEventIndex]
limited = false // so clients know not to try to backpaginate limited = false // so clients know not to try to backpaginate
} }