diff --git a/changelog.d/18970.misc b/changelog.d/18970.misc new file mode 100644 index 00000000000..4e32da32dba --- /dev/null +++ b/changelog.d/18970.misc @@ -0,0 +1 @@ +Provide additional servers with federation room directory results. diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index ad2b0f5fcc9..d4210058299 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -323,16 +323,7 @@ async def on_directory_query(self, args: JsonDict) -> JsonDict: if not self.hs.is_mine(room_alias): raise SynapseError(400, "Room Alias is not hosted on this homeserver") - result = await self.get_association_from_room_alias(room_alias) - - if result is not None: - return {"room_id": result.room_id, "servers": result.servers} - else: - raise SynapseError( - 404, - "Room alias %r not found" % (room_alias.to_string(),), - Codes.NOT_FOUND, - ) + return await self.get_association(room_alias) async def _update_canonical_alias( self, requester: Requester, user_id: str, room_id: str, room_alias: RoomAlias