summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-08-01 16:34:32 +0100
committerGitHub <noreply@github.com>2018-08-01 16:34:32 +0100
commitb8d7d3996b748d599b5f2ffe700ee381de5b61eb (patch)
treeff0d789d9d2c279a126c82c35dff32e5104a93fd /synapse/rest/client/v1
parentPython 3: Convert some unicode/bytes uses (#3569) (diff)
parentUpdate 2952.bugfix (diff)
downloadsynapse-b8d7d3996b748d599b5f2ffe700ee381de5b61eb.tar.xz
Merge pull request #3620 from fuzzmz/return-404-room-not-found
return 404 if room not found
Diffstat (limited to 'synapse/rest/client/v1')
-rw-r--r--synapse/rest/client/v1/directory.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/directory.py b/synapse/rest/client/v1/directory.py
index 69dcd618cb..97733f3026 100644
--- a/synapse/rest/client/v1/directory.py
+++ b/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"