Renamed /public/rooms to /publicRooms

This commit is contained in:
Kegan Dougal 2014-08-27 14:51:59 +01:00
parent 474d913712
commit 1d9d287c7c
4 changed files with 14 additions and 37 deletions

View File

@ -15,8 +15,7 @@
from . import ( from . import (
room, events, register, login, profile, public, presence, initial_sync, room, events, register, login, profile, presence, initial_sync, directory
directory
) )
@ -40,7 +39,6 @@ class RestServletFactory(object):
register.register_servlets(hs, client_resource) register.register_servlets(hs, client_resource)
login.register_servlets(hs, client_resource) login.register_servlets(hs, client_resource)
profile.register_servlets(hs, client_resource) profile.register_servlets(hs, client_resource)
public.register_servlets(hs, client_resource)
presence.register_servlets(hs, client_resource) presence.register_servlets(hs, client_resource)
initial_sync.register_servlets(hs, client_resource) initial_sync.register_servlets(hs, client_resource)
directory.register_servlets(hs, client_resource) directory.register_servlets(hs, client_resource)

View File

@ -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)

View File

@ -264,6 +264,17 @@ class JoinRoomAliasServlet(RestServlet):
defer.returnValue(response) defer.returnValue(response)
# TODO: Needs unit testing
class PublicRoomListRestServlet(RestServlet):
PATTERN = client_path_pattern("/publicRooms$")
@defer.inlineCallbacks
def on_GET(self, request):
handler = self.handlers.room_list_handler
data = yield handler.get_public_room_list()
defer.returnValue((200, data))
# TODO: Needs unit testing # TODO: Needs unit testing
class RoomMemberListRestServlet(RestServlet): class RoomMemberListRestServlet(RestServlet):
PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/members$") PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/members$")
@ -424,3 +435,4 @@ def register_servlets(hs, http_server):
RoomTriggerBackfill(hs).register(http_server) RoomTriggerBackfill(hs).register(http_server)
RoomMembershipRestServlet(hs).register(http_server) RoomMembershipRestServlet(hs).register(http_server)
RoomSendEventRestServlet(hs).register(http_server) RoomSendEventRestServlet(hs).register(http_server)
PublicRoomListRestServlet(hs).register(http_server)

View File

@ -235,7 +235,7 @@ angular.module('matrixService', [])
// get a list of public rooms on your home server // get a list of public rooms on your home server
publicRooms: function() { publicRooms: function() {
var path = "/public/rooms" var path = "/publicRooms"
return doRequest("GET", path); return doRequest("GET", path);
}, },