Skip to content

Commit 0e34e8f

Browse files
dasha-uwujevolk
authored andcommitted
Provide same servers list in s2s alias results as c2s.
Signed-off-by: Jason Volk <[email protected]>
1 parent 8da16e5 commit 0e34e8f

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

changelog.d/18970.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Provide additional servers with federation room directory results.

synapse/handlers/directory.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -323,16 +323,7 @@ async def on_directory_query(self, args: JsonDict) -> JsonDict:
323323
if not self.hs.is_mine(room_alias):
324324
raise SynapseError(400, "Room Alias is not hosted on this homeserver")
325325

326-
result = await self.get_association_from_room_alias(room_alias)
327-
328-
if result is not None:
329-
return {"room_id": result.room_id, "servers": result.servers}
330-
else:
331-
raise SynapseError(
332-
404,
333-
"Room alias %r not found" % (room_alias.to_string(),),
334-
Codes.NOT_FOUND,
335-
)
326+
return await self.get_association(room_alias)
336327

337328
async def _update_canonical_alias(
338329
self, requester: Requester, user_id: str, room_id: str, room_alias: RoomAlias

0 commit comments

Comments
 (0)