diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-11-02 10:57:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-11-02 10:57:00 +0000 |
| commit | 0e367563838de76972bac1fd7bc3ab3943b9a57e (patch) | |
| tree | f3de1ae204fa232033d8951c31a45a71a797d94c /synapse/rest/client/v2_alpha | |
| parent | Support clients supplying older tokens, fix short poll test (diff) | |
| parent | Merge pull request #337 from matrix-org/markjh/v2_sync_joining (diff) | |
| download | synapse-0e367563838de76972bac1fd7bc3ab3943b9a57e.tar.xz | |
Merge branch 'develop' into markjh/room_tags
Diffstat (limited to 'synapse/rest/client/v2_alpha')
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 6c4f2b7cd4..1840eef775 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -16,7 +16,7 @@ from twisted.internet import defer from synapse.http.servlet import ( - RestServlet, parse_string, parse_integer + RestServlet, parse_string, parse_integer, parse_boolean ) from synapse.handlers.sync import SyncConfig from synapse.types import StreamToken @@ -90,6 +90,7 @@ class SyncRestServlet(RestServlet): allowed_values=self.ALLOWED_PRESENCE ) filter_id = parse_string(request, "filter", default=None) + full_state = parse_boolean(request, "full_state", default=False) logger.info( "/sync: user=%r, timeout=%r, since=%r," @@ -120,7 +121,8 @@ class SyncRestServlet(RestServlet): try: sync_result = yield self.sync_handler.wait_for_sync_for_user( - sync_config, since_token=since_token, timeout=timeout + sync_config, since_token=since_token, timeout=timeout, + full_state=full_state ) finally: if set_presence == "online": |