mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-12-11 14:54:19 -05:00
Merge pull request #2657 from matrix-org/erikj/group_visibility_namespace
Namespace visibility options for groups
This commit is contained in:
commit
0ea5310290
@ -556,8 +556,8 @@ class GroupsServerHandler(object):
|
|||||||
group_id, requester_user_id, and_exists=True, and_is_admin=requester_user_id
|
group_id, requester_user_id, and_exists=True, and_is_admin=requester_user_id
|
||||||
)
|
)
|
||||||
|
|
||||||
if config_key == "visibility":
|
if config_key == "m.visibility":
|
||||||
is_public = _parse_visibility_from_contents(content)
|
is_public = _parse_visibility_dict(content)
|
||||||
|
|
||||||
yield self.store.update_room_in_group_visibility(
|
yield self.store.update_room_in_group_visibility(
|
||||||
group_id, room_id,
|
group_id, room_id,
|
||||||
@ -840,15 +840,25 @@ def _parse_visibility_from_contents(content):
|
|||||||
public or not
|
public or not
|
||||||
"""
|
"""
|
||||||
|
|
||||||
visibility = content.get("visibility")
|
visibility = content.get("m.visibility")
|
||||||
if visibility:
|
if visibility:
|
||||||
vis_type = visibility["type"]
|
return _parse_visibility_dict(visibility)
|
||||||
if vis_type not in ("public", "private"):
|
|
||||||
raise SynapseError(
|
|
||||||
400, "Synapse only supports 'public'/'private' visibility"
|
|
||||||
)
|
|
||||||
is_public = vis_type == "public"
|
|
||||||
else:
|
else:
|
||||||
is_public = True
|
is_public = True
|
||||||
|
|
||||||
return is_public
|
return is_public
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_visibility_dict(visibility):
|
||||||
|
"""Given a dict for the "m.visibility" config return if the entity should
|
||||||
|
be public or not
|
||||||
|
"""
|
||||||
|
vis_type = visibility.get("type")
|
||||||
|
if not vis_type:
|
||||||
|
return True
|
||||||
|
|
||||||
|
if vis_type not in ("public", "private"):
|
||||||
|
raise SynapseError(
|
||||||
|
400, "Synapse only supports 'public'/'private' visibility"
|
||||||
|
)
|
||||||
|
return vis_type == "public"
|
||||||
|
Loading…
Reference in New Issue
Block a user