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/sync.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/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index e83f3e9c44..4bdb0aef84 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) |