mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-26 04:05:38 +00:00
Move unknown room ID error into resolve_room_id
Signed-off-by: Jason Robinson <jasonr@matrix.org>
This commit is contained in:
parent
b849e46139
commit
c91045f56c
@ -524,14 +524,18 @@ class ForwardExtremitiesRestServlet(RestServlet):
|
|||||||
async def resolve_room_id(self, room_identifier: str) -> str:
|
async def resolve_room_id(self, room_identifier: str) -> str:
|
||||||
"""Resolve to a room ID, if necessary."""
|
"""Resolve to a room ID, if necessary."""
|
||||||
if RoomID.is_valid(room_identifier):
|
if RoomID.is_valid(room_identifier):
|
||||||
return room_identifier
|
room_id = room_identifier
|
||||||
elif RoomAlias.is_valid(room_identifier):
|
elif RoomAlias.is_valid(room_identifier):
|
||||||
room_alias = RoomAlias.from_string(room_identifier)
|
room_alias = RoomAlias.from_string(room_identifier)
|
||||||
room_id, _ = await self.room_member_handler.lookup_room_alias(room_alias)
|
room_id, _ = await self.room_member_handler.lookup_room_alias(room_alias)
|
||||||
return room_id.to_string()
|
room_id = room_id.to_string()
|
||||||
raise SynapseError(
|
else:
|
||||||
400, "%s was not legal room ID or room alias" % (room_identifier,)
|
raise SynapseError(
|
||||||
)
|
400, "%s was not legal room ID or room alias" % (room_identifier,)
|
||||||
|
)
|
||||||
|
if not room_id:
|
||||||
|
raise SynapseError(400, "Unknown room ID or room alias %s" % room_identifier)
|
||||||
|
return room_id
|
||||||
|
|
||||||
async def on_DELETE(self, request, room_identifier):
|
async def on_DELETE(self, request, room_identifier):
|
||||||
requester = await self.auth.get_user_by_req(request)
|
requester = await self.auth.get_user_by_req(request)
|
||||||
@ -544,8 +548,6 @@ class ForwardExtremitiesRestServlet(RestServlet):
|
|||||||
await assert_user_is_admin(self.auth, requester.user)
|
await assert_user_is_admin(self.auth, requester.user)
|
||||||
|
|
||||||
room_id = await self.resolve_room_id(room_identifier)
|
room_id = await self.resolve_room_id(room_identifier)
|
||||||
if not room_id:
|
|
||||||
raise SynapseError(400, "Unknown room ID or room alias %s" % room_identifier)
|
|
||||||
|
|
||||||
extremities = await self.store.get_forward_extremities_for_room(room_id)
|
extremities = await self.store.get_forward_extremities_for_room(room_id)
|
||||||
return 200, {
|
return 200, {
|
||||||
|
Loading…
Reference in New Issue
Block a user