summary refs log tree commit diff
path: root/synapse/handlers/message.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/handlers/message.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/handlers/message.py')
-rw-r--r--synapse/handlers/message.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 13154edb78..c4e38d0faa 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -236,7 +236,7 @@ class MessageHandler(BaseHandler):
         )
 
         if event.type == EventTypes.Message:
-            presence = self.hs.get_handlers().presence_handler
+            presence = self.hs.get_presence_handler()
             yield presence.bump_presence_active_time(user)
 
     def deduplicate_state_event(self, event, context):
@@ -674,7 +674,7 @@ class MessageHandler(BaseHandler):
             and m.content["membership"] == Membership.JOIN
         ]
 
-        presence_handler = self.hs.get_handlers().presence_handler
+        presence_handler = self.hs.get_presence_handler()
 
         @defer.inlineCallbacks
         def get_presence():