diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-16 20:08:32 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-16 20:08:32 +0100 |
| commit | 53e171f345d43ab133e8382cfdf639cd81dfcc4b (patch) | |
| tree | 2ceaa5da4938c60de600373fa02930cece959f11 /synapse/server.py | |
| parent | Remove get_joined_rooms_for_user from RoomMemberHandler (diff) | |
| parent | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ... (diff) | |
| download | synapse-53e171f345d43ab133e8382cfdf639cd81dfcc4b.tar.xz | |
Merge branch 'markjh/liberate_presence_handler' into markjh/liberate_sync_handler
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) |