Merge pull request #3620 from fuzzmz/return-404-room-not-found

return 404 if room not found

AUTHORS.rst

@@ -63,3 +63,6 @@ Christoph Witzany <christoph at web.crofting.com>
 
 Pierre Jaury <pierre at jaury.eu>
 * Docker packaging
+
+Serban Constantin <serban.constantin at gmail dot com>
+ * Small bug fix

changelog.d/2952.bugfix

@@ -0,0 +1 @@
+Make /directory/list API return 404 for room not found instead of 400

synapse/rest/client/v1/directory.py

@@ -18,7 +18,7 @@ import logging
 
 from twisted.internet import defer
 
-from synapse.api.errors import AuthError, Codes, SynapseError
+from synapse.api.errors import AuthError, Codes, NotFoundError, SynapseError
 from synapse.http.servlet import parse_json_object_from_request
 from synapse.types import RoomAlias
 
@@ -159,7 +159,7 @@ class ClientDirectoryListServer(ClientV1RestServlet):
     def on_GET(self, request, room_id):
         room = yield self.store.get_room(room_id)
         if room is None:
-            raise SynapseError(400, "Unknown room")
+            raise NotFoundError("Unknown room")
 
         defer.returnValue((200, {
             "visibility": "public" if room["is_public"] else "private"