OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Switch to e.to_synapse_error()

pull/6899/head
Andrew Morgan 2020-03-25 10:42:45 +00:00
parent 97d8bf8792
commit 092aef965d
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
synapse/rest/client/v1/room.py
View File

@ -378,17 +378,7 @@ class PublicRoomListRestServlet(TransactionRestServlet):
server, limit=limit, since_token=since_token server, limit=limit, since_token=since_token
) )
except HttpResponseException as e: except HttpResponseException as e:
if e.code == 401: raise e.to_synapse_error()
raise SynapseError(
400,
"The remote server is only allowing local users to view "
"its public rooms list",
errcode=Codes.FORBIDDEN,
)
else:
raise SynapseError(
400, "Unable to retrieve remote public rooms list"
)
else: else:
data = await handler.get_local_public_room_list( data = await handler.get_local_public_room_list(
limit=limit, since_token=since_token limit=limit, since_token=since_token
@ -436,17 +426,7 @@ class PublicRoomListRestServlet(TransactionRestServlet):
third_party_instance_id=third_party_instance_id, third_party_instance_id=third_party_instance_id,
) )
except HttpResponseException as e: except HttpResponseException as e:
if e.code == 401: raise e.to_synapse_error()
raise SynapseError(
400,
"The remote server is only allowing local users to view "
"its public rooms list",
errcode=Codes.FORBIDDEN,
)
else:
raise SynapseError(
400, "Unable to retrieve remote public rooms list"
)
else: else:
data = await handler.get_local_public_room_list( data = await handler.get_local_public_room_list(
limit=limit, limit=limit,