mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 10:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reverse ordering; make /upgrade tests happy again

Browse source
This commit is contained in:
Till Faelligen 2022-08-19 14:58:25 +02:00
parent 2cfba34478
commit 3d8275d27b
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
syncapi/streams/stream_pdu.go
View file

@ -231,8 +231,9 @@ func (p *PDUStreamProvider) IncrementalSync(
delete(req.Response.Rooms.Join, x) delete(req.Response.Rooms.Join, x)
} }
r = types.Range{ r = types.Range{
From: 0, From: p.latest,
To: p.latest, To: 0,
Backwards: true,
} }
// We only care about the newly joined rooms, so update the stateFilter to reflect that // We only care about the newly joined rooms, so update the stateFilter to reflect that
stateFilter.Rooms = &newlyJoinedRooms stateFilter.Rooms = &newlyJoinedRooms
@ -241,6 +242,10 @@ func (p *PDUStreamProvider) IncrementalSync(
return newPos return newPos
} }
for _, delta := range stateDeltas { for _, delta := range stateDeltas {
// Ignore deltas for rooms we didn't newly join
if _, ok := req.Response.Rooms.Join[delta.RoomID]; ok {
continue
}
if _, err = p.addRoomDeltaToResponse(ctx, req.Device, r, delta, &eventFilter, &stateFilter, req.Response); err != nil { if _, err = p.addRoomDeltaToResponse(ctx, req.Device, r, delta, &eventFilter, &stateFilter, req.Response); err != nil {
req.Log.WithError(err).Error("d.addRoomDeltaToResponse failed") req.Log.WithError(err).Error("d.addRoomDeltaToResponse failed")
return newPos return newPos