diff options
| author | David Baker <dave@matrix.org> | 2018-10-09 10:05:02 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-10-09 10:05:02 +0100 |
| commit | dc045ef20222bfbe8dcb5dae297e741509cce8d1 (patch) | |
| tree | ee03ab45ce9791a06c12d15c01d3412cd101330a /synapse/handlers/search.py | |
| parent | Apparently this blank line is Very Important (diff) | |
| parent | Merge pull request #4017 from matrix-org/rav/optimise_filter_events_for_server (diff) | |
| download | synapse-dc045ef20222bfbe8dcb5dae297e741509cce8d1.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
Diffstat (limited to 'synapse/handlers/search.py')
| -rw-r--r-- | synapse/handlers/search.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py index c464adbd0b..0c1d52fd11 100644 --- a/synapse/handlers/search.py +++ b/synapse/handlers/search.py @@ -54,7 +54,7 @@ class SearchHandler(BaseHandler): batch_token = None if batch: try: - b = decode_base64(batch) + b = decode_base64(batch).decode('ascii') batch_group, batch_group_key, batch_token = b.split("\n") assert batch_group is not None @@ -258,18 +258,18 @@ class SearchHandler(BaseHandler): # 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" % ( + global_next_batch = encode_base64(("%s\n%s\n%s" % ( batch_group, batch_group_key, pagination_token - )) + )).encode('ascii')) else: - global_next_batch = encode_base64("%s\n%s\n%s" % ( + global_next_batch = encode_base64(("%s\n%s\n%s" % ( "all", "", pagination_token - )) + )).encode('ascii')) for room_id, group in room_groups.items(): - group["next_batch"] = encode_base64("%s\n%s\n%s" % ( + group["next_batch"] = encode_base64(("%s\n%s\n%s" % ( "room_id", room_id, pagination_token - )) + )).encode('ascii')) allowed_events.extend(room_events) |