OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Move presence handling into handle_new_client_event 

As we want to have it run on the main synapse instance
pull/2854/head
Erik Johnston 2018-02-06 17:27:00 +00:00
parent 8ec2e638be
commit 50fe92cd26
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/handlers/message.py
View File

@ -423,12 +423,6 @@ class EventCreationHandler(object):
ratelimit=ratelimit, ratelimit=ratelimit,
) )
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 @defer.inlineCallbacks
def deduplicate_state_event(self, event, context): def deduplicate_state_event(self, event, context):
""" """
@ -708,3 +702,9 @@ class EventCreationHandler(object):
) )
preserve_fn(_notify)() preserve_fn(_notify)()
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)(requester.user)