diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-05-16 20:08:32 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-05-16 20:08:32 +0100 |
commit | 53e171f345d43ab133e8382cfdf639cd81dfcc4b (patch) | |
tree | 2ceaa5da4938c60de600373fa02930cece959f11 /synapse/handlers/events.py | |
parent | Remove get_joined_rooms_for_user from RoomMemberHandler (diff) | |
parent | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ... (diff) | |
download | synapse-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.py | 2 |
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, |