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/rest/client/v1/room.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/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index b223fb7e5f..9c89442ce6 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -570,7 +570,7 @@ class RoomTypingRestServlet(ClientV1RestServlet): def __init__(self, hs): super(RoomTypingRestServlet, self).__init__(hs) - self.presence_handler = hs.get_handlers().presence_handler + self.presence_handler = hs.get_presence_handler() @defer.inlineCallbacks def on_PUT(self, request, room_id, user_id): |