Make minor clarifications to the error messages given when we fail to…

… join a room via any server. (#13160)

changelog.d/13160.misc

@@ -0,0 +1 @@
+Make minor clarifications to the error messages given when we fail to join a room via any server.

synapse/federation/federation_client.py

@@ -725,6 +725,12 @@ async def _try_destination_list(
         if failover_errcodes is None:
             failover_errcodes = ()
 
+        if not destinations:
+            # Give a bit of a clearer message if no servers were specified at all.
+            raise SynapseError(
+                502, f"Failed to {description} via any server: No servers specified."
+            )
+
         for destination in destinations:
             if destination == self.server_name:
                 continue
@@ -774,7 +780,7 @@ async def _try_destination_list(
                     "Failed to %s via %s", description, destination, exc_info=True
                 )
 
-        raise SynapseError(502, "Failed to %s via any server" % (description,))
+        raise SynapseError(502, f"Failed to {description} via any server")
 
     async def make_membership_event(
         self,

synapse/handlers/room_member.py

@@ -1679,7 +1679,11 @@ async def _remote_join(
         ]
 
         if len(remote_room_hosts) == 0:
-            raise SynapseError(404, "No known servers")
+            raise SynapseError(
+                404,
+                "Can't join remote room because no servers "
+                "that are in the room have been provided.",
+            )
 
         check_complexity = self.hs.config.server.limit_remote_rooms.enabled
         if (

tests/rest/admin/test_room.py

@@ -1873,7 +1873,10 @@ def test_room_does_not_exist(self) -> None:
         )
 
         self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body)
-        self.assertEqual("No known servers", channel.json_body["error"])
+        self.assertEqual(
+            "Can't join remote room because no servers that are in the room have been provided.",
+            channel.json_body["error"],
+        )
 
     def test_room_is_not_valid(self) -> None:
         """