diff options
| author | Erik Johnston <erikj@jki.re> | 2017-10-11 13:20:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-11 13:20:07 +0100 |
| commit | 535cc49f27e28dd1148c6b92b6d1584cf3093e5c (patch) | |
| tree | f1714e604abf696ca1adec12fe7653dad8a3ef61 /synapse/rest/client/v2_alpha/sync.py | |
| parent | Merge pull request #2501 from matrix-org/dbkr/channel_notifications (diff) | |
| parent | Validate room ids (diff) | |
| download | synapse-535cc49f27e28dd1148c6b92b6d1584cf3093e5c.tar.xz | |
Merge pull request #2466 from matrix-org/erikj/groups_merged
Initial Group Implementation
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
| -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 978af9c280..a1e0e53b33 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -200,6 +200,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(), } |