diff options
| author | Luke Barnard <lukebarnard1@users.noreply.github.com> | 2018-04-06 16:24:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 16:24:32 +0100 |
| commit | 135fc5b9cdbae9544f9ae9612fcbde989e26eb55 (patch) | |
| tree | 20240b323f30e1f2dca14629b6ec9753cdc9017f /synapse/storage | |
| parent | Merge pull request #3071 from matrix-org/erikj/resp_size_metrics (diff) | |
| parent | de-lint, quote consistency (diff) | |
| download | synapse-135fc5b9cdbae9544f9ae9612fcbde989e26eb55.tar.xz | |
Merge pull request #3046 from matrix-org/dbkr/join_group
Implement group join API
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/group_server.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py index db316a27ec..da05ccb027 100644 --- a/synapse/storage/group_server.py +++ b/synapse/storage/group_server.py @@ -55,10 +55,11 @@ class GroupServerStore(SQLBaseStore): "group_id": group_id, }, retcols=( - "name", "short_description", "long_description", "avatar_url", "is_public" + "name", "short_description", "long_description", + "avatar_url", "is_public", "join_policy", ), allow_none=True, - desc="is_user_in_group", + desc="get_group", ) def get_users_in_group(self, group_id, include_private=False): |