summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-05-17 10:09:43 +0100
committerMark Haines <mjark@negativecurvature.net>2016-05-17 10:09:43 +0100
commitb153f5b150086ed62703b05f035677c6509d801d (patch)
treef16e0f21537380d516b7b5f841d60f3c92b67c9a /synapse/handlers/sync.py
parentMerge pull request #788 from matrix-org/markjh/domian (diff)
parentDon't inherit PresenceHandler from BaseHandler, remove references to self.hs ... (diff)
downloadsynapse-b153f5b150086ed62703b05f035677c6509d801d.tar.xz
Merge pull request #787 from matrix-org/markjh/liberate_presence_handler
Move the presence handler out of the Handlers object
Diffstat (limited to 'synapse/handlers/sync.py')
-rw-r--r--synapse/handlers/sync.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 921215469f..b30102f472 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -639,7 +639,7 @@ class SyncHandler(BaseHandler):
 
         # For each newly joined room, we want to send down presence of
         # existing users.
-        presence_handler = self.hs.get_handlers().presence_handler
+        presence_handler = self.hs.get_presence_handler()
         extra_presence_users = set()
         for room_id in newly_joined_rooms:
             users = yield self.store.get_users_in_room(event.room_id)