Merge pull request #787 from matrix-org/markjh/liberate_presence_handler

Move the presence handler out of the Handlers object
This commit is contained in:
Mark Haines 2016-05-17 10:09:43 +01:00
commit b153f5b150
12 changed files with 49 additions and 36 deletions

View file

@ -236,7 +236,7 @@ class MessageHandler(BaseHandler):
)
if event.type == EventTypes.Message:
presence = self.hs.get_handlers().presence_handler
presence = self.hs.get_presence_handler()
yield presence.bump_presence_active_time(user)
def deduplicate_state_event(self, event, context):
@ -674,7 +674,7 @@ class MessageHandler(BaseHandler):
and m.content["membership"] == Membership.JOIN
]
presence_handler = self.hs.get_handlers().presence_handler
presence_handler = self.hs.get_presence_handler()
@defer.inlineCallbacks
def get_presence():