summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-27 14:54:29 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-27 14:54:29 +0100
commitc585c87c4b13691c68926b8abffa3a9deb6b0937 (patch)
tree7be4e3828243105ac4214fe1bb9a8cf90069d0cf
parentRenamed /public/rooms to /publicRooms (diff)
downloadsynapse-c585c87c4b13691c68926b8abffa3a9deb6b0937.tar.xz
Renamed /ds to /directory
Diffstat (limited to '')
-rw-r--r--synapse/rest/directory.py2
-rw-r--r--webclient/components/matrix/matrix-service.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/directory.py b/synapse/rest/directory.py
index be9a3f5f9f..dc347652a0 100644
--- a/synapse/rest/directory.py
+++ b/synapse/rest/directory.py
@@ -31,7 +31,7 @@ def register_servlets(hs, http_server):
 
 
 class ClientDirectoryServer(RestServlet):
-    PATTERN = client_path_pattern("/ds/room/(?P<room_alias>[^/]*)$")
+    PATTERN = client_path_pattern("/directory/room/(?P<room_alias>[^/]*)$")
 
     @defer.inlineCallbacks
     def on_GET(self, request, room_alias):
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js
index aad0960db9..93e23de68c 100644
--- a/webclient/components/matrix/matrix-service.js
+++ b/webclient/components/matrix/matrix-service.js
@@ -155,7 +155,7 @@ angular.module('matrixService', [])
 
         // Retrieves the room ID corresponding to a room alias
         resolveRoomAlias:function(room_alias) {
-            var path = "/matrix/client/api/v1/ds/room/$room_alias";
+            var path = "/matrix/client/api/v1/directory/room/$room_alias";
             room_alias = encodeURIComponent(room_alias);
 
             path = path.replace("$room_alias", room_alias);