diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 11:19:37 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 11:19:37 +0100 |
| commit | bf05218c4b1740cdc5477cadbc36f0575e2dcd51 (patch) | |
| tree | ced8ed09e18afb11e97734959150b8ef7f0db833 /synapse/handlers/__init__.py | |
| parent | Fold federation/handler into handlers/federation (diff) | |
| parent | Added support for GET /events/$eventid with auth checks. (diff) | |
| download | synapse-bf05218c4b1740cdc5477cadbc36f0575e2dcd51.tar.xz | |
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'synapse/handlers/__init__.py')
| -rw-r--r-- | synapse/handlers/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py index 8a4aa6e5d6..7417a02cea 100644 --- a/synapse/handlers/__init__.py +++ b/synapse/handlers/__init__.py @@ -17,7 +17,7 @@ from .register import RegistrationHandler from .room import ( MessageHandler, RoomCreationHandler, RoomMemberHandler, RoomListHandler ) -from .events import EventStreamHandler +from .events import EventStreamHandler, EventHandler from .federation import FederationHandler from .login import LoginHandler from .profile import ProfileHandler @@ -39,6 +39,7 @@ class Handlers(object): self.room_creation_handler = RoomCreationHandler(hs) self.room_member_handler = RoomMemberHandler(hs) self.event_stream_handler = EventStreamHandler(hs) + self.event_handler = EventHandler(hs) self.federation_handler = FederationHandler(hs) self.profile_handler = ProfileHandler(hs) self.presence_handler = PresenceHandler(hs) |