summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-25 15:54:32 +0100
committerErik Johnston <erik@matrix.org>2016-05-25 15:54:32 +0100
commit43cbde4653ee988fc0b68c9a54a864a54f07d8e3 (patch)
tree37a123f45641742f7a7393d4230ab33a8197cb89 /synapse/rest
parentImplement basic pagination (diff)
downloadsynapse-43cbde4653ee988fc0b68c9a54a864a54f07d8e3.tar.xz
Basic extra include pagination impl
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index 3df9743132..da94220f1e 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -98,6 +98,8 @@ class SyncRestServlet(RestServlet):
 
         since = body.get("since", None)
 
+        extras = body.get("extras", None)
+
         if "from" in body:
             # /events used to use 'from', but /sync uses 'since'.
             # Lets be helpful and whine if we see a 'from'.
@@ -162,6 +164,7 @@ class SyncRestServlet(RestServlet):
             set_presence=set_presence,
             full_state=full_state,
             timeout=timeout,
+            extras=extras,
         )
 
         defer.returnValue(sync_result)
@@ -239,7 +242,7 @@ class SyncRestServlet(RestServlet):
 
     @defer.inlineCallbacks
     def _handle_sync(self, requester, sync_config, batch_token, set_presence,
-                     full_state, timeout):
+                     full_state, timeout, extras=None):
         affect_presence = set_presence != PresenceState.OFFLINE
 
         user = sync_config.user
@@ -253,7 +256,7 @@ class SyncRestServlet(RestServlet):
         with context:
             sync_result = yield self.sync_handler.wait_for_sync_for_user(
                 sync_config, batch_token=batch_token, timeout=timeout,
-                full_state=full_state
+                full_state=full_state, extras=extras,
             )
 
         time_now = self.clock.time_msec()