mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 06:50:52 +00:00
Have an explicit API to update room config
This commit is contained in:
parent
94ff2cda73
commit
e8814410ef
6 changed files with 100 additions and 1 deletions
|
@ -545,6 +545,20 @@ class TransportLayerClient(object):
|
||||||
ignore_backoff=True,
|
ignore_backoff=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def update_room_in_group(self, destination, group_id, requester_user_id, room_id,
|
||||||
|
config_key, content):
|
||||||
|
"""Update room in group
|
||||||
|
"""
|
||||||
|
path = PREFIX + "/groups/%s/room/%s/config/%s" % (group_id, room_id, config_key,)
|
||||||
|
|
||||||
|
return self.client.post_json(
|
||||||
|
destination=destination,
|
||||||
|
path=path,
|
||||||
|
args={"requester_user_id": requester_user_id},
|
||||||
|
data=content,
|
||||||
|
ignore_backoff=True,
|
||||||
|
)
|
||||||
|
|
||||||
def remove_room_from_group(self, destination, group_id, requester_user_id, room_id):
|
def remove_room_from_group(self, destination, group_id, requester_user_id, room_id):
|
||||||
"""Remove a room from a group
|
"""Remove a room from a group
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -676,7 +676,7 @@ class FederationGroupsRoomsServlet(BaseFederationServlet):
|
||||||
class FederationGroupsAddRoomsServlet(BaseFederationServlet):
|
class FederationGroupsAddRoomsServlet(BaseFederationServlet):
|
||||||
"""Add/remove room from group
|
"""Add/remove room from group
|
||||||
"""
|
"""
|
||||||
PATH = "/groups/(?P<group_id>[^/]*)/room/(?<room_id>)$"
|
PATH = "/groups/(?P<group_id>[^/]*)/room/(?P<room_id>[^/]*)$"
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def on_POST(self, origin, content, query, group_id, room_id):
|
def on_POST(self, origin, content, query, group_id, room_id):
|
||||||
|
@ -703,6 +703,25 @@ class FederationGroupsAddRoomsServlet(BaseFederationServlet):
|
||||||
defer.returnValue((200, new_content))
|
defer.returnValue((200, new_content))
|
||||||
|
|
||||||
|
|
||||||
|
class FederationGroupsAddRoomsConfigServlet(BaseFederationServlet):
|
||||||
|
"""Update room config in group
|
||||||
|
"""
|
||||||
|
PATH = "/groups/(?P<group_id>[^/]*)/room/(?P<room_id>[^/]*)"
|
||||||
|
"/config/(?P<config_key>[^/]*)$"
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def on_POST(self, origin, content, query, group_id, room_id, config_key):
|
||||||
|
requester_user_id = parse_string_from_args(query, "requester_user_id")
|
||||||
|
if get_domain_from_id(requester_user_id) != origin:
|
||||||
|
raise SynapseError(403, "requester_user_id doesn't match origin")
|
||||||
|
|
||||||
|
result = yield self.groups_handler.update_room_in_group(
|
||||||
|
group_id, requester_user_id, room_id, config_key, content,
|
||||||
|
)
|
||||||
|
|
||||||
|
defer.returnValue((200, result))
|
||||||
|
|
||||||
|
|
||||||
class FederationGroupsUsersServlet(BaseFederationServlet):
|
class FederationGroupsUsersServlet(BaseFederationServlet):
|
||||||
"""Get the users in a group on behalf of a user
|
"""Get the users in a group on behalf of a user
|
||||||
"""
|
"""
|
||||||
|
@ -1142,6 +1161,8 @@ GROUP_SERVER_SERVLET_CLASSES = (
|
||||||
FederationGroupsRolesServlet,
|
FederationGroupsRolesServlet,
|
||||||
FederationGroupsRoleServlet,
|
FederationGroupsRoleServlet,
|
||||||
FederationGroupsSummaryUsersServlet,
|
FederationGroupsSummaryUsersServlet,
|
||||||
|
FederationGroupsAddRoomsServlet,
|
||||||
|
FederationGroupsAddRoomsConfigServlet,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -545,6 +545,29 @@ class GroupsServerHandler(object):
|
||||||
|
|
||||||
defer.returnValue({})
|
defer.returnValue({})
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def update_room_in_group(self, group_id, requester_user_id, room_id, config_key,
|
||||||
|
content):
|
||||||
|
"""Update room in group
|
||||||
|
"""
|
||||||
|
RoomID.from_string(room_id) # Ensure valid room id
|
||||||
|
|
||||||
|
yield self.check_group_is_ours(
|
||||||
|
group_id, requester_user_id, and_exists=True, and_is_admin=requester_user_id
|
||||||
|
)
|
||||||
|
|
||||||
|
if config_key == "visibility":
|
||||||
|
is_public = _parse_visibility_from_contents(content)
|
||||||
|
|
||||||
|
yield self.store.update_room_in_group_visibility(
|
||||||
|
group_id, room_id,
|
||||||
|
is_public=is_public,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
raise SynapseError(400, "Uknown config option")
|
||||||
|
|
||||||
|
defer.returnValue({})
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def remove_room_from_group(self, group_id, requester_user_id, room_id):
|
def remove_room_from_group(self, group_id, requester_user_id, room_id):
|
||||||
"""Remove room from group
|
"""Remove room from group
|
||||||
|
|
|
@ -71,6 +71,7 @@ class GroupsLocalHandler(object):
|
||||||
get_invited_users_in_group = _create_rerouter("get_invited_users_in_group")
|
get_invited_users_in_group = _create_rerouter("get_invited_users_in_group")
|
||||||
|
|
||||||
add_room_to_group = _create_rerouter("add_room_to_group")
|
add_room_to_group = _create_rerouter("add_room_to_group")
|
||||||
|
update_room_in_group = _create_rerouter("update_room_in_group")
|
||||||
remove_room_from_group = _create_rerouter("remove_room_from_group")
|
remove_room_from_group = _create_rerouter("remove_room_from_group")
|
||||||
|
|
||||||
update_group_summary_room = _create_rerouter("update_group_summary_room")
|
update_group_summary_room = _create_rerouter("update_group_summary_room")
|
||||||
|
|
|
@ -469,6 +469,33 @@ class GroupAdminRoomsServlet(RestServlet):
|
||||||
defer.returnValue((200, result))
|
defer.returnValue((200, result))
|
||||||
|
|
||||||
|
|
||||||
|
class GroupAdminRoomsConfigServlet(RestServlet):
|
||||||
|
"""Update the config of a room in a group
|
||||||
|
"""
|
||||||
|
PATTERNS = client_v2_patterns(
|
||||||
|
"/groups/(?P<group_id>[^/]*)/admin/rooms/(?P<room_id>[^/]*)"
|
||||||
|
"/config/(?P<config_key>[^/]*)$"
|
||||||
|
)
|
||||||
|
|
||||||
|
def __init__(self, hs):
|
||||||
|
super(GroupAdminRoomsConfigServlet, self).__init__()
|
||||||
|
self.auth = hs.get_auth()
|
||||||
|
self.clock = hs.get_clock()
|
||||||
|
self.groups_handler = hs.get_groups_local_handler()
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def on_PUT(self, request, group_id, room_id, config_key):
|
||||||
|
requester = yield self.auth.get_user_by_req(request)
|
||||||
|
requester_user_id = requester.user.to_string()
|
||||||
|
|
||||||
|
content = parse_json_object_from_request(request)
|
||||||
|
result = yield self.groups_handler.update_room_in_group(
|
||||||
|
group_id, requester_user_id, room_id, config_key, content,
|
||||||
|
)
|
||||||
|
|
||||||
|
defer.returnValue((200, result))
|
||||||
|
|
||||||
|
|
||||||
class GroupAdminUsersInviteServlet(RestServlet):
|
class GroupAdminUsersInviteServlet(RestServlet):
|
||||||
"""Invite a user to the group
|
"""Invite a user to the group
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -857,6 +857,19 @@ class GroupServerStore(SQLBaseStore):
|
||||||
desc="add_room_to_group",
|
desc="add_room_to_group",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def update_room_in_group_visibility(self, group_id, room_id, is_public):
|
||||||
|
return self._simple_update(
|
||||||
|
table="group_rooms",
|
||||||
|
keyvalues={
|
||||||
|
"group_id": group_id,
|
||||||
|
"room_id": room_id,
|
||||||
|
},
|
||||||
|
values={
|
||||||
|
"is_public": is_public,
|
||||||
|
},
|
||||||
|
desc="update_room_in_group_visibility",
|
||||||
|
)
|
||||||
|
|
||||||
def remove_room_from_group(self, group_id, room_id):
|
def remove_room_from_group(self, group_id, room_id):
|
||||||
def _remove_room_from_group_txn(txn):
|
def _remove_room_from_group_txn(txn):
|
||||||
self._simple_delete_txn(
|
self._simple_delete_txn(
|
||||||
|
|
Loading…
Reference in a new issue