diff options
author | Erik Johnston <erikj@jki.re> | 2017-07-21 11:05:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-21 11:05:39 +0100 |
commit | 96917d555240f52c98d698f95e2ff1e65c8b0b5d (patch) | |
tree | df70bdc99fc2db0a229a42a55b1de2efda99e883 /synapse/rest/client | |
parent | Merge pull request #2377 from matrix-org/erikj/group_profile_update (diff) | |
parent | Add notifier (diff) | |
download | synapse-96917d555240f52c98d698f95e2ff1e65c8b0b5d.tar.xz |
Merge pull request #2378 from matrix-org/erikj/group_sync_support
Add groups to sync stream
Diffstat (limited to 'synapse/rest/client')
-rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 6dcc407451..5f208a4c1c 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -199,6 +199,11 @@ class SyncRestServlet(RestServlet): "invite": invited, "leave": archived, }, + "groups": { + "join": sync_result.groups.join, + "invite": sync_result.groups.invite, + "leave": sync_result.groups.leave, + }, "device_one_time_keys_count": sync_result.device_one_time_keys_count, "next_batch": sync_result.next_batch.to_string(), } |