Merge pull request #5531 from matrix-org/erikj/workers_pagination_token

Fix /messages on workers when no from param specified.
This commit is contained in:
Erik Johnston 2019-06-24 15:30:10 +01:00 committed by GitHub
commit 25433f212d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 17 deletions

View file

@ -180,9 +180,7 @@ class PaginationHandler(object):
room_token = pagin_config.from_token.room_key
else:
pagin_config.from_token = (
yield self.hs.get_event_sources().get_current_token_for_room(
room_id=room_id
)
yield self.hs.get_event_sources().get_current_token_for_pagination()
)
room_token = pagin_config.from_token.room_key