summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-10-09 10:32:27 +0100
committerMark Haines <mjark@negativecurvature.net>2015-10-09 10:32:27 +0100
commitce19fc0f11121a97ae55f33d2857b3e65a024064 (patch)
tree9cb0621a3c806cb859c31546dfe6957bd01c6105 /synapse/rest
parentUse raw string for regex here, otherwise \b is the backspace character. Fixes... (diff)
parentUse 'true' rather than '1' for archived flag (diff)
downloadsynapse-ce19fc0f11121a97ae55f33d2857b3e65a024064.tar.xz
Merge pull request #294 from matrix-org/markjh/initial_sync_archived_flag
Add a flag to initial sync to include we want rooms that the user has left
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/initial_sync.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/initial_sync.py b/synapse/rest/client/v1/initial_sync.py
index bac68cc29f..52c7943400 100644
--- a/synapse/rest/client/v1/initial_sync.py
+++ b/synapse/rest/client/v1/initial_sync.py
@@ -29,10 +29,12 @@ class InitialSyncRestServlet(ClientV1RestServlet):
         as_client_event = "raw" not in request.args
         pagination_config = PaginationConfig.from_request(request)
         handler = self.handlers.message_handler
+        include_archived = request.args.get("archived", None) == ["true"]
         content = yield handler.snapshot_all_rooms(
             user_id=user.to_string(),
             pagin_config=pagination_config,
-            as_client_event=as_client_event
+            as_client_event=as_client_event,
+            include_archived=include_archived,
         )
 
         defer.returnValue((200, content))