Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1789 from matrix-org/erikj/decouple_presence 

Don't block messages sending on bumping presence
This commit is contained in:
Erik Johnston 2017-01-10 14:06:05 +00:00 committed by GitHub
parent 7d0981b312 3b4de17d2b
commit 657488113e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/message.py
View File

@ -279,7 +279,9 @@ class MessageHandler(BaseHandler):
if event.type == EventTypes.Message: if event.type == EventTypes.Message:
presence = self.hs.get_presence_handler() 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 @defer.inlineCallbacks
def deduplicate_state_event(self, event, context): def deduplicate_state_event(self, event, context):