tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Don't return end from /messages if there are no more events (#12903)

Browse source 
Signed-off-by: Jacek Kusnierz <jacek.kusnierz@tum.de>
This commit is contained in:
Jacek Kuśnierz 2022-05-30 22:03:52 +02:00 committed by GitHub
parent cd9fc058de
commit c4f548e05d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/12903.bugfix Normal file
View file

@ -0,0 +1 @@
Fix a long-standing bug which caused the `/messages` endpoint to return an incorrect `end` attribute when there were no more events. Contributed by @Vetchu.

23
synapse/handlers/pagination.py
View file

@ -515,14 +515,25 @@ class PaginationHandler:
next_token = from_token.copy_and_replace(StreamKeyType.ROOM, next_key)
if events:
if event_filter:
events = await event_filter.filter(events)
# if no events are returned from pagination, that implies
# we have reached the end of the available events.
# In that case we do not return end, to tell the client
# there is no need for further queries.
if not events:
return {
"chunk": [],
"start": await from_token.to_string(self.store),
}
events = await filter_events_for_client(
self.storage, user_id, events, is_peeking=(member_event_id is None)
)
if event_filter:
events = await event_filter.filter(events)
events = await filter_events_for_client(
self.storage, user_id, events, is_peeking=(member_event_id is None)
)
# if after the filter applied there are no more events
# return immediately - but there might be more in next_token batch
if not events:
return {
"chunk": [],