From 3d8275d27b1243d9b6227600c52fb6dcb950fc02 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Fri, 19 Aug 2022 14:58:25 +0200
Subject: [PATCH] Reverse ordering; make /upgrade tests happy again

---
 syncapi/streams/stream_pdu.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/syncapi/streams/stream_pdu.go b/syncapi/streams/stream_pdu.go
index d4d398f37..b807b84b0 100644
--- a/syncapi/streams/stream_pdu.go
+++ b/syncapi/streams/stream_pdu.go
@@ -231,8 +231,9 @@ func (p *PDUStreamProvider) IncrementalSync(
 			delete(req.Response.Rooms.Join, x)
 		}
 		r = types.Range{
-			From: 0,
-			To:   p.latest,
+			From:      p.latest,
+			To:        0,
+			Backwards: true,
 		}
 		// We only care about the newly joined rooms, so update the stateFilter to reflect that
 		stateFilter.Rooms = &newlyJoinedRooms
@@ -241,6 +242,10 @@ func (p *PDUStreamProvider) IncrementalSync(
 			return newPos
 		}
 		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 {
 				req.Log.WithError(err).Error("d.addRoomDeltaToResponse failed")
 				return newPos