mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 05:40:58 +00:00
Revert "Modify group room association API to allow modification of is_public"
This commit is contained in:
parent
d305987b40
commit
94ff2cda73
6 changed files with 22 additions and 32 deletions
|
@ -531,9 +531,9 @@ class TransportLayerClient(object):
|
||||||
ignore_backoff=True,
|
ignore_backoff=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
def update_room_group_association(self, destination, group_id, requester_user_id,
|
def add_room_to_group(self, destination, group_id, requester_user_id, room_id,
|
||||||
room_id, content):
|
content):
|
||||||
"""Add or update an association between room and group
|
"""Add a room to a group
|
||||||
"""
|
"""
|
||||||
path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,)
|
path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,)
|
||||||
|
|
||||||
|
@ -545,8 +545,7 @@ class TransportLayerClient(object):
|
||||||
ignore_backoff=True,
|
ignore_backoff=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
def delete_room_group_association(self, destination, group_id, requester_user_id,
|
def remove_room_from_group(self, destination, group_id, requester_user_id, room_id):
|
||||||
room_id):
|
|
||||||
"""Remove a room from a group
|
"""Remove a room from a group
|
||||||
"""
|
"""
|
||||||
path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,)
|
path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,)
|
||||||
|
|
|
@ -684,7 +684,7 @@ class FederationGroupsAddRoomsServlet(BaseFederationServlet):
|
||||||
if get_domain_from_id(requester_user_id) != origin:
|
if get_domain_from_id(requester_user_id) != origin:
|
||||||
raise SynapseError(403, "requester_user_id doesn't match origin")
|
raise SynapseError(403, "requester_user_id doesn't match origin")
|
||||||
|
|
||||||
new_content = yield self.handler.update_room_group_association(
|
new_content = yield self.handler.add_room_to_group(
|
||||||
group_id, requester_user_id, room_id, content
|
group_id, requester_user_id, room_id, content
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -696,7 +696,7 @@ class FederationGroupsAddRoomsServlet(BaseFederationServlet):
|
||||||
if get_domain_from_id(requester_user_id) != origin:
|
if get_domain_from_id(requester_user_id) != origin:
|
||||||
raise SynapseError(403, "requester_user_id doesn't match origin")
|
raise SynapseError(403, "requester_user_id doesn't match origin")
|
||||||
|
|
||||||
new_content = yield self.handler.delete_room_group_association(
|
new_content = yield self.handler.remove_room_from_group(
|
||||||
group_id, requester_user_id, room_id,
|
group_id, requester_user_id, room_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -530,9 +530,8 @@ class GroupsServerHandler(object):
|
||||||
})
|
})
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def update_room_group_association(self, group_id, requester_user_id, room_id,
|
def add_room_to_group(self, group_id, requester_user_id, room_id, content):
|
||||||
content):
|
"""Add room to group
|
||||||
"""Add or update an association between room and group
|
|
||||||
"""
|
"""
|
||||||
RoomID.from_string(room_id) # Ensure valid room id
|
RoomID.from_string(room_id) # Ensure valid room id
|
||||||
|
|
||||||
|
@ -542,21 +541,19 @@ class GroupsServerHandler(object):
|
||||||
|
|
||||||
is_public = _parse_visibility_from_contents(content)
|
is_public = _parse_visibility_from_contents(content)
|
||||||
|
|
||||||
yield self.store.update_room_group_association(
|
yield self.store.add_room_to_group(group_id, room_id, is_public=is_public)
|
||||||
group_id, room_id, is_public=is_public
|
|
||||||
)
|
|
||||||
|
|
||||||
defer.returnValue({})
|
defer.returnValue({})
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def delete_room_group_association(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
|
||||||
"""
|
"""
|
||||||
yield self.check_group_is_ours(
|
yield self.check_group_is_ours(
|
||||||
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
|
||||||
)
|
)
|
||||||
|
|
||||||
yield self.store.delete_room_group_association(group_id, room_id)
|
yield self.store.remove_room_from_group(group_id, room_id)
|
||||||
|
|
||||||
defer.returnValue({})
|
defer.returnValue({})
|
||||||
|
|
||||||
|
|
|
@ -70,8 +70,8 @@ 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")
|
||||||
|
|
||||||
update_room_group_association = _create_rerouter("update_room_group_association")
|
add_room_to_group = _create_rerouter("add_room_to_group")
|
||||||
delete_room_group_association = _create_rerouter("delete_room_group_association")
|
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")
|
||||||
delete_group_summary_room = _create_rerouter("delete_group_summary_room")
|
delete_group_summary_room = _create_rerouter("delete_group_summary_room")
|
||||||
|
|
|
@ -451,7 +451,7 @@ class GroupAdminRoomsServlet(RestServlet):
|
||||||
requester_user_id = requester.user.to_string()
|
requester_user_id = requester.user.to_string()
|
||||||
|
|
||||||
content = parse_json_object_from_request(request)
|
content = parse_json_object_from_request(request)
|
||||||
result = yield self.groups_handler.update_room_group_association(
|
result = yield self.groups_handler.add_room_to_group(
|
||||||
group_id, requester_user_id, room_id, content,
|
group_id, requester_user_id, room_id, content,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -462,7 +462,7 @@ class GroupAdminRoomsServlet(RestServlet):
|
||||||
requester = yield self.auth.get_user_by_req(request)
|
requester = yield self.auth.get_user_by_req(request)
|
||||||
requester_user_id = requester.user.to_string()
|
requester_user_id = requester.user.to_string()
|
||||||
|
|
||||||
result = yield self.groups_handler.delete_room_group_association(
|
result = yield self.groups_handler.remove_room_from_group(
|
||||||
group_id, requester_user_id, room_id,
|
group_id, requester_user_id, room_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -846,25 +846,19 @@ class GroupServerStore(SQLBaseStore):
|
||||||
)
|
)
|
||||||
return self.runInteraction("remove_user_from_group", _remove_user_from_group_txn)
|
return self.runInteraction("remove_user_from_group", _remove_user_from_group_txn)
|
||||||
|
|
||||||
def update_room_group_association(self, group_id, room_id, is_public):
|
def add_room_to_group(self, group_id, room_id, is_public):
|
||||||
return self._simple_upsert(
|
return self._simple_insert(
|
||||||
table="group_rooms",
|
table="group_rooms",
|
||||||
keyvalues={
|
values={
|
||||||
"group_id": group_id,
|
"group_id": group_id,
|
||||||
"room_id": room_id,
|
"room_id": room_id,
|
||||||
},
|
|
||||||
values={
|
|
||||||
"is_public": is_public,
|
"is_public": is_public,
|
||||||
},
|
},
|
||||||
insertion_values={
|
desc="add_room_to_group",
|
||||||
"group_id": group_id,
|
|
||||||
"room_id": room_id,
|
|
||||||
},
|
|
||||||
desc="update_room_group_association",
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def delete_room_group_association(self, group_id, room_id):
|
def remove_room_from_group(self, group_id, room_id):
|
||||||
def _delete_room_group_association_txn(txn):
|
def _remove_room_from_group_txn(txn):
|
||||||
self._simple_delete_txn(
|
self._simple_delete_txn(
|
||||||
txn,
|
txn,
|
||||||
table="group_rooms",
|
table="group_rooms",
|
||||||
|
@ -883,7 +877,7 @@ class GroupServerStore(SQLBaseStore):
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
return self.runInteraction(
|
return self.runInteraction(
|
||||||
"delete_room_group_association", _delete_room_group_association_txn,
|
"remove_room_from_group", _remove_room_from_group_txn,
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_publicised_groups_for_user(self, user_id):
|
def get_publicised_groups_for_user(self, user_id):
|
||||||
|
|
Loading…
Reference in a new issue