summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-25 14:27:27 +0000
committerErik Johnston <erik@matrix.org>2017-01-25 14:27:27 +0000
commit2367c5568c01bc65aacc955b76ba707918b37f1e (patch)
tree0f07606420d5f64ba3e186ce69876fc6301082a3 /synapse/rest/client
parentMerge branch 'erikj/current_state_fix' into develop (diff)
downloadsynapse-2367c5568c01bc65aacc955b76ba707918b37f1e.tar.xz
Add basic implementation of local device list changes
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index 7199ec883a..b3d8001638 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -170,12 +170,16 @@ class SyncRestServlet(RestServlet):
         )
 
         archived = self.encode_archived(
-            sync_result.archived, time_now, requester.access_token_id, filter.event_fields
+            sync_result.archived, time_now, requester.access_token_id,
+            filter.event_fields,
         )
 
         response_content = {
             "account_data": {"events": sync_result.account_data},
             "to_device": {"events": sync_result.to_device},
+            "device_lists": {
+                "changed": list(sync_result.device_lists),
+            },
             "presence": self.encode_presence(
                 sync_result.presence, time_now
             ),