diff options
author | Erik Johnston <erik@matrix.org> | 2016-05-16 16:59:18 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-05-16 16:59:18 +0100 |
commit | 32d476d4f1fd2a99c8ccbffe687293a26d5519d3 (patch) | |
tree | e201c627640691e657f4412f74e3513d047687e1 /synapse/rest | |
parent | Only load the last N joined room (diff) | |
download | synapse-32d476d4f1fd2a99c8ccbffe687293a26d5519d3.tar.xz |
Change token format
Diffstat (limited to 'synapse/rest')
-rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 60d3dc4030..37fd1539f6 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -19,7 +19,7 @@ from synapse.http.servlet import ( RestServlet, parse_string, parse_integer, parse_boolean ) from synapse.handlers.sync import SyncConfig -from synapse.types import StreamToken +from synapse.types import SyncNextBatchToken from synapse.events.utils import ( serialize_event, format_event_for_client_v2_without_room_id, ) @@ -140,9 +140,9 @@ class SyncRestServlet(RestServlet): ) if since is not None: - since_token = StreamToken.from_string(since) + batch_token = SyncNextBatchToken.from_string(since) else: - since_token = None + batch_token = None affect_presence = set_presence != PresenceState.OFFLINE @@ -154,7 +154,7 @@ class SyncRestServlet(RestServlet): ) with context: sync_result = yield self.sync_handler.wait_for_sync_for_user( - sync_config, since_token=since_token, timeout=timeout, + sync_config, batch_token=batch_token, timeout=timeout, full_state=full_state ) |