summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-05-17 16:06:17 +0100
committerMark Haines <mjark@negativecurvature.net>2016-05-17 16:06:17 +0100
commitee660c6b9bba1e9eacea9b0a4419934bb80a502e (patch)
tree5b240661fd780a583871812dd606491c1b38683f /synapse/server.py
parentMerge pull request #791 from matrix-org/markjh/app_service_config (diff)
parentMove typing handler out of the Handlers object (diff)
downloadsynapse-ee660c6b9bba1e9eacea9b0a4419934bb80a502e.tar.xz
Merge pull request #792 from matrix-org/markjh/liberate_typing_handler
Move typing handler out of the Handlers object
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py
index 785a087452..01f828819f 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -29,6 +29,7 @@ from synapse.api.auth import Auth
 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.state import StateHandler
 from synapse.storage import DataStore
 from synapse.util import Clock
@@ -82,6 +83,7 @@ class HomeServer(object):
         'state_handler',
         'presence_handler',
         'sync_handler',
+        'typing_handler',
         'notifier',
         'distributor',
         'client_resource',
@@ -171,6 +173,9 @@ class HomeServer(object):
     def build_presence_handler(self):
         return PresenceHandler(self)
 
+    def build_typing_handler(self):
+        return TypingHandler(self)
+
     def build_sync_handler(self):
         return SyncHandler(self)