diff options
| author | Erik Johnston <erikj@jki.re> | 2017-01-30 14:35:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-30 14:35:21 +0000 |
| commit | 9636b2407d60ab544d8ea713800132e203967a11 (patch) | |
| tree | cca8f817c4aeee8b26f7840e877a66a7a6313384 /synapse/rest | |
| parent | Merge pull request #1852 from matrix-org/paul/issue-1382 (diff) | |
| parent | Rename func (diff) | |
| download | synapse-9636b2407d60ab544d8ea713800132e203967a11.tar.xz | |
Merge pull request #1857 from matrix-org/erikj/device_list_stream
Implement device lists updates over federation
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 6 |
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 ), |