Merge pull request #802 from matrix-org/dbkr/split_room_list_handler

Split out the room list handler
pull/803/head
David Baker 2016-05-31 11:32:44 +01:00
commit 163e48c0e3
3 changed files with 7 additions and 3 deletions

View File

@ -17,7 +17,7 @@ from synapse.appservice.scheduler import AppServiceScheduler
from synapse.appservice.api import ApplicationServiceApi
from .register import RegistrationHandler
from .room import (
RoomCreationHandler, RoomListHandler, RoomContextHandler,
RoomCreationHandler, RoomContextHandler,
)
from .room_member import RoomMemberHandler
from .message import MessageHandler
@ -50,7 +50,6 @@ class Handlers(object):
self.event_handler = EventHandler(hs)
self.federation_handler = FederationHandler(hs)
self.profile_handler = ProfileHandler(hs)
self.room_list_handler = RoomListHandler(hs)
self.directory_handler = DirectoryHandler(hs)
self.admin_handler = AdminHandler(hs)
self.receipts_handler = ReceiptsHandler(hs)

View File

@ -279,7 +279,7 @@ class PublicRoomListRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks
def on_GET(self, request):
handler = self.handlers.room_list_handler
handler = self.hs.get_room_list_handler()
data = yield handler.get_public_room_list()
defer.returnValue((200, data))

View File

@ -30,6 +30,7 @@ from synapse.handlers import Handlers
from synapse.handlers.presence import PresenceHandler
from synapse.handlers.sync import SyncHandler
from synapse.handlers.typing import TypingHandler
from synapse.handlers.room import RoomListHandler
from synapse.state import StateHandler
from synapse.storage import DataStore
from synapse.util import Clock
@ -84,6 +85,7 @@ class HomeServer(object):
'presence_handler',
'sync_handler',
'typing_handler',
'room_list_handler',
'notifier',
'distributor',
'client_resource',
@ -179,6 +181,9 @@ class HomeServer(object):
def build_sync_handler(self):
return SyncHandler(self)
def build_room_list_handler(self):
return RoomListHandler(self)
def build_event_sources(self):
return EventSources(self)