diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
| commit | 425e6b4983ccb01bf9053edb14ff23a7eb9a0afb (patch) | |
| tree | 7bdebcc130261183a7d3864f56857e7006df3454 /synapse/handlers/message.py | |
| parent | Remove get_joined_rooms_for_user from RoomMemberHandler (diff) | |
| parent | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler (diff) | |
| download | synapse-425e6b4983ccb01bf9053edb14ff23a7eb9a0afb.tar.xz | |
Merge branch 'develop' into markjh/member_cleanup
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 9386aeeb1c..c41dafdef5 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -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(): |