mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-13 01:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix timeline.limited detection

Browse source 
Signed-off-by: Thibaut CHARLES cromfr@gmail.com
This commit is contained in:
Crom (Thibaut CHARLES) 2018-01-10 15:34:28 +01:00
parent 2ec5a1cec9
commit 7b80e6d51b
No known key found for this signature in database
GPG key ID: 45A3D5F880B9E6D0
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go
View file

@ -246,7 +246,7 @@ func (s *outputRoomEventsStatements) selectRoomRecentEvents(
pq.StringArray(timelineFilter.NotSenders), pq.StringArray(timelineFilter.NotSenders),
pq.StringArray(timelineFilter.Types), pq.StringArray(timelineFilter.Types),
pq.StringArray(timelineFilter.NotTypes), pq.StringArray(timelineFilter.NotTypes),
timelineFilter.Limit, // TODO: limit abusive values? timelineFilter.Limit+1, // TODO: limit abusive values? This can also be done in gomatrix.Filter.Validate
) )
if err != nil { if err != nil {
return nil, false, err return nil, false, err
@ -257,7 +257,13 @@ func (s *outputRoomEventsStatements) selectRoomRecentEvents(
return nil, false, err return nil, false, err
} }
return events, len(events) == timelineFilter.Limit, nil // TODO: len(events) == timelineFilter.Limit not accurate limited := false
if len(events) > timelineFilter.Limit {
limited = true
events = events[:len(events)-1]
}
return events, limited, nil
} }
// Events returns the events for the given event IDs. Returns an error if any one of the event IDs given are missing // Events returns the events for the given event IDs. Returns an error if any one of the event IDs given are missing