summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-10 12:46:00 +0000
committerErik Johnston <erik@matrix.org>2017-01-10 12:46:00 +0000
commit586f474a44cf320c7d578714aea5113f2701073c (patch)
tree0c0f2666f9160751c95cd139b0cb21eaa7a76a8e
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-586f474a44cf320c7d578714aea5113f2701073c.tar.xz
Don't block messages sending on bumping presence
Diffstat (limited to '')
-rw-r--r--synapse/handlers/message.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 7a57a69bd3..59d0ad3bdc 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -279,7 +279,7 @@ class MessageHandler(BaseHandler):
 
         if event.type == EventTypes.Message:
             presence = self.hs.get_presence_handler()
-            yield presence.bump_presence_active_time(user)
+            preserve_fn(presence.bump_presence_active_time)(user)
 
     @defer.inlineCallbacks
     def deduplicate_state_event(self, event, context):