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

Make Element Android happy again

Browse source
This commit is contained in:
Till Faelligen 2023-07-12 19:03:38 +02:00
parent a378a3a78d
commit 5df18afff6
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
syncapi/routing/messages.go
View file

@ -325,7 +325,7 @@ func (r *messagesReq) retrieveEvents(ctx context.Context, rsAPI api.SyncRoomserv
) { ) {
emptyToken := types.TopologyToken{} emptyToken := types.TopologyToken{}
// Retrieve the events from the local database. // 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 { if err != nil {
err = fmt.Errorf("GetEventsInRange: %w", err) err = fmt.Errorf("GetEventsInRange: %w", err)
return []synctypes.ClientEvent{}, *r.from, emptyToken, 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 // If we backfilled in the process of getting events, we need
// to re-fetch the start/end positions // to re-fetch the start/end positions
if r.didBackfill { if r.didBackfill {
start, end, err = r.getStartEnd(filteredEvents) _, end, err = r.getStartEnd(filteredEvents)
if err != nil { if err != nil {
return []synctypes.ClientEvent{}, *r.from, *r.to, err 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) 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 synctypes.ToClientEvents(gomatrixserverlib.ToPDUs(filteredEvents), synctypes.FormatAll, func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) {
return rsAPI.QueryUserIDForSender(ctx, roomID, senderID) return rsAPI.QueryUserIDForSender(ctx, roomID, senderID)
}), start, end, nil }), start, end, nil