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

Route public room list requests to our own server_name locally instead

pull/6899/head
Andrew Morgan 2020-02-12 13:01:29 +00:00
parent a7cd2b2497
commit 4128d03cd4
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,7 +372,7 @@ class PublicRoomListRestServlet(TransactionRestServlet):
limit = None
handler = self.hs.get_room_list_handler()
if server:
if server and server != self.hs.config.server_name:
try:
data = await handler.get_remote_public_room_list(
server, limit=limit, since_token=since_token
@ -383,10 +383,12 @@ class PublicRoomListRestServlet(TransactionRestServlet):
400,
"The remote server is only allowing local users to view "
"its public rooms list",
errcode=Codes.FORBIDDEN
errcode=Codes.FORBIDDEN,
)
else:
raise SynapseError(400, "Unable to retrieve remote public rooms list")
raise SynapseError(
400, "Unable to retrieve remote public rooms list"
)
else:
data = await handler.get_local_public_room_list(
limit=limit, since_token=since_token
@ -423,7 +425,7 @@ class PublicRoomListRestServlet(TransactionRestServlet):
limit = None
handler = self.hs.get_room_list_handler()
if server:
if server and server != self.hs.config.server_name:
try:
data = await handler.get_remote_public_room_list(
server,
@ -439,10 +441,12 @@ class PublicRoomListRestServlet(TransactionRestServlet):
400,
"The remote server is only allowing local users to view "
"its public rooms list",
errcode=Codes.FORBIDDEN
errcode=Codes.FORBIDDEN,
)
else:
raise SynapseError(400, "Unable to retrieve remote public rooms list")
raise SynapseError(
400, "Unable to retrieve remote public rooms list"
)
else:
data = await handler.get_local_public_room_list(
limit=limit,