diff options
| author | Erik Johnston <erik@matrix.org> | 2015-12-02 09:13:20 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-12-02 09:13:20 +0000 |
| commit | 9670f226e313e1d475047b246a5b2cbe121c451d (patch) | |
| tree | eb39444e81fccdd5d5eed38e5a84a032e9e7951c /synapse/handlers/search.py | |
| parent | various fixes - thanks to Mark White for pointing out you need to run synapse... (diff) | |
| parent | Search: Don't disregard grouping info in pagination tokens (diff) | |
| download | synapse-9670f226e313e1d475047b246a5b2cbe121c451d.tar.xz | |
Merge pull request #406 from matrix-org/erikj/search
Search: Don't disregard grouping info in pagination tokens
Diffstat (limited to 'synapse/handlers/search.py')
| -rw-r--r-- | synapse/handlers/search.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py index df6390cf05..65ef2f85bf 100644 --- a/synapse/handlers/search.py +++ b/synapse/handlers/search.py @@ -240,9 +240,18 @@ class SearchHandler(BaseHandler): last_event_id = room_events[-1].event_id pagination_token = results_map[last_event_id]["pagination_token"] - global_next_batch = encode_base64("%s\n%s\n%s" % ( - "all", "", pagination_token - )) + # We want to respect the given batch group and group keys so + # that if people blindly use the top level `next_batch` token + # it returns more from the same group (if applicable) rather + # than reverting to searching all results again. + if batch_group and batch_group_key: + global_next_batch = encode_base64("%s\n%s\n%s" % ( + batch_group, batch_group_key, pagination_token + )) + else: + global_next_batch = encode_base64("%s\n%s\n%s" % ( + "all", "", pagination_token + )) for room_id, group in room_groups.items(): group["next_batch"] = encode_base64("%s\n%s\n%s" % ( |