From 5df18afff6683c3c7403bcff4690dc0b68aaf3a2 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Wed, 12 Jul 2023 19:03:38 +0200
Subject: [PATCH] Make Element Android happy again

---
 syncapi/routing/messages.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/syncapi/routing/messages.go b/syncapi/routing/messages.go
index 674f5105e..23a095449 100644
--- a/syncapi/routing/messages.go
+++ b/syncapi/routing/messages.go
@@ -325,7 +325,7 @@ func (r *messagesReq) retrieveEvents(ctx context.Context, rsAPI api.SyncRoomserv
 ) {
 	emptyToken := types.TopologyToken{}
 	// Retrieve the events from the local database.
-	streamEvents, start, end, err := r.snapshot.GetEventsInTopologicalRange(r.ctx, r.from, r.to, r.roomID, r.filter, r.backwardOrdering)
+	streamEvents, _, end, err := r.snapshot.GetEventsInTopologicalRange(r.ctx, r.from, r.to, r.roomID, r.filter, r.backwardOrdering)
 	if err != nil {
 		err = fmt.Errorf("GetEventsInRange: %w", err)
 		return []synctypes.ClientEvent{}, *r.from, emptyToken, err
@@ -378,7 +378,7 @@ func (r *messagesReq) retrieveEvents(ctx context.Context, rsAPI api.SyncRoomserv
 	// If we backfilled in the process of getting events, we need
 	// to re-fetch the start/end positions
 	if r.didBackfill {
-		start, end, err = r.getStartEnd(filteredEvents)
+		_, end, err = r.getStartEnd(filteredEvents)
 		if err != nil {
 			return []synctypes.ClientEvent{}, *r.from, *r.to, err
 		}
@@ -403,6 +403,8 @@ func (r *messagesReq) retrieveEvents(ctx context.Context, rsAPI api.SyncRoomserv
 		filteredEvents = reversed(filteredEvents)
 	}
 
+	start = *r.from
+
 	return synctypes.ToClientEvents(gomatrixserverlib.ToPDUs(filteredEvents), synctypes.FormatAll, func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) {
 		return rsAPI.QueryUserIDForSender(ctx, roomID, senderID)
 	}), start, end, nil