summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-01-10 14:06:05 +0000
committerGitHub <noreply@github.com>2017-01-10 14:06:05 +0000
commit657488113e26115fa134deb8ca554188f3aa3709 (patch)
treef34de028f69dc157b2b4648cd2b7f3301c86d746 /synapse/handlers
parentMerge pull request #1787 from matrix-org/erikj/linearize_member (diff)
parentComment (diff)
downloadsynapse-657488113e26115fa134deb8ca554188f3aa3709.tar.xz
Merge pull request #1789 from matrix-org/erikj/decouple_presence
Don't block messages sending on bumping presence
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/message.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 7a57a69bd3..88bd2d572e 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -279,7 +279,9 @@ class MessageHandler(BaseHandler):
 
         if event.type == EventTypes.Message:
             presence = self.hs.get_presence_handler()
-            yield presence.bump_presence_active_time(user)
+            # We don't want to block sending messages on any presence code. This
+            # matters as sometimes presence code can take a while.
+            preserve_fn(presence.bump_presence_active_time)(user)
 
     @defer.inlineCallbacks
     def deduplicate_state_event(self, event, context):