diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-25 16:37:59 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-25 16:37:59 +0100 |
| commit | 460cad7c11f8d2595afba1116c4a32bb3d73f557 (patch) | |
| tree | 2f7c88a4e65be53624484622b32751b513db711d /synapse | |
| parent | Stop looking up "admin", which we never read (diff) | |
| parent | Fix up one more reference (diff) | |
| download | synapse-460cad7c11f8d2595afba1116c4a32bb3d73f557.tar.xz | |
Merge branch 'deviceid' into removeadmin
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/sync.py | 1 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 353a416054..9914ff6f9c 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -28,7 +28,6 @@ logger = logging.getLogger(__name__) SyncConfig = collections.namedtuple("SyncConfig", [ "user", - "client_info", "limit", "gap", "sort", diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 83a257b969..cac28b47b6 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -87,7 +87,7 @@ class SyncRestServlet(RestServlet): @defer.inlineCallbacks def on_GET(self, request): - user, _ = yield self.auth.get_user_by_req(request) + user, token_id = yield self.auth.get_user_by_req(request) timeout = parse_integer(request, "timeout", default=0) limit = parse_integer(request, "limit", required=True) @@ -125,7 +125,6 @@ class SyncRestServlet(RestServlet): sync_config = SyncConfig( user=user, - client_info=client, gap=gap, limit=limit, sort=sort, @@ -152,7 +151,7 @@ class SyncRestServlet(RestServlet): sync_result.private_user_data, filter, time_now ), "rooms": self.encode_rooms( - sync_result.rooms, filter, time_now, client.token_id + sync_result.rooms, filter, time_now, token_id ), "next_batch": sync_result.next_batch.to_string(), } |