diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-24 10:06:51 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-24 10:06:51 +0100 |
| commit | dddf20e8e146bb77be449e791a98ec24018c35d9 (patch) | |
| tree | 28fbc150a358f2543e5c78037bf683658ad39a04 /synapse/handlers | |
| parent | Merge pull request #5498 from matrix-org/rav/fix_clock_reversal (diff) | |
| download | synapse-dddf20e8e146bb77be449e791a98ec24018c35d9.tar.xz | |
Fix /messages on workers when no from param specified.
If no `from` param is specified we calculate and use the "current token" that inlcuded typing, presence, etc. These are unused during pagination and are not available on workers, so we simply don't calculate them.
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/pagination.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 062e026e5f..76ee97ddd3 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -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 |