diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
| commit | 425e6b4983ccb01bf9053edb14ff23a7eb9a0afb (patch) | |
| tree | 7bdebcc130261183a7d3864f56857e7006df3454 /synapse/server.py | |
| parent | Remove get_joined_rooms_for_user from RoomMemberHandler (diff) | |
| parent | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler (diff) | |
| download | synapse-425e6b4983ccb01bf9053edb14ff23a7eb9a0afb.tar.xz | |
Merge branch 'develop' into markjh/member_cleanup
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index ee138de756..6d01b68bd4 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -27,6 +27,7 @@ from synapse.http.client import SimpleHttpClient, InsecureInterceptableContextFa from synapse.notifier import Notifier from synapse.api.auth import Auth from synapse.handlers import Handlers +from synapse.handlers.presence import PresenceHandler from synapse.state import StateHandler from synapse.storage import DataStore from synapse.util import Clock @@ -78,6 +79,7 @@ class HomeServer(object): 'auth', 'rest_servlet_factory', 'state_handler', + 'presence_handler', 'notifier', 'distributor', 'client_resource', @@ -164,6 +166,9 @@ class HomeServer(object): def build_state_handler(self): return StateHandler(self) + def build_presence_handler(self): + return PresenceHandler(self) + def build_event_sources(self): return EventSources(self) |