summary refs log tree commit diff
path: root/synapse/handlers/events.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-05-16 20:08:32 +0100
committerMark Haines <mark.haines@matrix.org>2016-05-16 20:08:32 +0100
commit53e171f345d43ab133e8382cfdf639cd81dfcc4b (patch)
tree2ceaa5da4938c60de600373fa02930cece959f11 /synapse/handlers/events.py
parentRemove get_joined_rooms_for_user from RoomMemberHandler (diff)
parentDon't inherit PresenceHandler from BaseHandler, remove references to self.hs ... (diff)
downloadsynapse-53e171f345d43ab133e8382cfdf639cd81dfcc4b.tar.xz
Merge branch 'markjh/liberate_presence_handler' into markjh/liberate_sync_handler
Diffstat (limited to 'synapse/handlers/events.py')
-rw-r--r--synapse/handlers/events.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index f25a252523..3a3a1257d3 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -58,7 +58,7 @@ class EventStreamHandler(BaseHandler):
         If `only_keys` is not None, events from keys will be sent down.
         """
         auth_user = UserID.from_string(auth_user_id)
-        presence_handler = self.hs.get_handlers().presence_handler
+        presence_handler = self.hs.get_presence_handler()
 
         context = yield presence_handler.user_syncing(
             auth_user_id, affect_presence=affect_presence,