summary refs log tree commit diff
path: root/synapse/rest/public.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-27 15:34:01 +0100
committerErik Johnston <erik@matrix.org>2014-08-27 15:34:01 +0100
commit08881d808d7cfd600d130eb7a960c6c51c797a09 (patch)
tree1a8c8833a981b9a01e5f8c68c555203f2bc59455 /synapse/rest/public.py
parentIndex sources in a nicer fashion. (diff)
parentBF: use room_id if there is no alias (diff)
downloadsynapse-08881d808d7cfd600d130eb7a960c6c51c797a09.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/rest/public.py')
-rw-r--r--synapse/rest/public.py33
1 files changed, 0 insertions, 33 deletions
diff --git a/synapse/rest/public.py b/synapse/rest/public.py
deleted file mode 100644
index 3430c8049f..0000000000
--- a/synapse/rest/public.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2014 matrix.org
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""This module contains REST servlets to do with public paths: /public"""
-from twisted.internet import defer
-
-from base import RestServlet, client_path_pattern
-
-
-class PublicRoomListRestServlet(RestServlet):
-    PATTERN = client_path_pattern("/public/rooms$")
-
-    @defer.inlineCallbacks
-    def on_GET(self, request):
-        handler = self.handlers.room_list_handler
-        data = yield handler.get_public_room_list()
-        defer.returnValue((200, data))
-
-
-def register_servlets(hs, http_server):
-    PublicRoomListRestServlet(hs).register(http_server)