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

return 404 if room not found
matrix-org · Aug 1, 2018 · b8d7d39 · b8d7d39
2 parents da77851 + 6e63d68
commit b8d7d39
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -62,4 +62,7 @@ Christoph Witzany <christoph at web.crofting.com>
  * Add LDAP support for authentication
 
 Pierre Jaury <pierre at jaury.eu>
-* Docker packaging
+* Docker packaging
+
+Serban Constantin <serban.constantin at gmail dot com>
+ * Small bug fix
diff --git a/changelog.d/2952.bugfix b/changelog.d/2952.bugfix
@@ -0,0 +1 @@
+Make /directory/list API return 404 for room not found instead of 400
diff --git a/synapse/rest/client/v1/directory.py b/synapse/rest/client/v1/directory.py
@@ -18,7 +18,7 @@
 
 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 @@ def __init__(self, hs):
     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"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Make /directory/list API return 404 for room not found instead of 400