summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-10 14:05:53 +0000
committerErik Johnston <erik@matrix.org>2017-01-10 14:05:53 +0000
commit3b4de17d2be01a0726152f614eb03078979ec631 (patch)
tree7ce5971d61e3e371d4eff3f5ad7f2dbb6fb4091a
parentDon't block messages sending on bumping presence (diff)
downloadsynapse-3b4de17d2be01a0726152f614eb03078979ec631.tar.xz
Comment
Diffstat (limited to '')
-rw-r--r--synapse/handlers/message.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 59d0ad3bdc..88bd2d572e 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -279,6 +279,8 @@ class MessageHandler(BaseHandler):
 
         if event.type == EventTypes.Message:
             presence = self.hs.get_presence_handler()
+            # 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