summary refs log tree commit diff
path: root/synapse/storage/group_server.py
diff options
context:
space:
mode:
authorLuke Barnard <lukebarnard1@users.noreply.github.com>2017-10-27 11:41:13 +0100
committerGitHub <noreply@github.com>2017-10-27 11:41:13 +0100
commitd8c26162a109ba6c87adf2e8882be681632fde96 (patch)
tree7bb26e561ad21ece8278bb96c13a9a90fe51016e /synapse/storage/group_server.py
parentMerge pull request #2586 from matrix-org/rav/frontend_proxy_auth_header (diff)
parentRequest is_public from database (diff)
downloadsynapse-d8c26162a109ba6c87adf2e8882be681632fde96.tar.xz
Merge pull request #2582 from matrix-org/luke/group-is-public
Add is_public to groups table to allow for private groups
Diffstat (limited to 'synapse/storage/group_server.py')
-rw-r--r--synapse/storage/group_server.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py
index 9e63db5c6c..095a3dd382 100644
--- a/synapse/storage/group_server.py
+++ b/synapse/storage/group_server.py
@@ -35,7 +35,9 @@ class GroupServerStore(SQLBaseStore):
             keyvalues={
                 "group_id": group_id,
             },
-            retcols=("name", "short_description", "long_description", "avatar_url",),
+            retcols=(
+                "name", "short_description", "long_description", "avatar_url", "is_public"
+            ),
             allow_none=True,
             desc="is_user_in_group",
         )
@@ -1026,6 +1028,7 @@ class GroupServerStore(SQLBaseStore):
                 "avatar_url": avatar_url,
                 "short_description": short_description,
                 "long_description": long_description,
+                "is_public": True,
             },
             desc="create_group",
         )