SYN-153: Raise 404 if room alias is not found

2014-11-19 17:14:14 +00:00 · 2014-11-19 17:14:14 +00:00 · 8993affdc0
parent ff23e5ba37
commit 8993affdc0
1 changed files with 8 additions and 4 deletions
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@ -122,10 +122,14 @@ class DirectoryHandler(BaseHandler):
            room_alias
        )

-        defer.returnValue({
-            "room_id": result.room_id,
-            "servers": result.servers,
-        })
+        if result is not None:
+            defer.returnValue({
+                "room_id": result.room_id,
+                "servers": result.servers,
+            })
+        else:
+            raise SynapseError(404, "Room alias \"%s\" not found", room_alias)
+

    @defer.inlineCallbacks
    def send_room_alias_update_event(self, user_id, room_id):