summary refs log tree commit diff
path: root/synapse/rest/client/v1/room.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-05-17 10:09:43 +0100
committerMark Haines <mjark@negativecurvature.net>2016-05-17 10:09:43 +0100
commitb153f5b150086ed62703b05f035677c6509d801d (patch)
treef16e0f21537380d516b7b5f841d60f3c92b67c9a /synapse/rest/client/v1/room.py
parentMerge pull request #788 from matrix-org/markjh/domian (diff)
parentDon't inherit PresenceHandler from BaseHandler, remove references to self.hs ... (diff)
downloadsynapse-b153f5b150086ed62703b05f035677c6509d801d.tar.xz
Merge pull request #787 from matrix-org/markjh/liberate_presence_handler
Move the presence handler out of the Handlers object
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-rw-r--r--synapse/rest/client/v1/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index b223fb7e5f..9c89442ce6 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -570,7 +570,7 @@ class RoomTypingRestServlet(ClientV1RestServlet):
 
     def __init__(self, hs):
         super(RoomTypingRestServlet, self).__init__(hs)
-        self.presence_handler = hs.get_handlers().presence_handler
+        self.presence_handler = hs.get_presence_handler()
 
     @defer.inlineCallbacks
     def on_PUT(self, request, room_id, user_id):