From ae85c7804e733aa1adaed06a9de51445a084858e Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 5 Apr 2018 16:31:57 +0100
Subject: [PATCH] is_joinable -> join_rule

---
 synapse/groups/groups_server.py | 2 +-
 synapse/storage/group_server.py | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index 2c02da472..507ec232c 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -746,7 +746,7 @@ class GroupsServerHandler(object):
         group_info = yield self.store.get_group(
             group_id,
         )
-        if not group_info['is_joinable']:
+        if group_info['join_policy'] != "open":
             raise SynapseError(403, "Group is not publicly joinable")
 
         local_attestation = yield self.add_user(group_id, requester_user_id, content)
diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py
index 5fbe0ada4..d81609dd1 100644
--- a/synapse/storage/group_server.py
+++ b/synapse/storage/group_server.py
@@ -57,15 +57,12 @@ class GroupServerStore(SQLBaseStore):
             },
             retcols=(
                 "name", "short_description", "long_description",
-                "avatar_url", "is_public", "is_joinable",
+                "avatar_url", "is_public", "join_rule",
             ),
             allow_none=True,
             desc="get_group",
         )
 
-        if ret and 'is_joinable' in ret:
-            ret['is_joinable'] = bool(ret['is_joinable'])
-
         defer.returnValue(ret)
 
     def get_users_in_group(self, group_id, include_private=False):