mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-28 07:00:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'deviceid' into removeadmin

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-08-25 16:37:59 +01:00
commit 460cad7c11
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
synapse/handlers/sync.py
View file

@ -28,7 +28,6 @@ logger = logging.getLogger(__name__)
SyncConfig = collections.namedtuple("SyncConfig", [ SyncConfig = collections.namedtuple("SyncConfig", [
"user", "user",
"client_info",
"limit", "limit",
"gap", "gap",
"sort", "sort",

5
synapse/rest/client/v2_alpha/sync.py
View file

@ -87,7 +87,7 @@ class SyncRestServlet(RestServlet):
@defer.inlineCallbacks @defer.inlineCallbacks
def on_GET(self, request): 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) timeout = parse_integer(request, "timeout", default=0)
limit = parse_integer(request, "limit", required=True) limit = parse_integer(request, "limit", required=True)
@ -125,7 +125,6 @@ class SyncRestServlet(RestServlet):
sync_config = SyncConfig( sync_config = SyncConfig(
user=user, user=user,
client_info=client,
gap=gap, gap=gap,
limit=limit, limit=limit,
sort=sort, sort=sort,
@ -152,7 +151,7 @@ class SyncRestServlet(RestServlet):
sync_result.private_user_data, filter, time_now sync_result.private_user_data, filter, time_now
), ),
"rooms": self.encode_rooms( "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(), "next_batch": sync_result.next_batch.to_string(),
} }