tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

is_joinable -> join_rule

Browse source
This commit is contained in:
Luke Barnard 2018-04-05 16:31:57 +01:00
parent f8d1917fce
commit ae85c7804e
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/groups/groups_server.py
View file

@ -746,7 +746,7 @@ class GroupsServerHandler(object):
group_info = yield self.store.get_group( group_info = yield self.store.get_group(
group_id, group_id,
) )
if not group_info['is_joinable']: if group_info['join_policy'] != "open":
raise SynapseError(403, "Group is not publicly joinable") raise SynapseError(403, "Group is not publicly joinable")
local_attestation = yield self.add_user(group_id, requester_user_id, content) local_attestation = yield self.add_user(group_id, requester_user_id, content)

5
synapse/storage/group_server.py
View file

@ -57,15 +57,12 @@ class GroupServerStore(SQLBaseStore):
}, },
retcols=( retcols=(
"name", "short_description", "long_description", "name", "short_description", "long_description",
"avatar_url", "is_public", "is_joinable", "avatar_url", "is_public", "join_rule",
), ),
allow_none=True, allow_none=True,
desc="get_group", desc="get_group",
) )
if ret and 'is_joinable' in ret:
ret['is_joinable'] = bool(ret['is_joinable'])
defer.returnValue(ret) defer.returnValue(ret)
def get_users_in_group(self, group_id, include_private=False): def get_users_in_group(self, group_id, include_private=False):