diff options
| author | Luke Barnard <luke@matrix.org> | 2018-04-05 16:31:57 +0100 |
|---|---|---|
| committer | Luke Barnard <luke@matrix.org> | 2018-04-06 15:43:27 +0100 |
| commit | ae85c7804e733aa1adaed06a9de51445a084858e (patch) | |
| tree | a052983e6773886fb454f57e29867cd4e022fa17 /synapse | |
| parent | Fix federation client `set_group_joinable` typo (diff) | |
| download | synapse-ae85c7804e733aa1adaed06a9de51445a084858e.tar.xz | |
is_joinable -> join_rule
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/groups/groups_server.py | 2 | ||||
| -rw-r--r-- | 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 2c02da4725..507ec232c5 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 5fbe0ada4e..d81609dd16 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): |