summary refs log tree commit diff
path: root/synapse/rest/client/v1/room.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-05-16 18:56:37 +0100
committerMark Haines <mark.haines@matrix.org>2016-05-16 18:56:37 +0100
commit3b86ecfa7965f4d29e0f5ce8fb663e5f018adf89 (patch)
tree98f7e429892fa3e18bf88f920279c9c712d15b25 /synapse/rest/client/v1/room.py
parentMerge pull request #760 from matrix-org/matthew/preview_url_ip_whitelist (diff)
downloadsynapse-3b86ecfa7965f4d29e0f5ce8fb663e5f018adf89.tar.xz
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):