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/v2_alpha | |
| 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/v2_alpha')
| -rw-r--r-- | synapse/rest/client/v2_alpha/receipts.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/receipts.py b/synapse/rest/client/v2_alpha/receipts.py index b831d8c95e..891cef99c6 100644 --- a/synapse/rest/client/v2_alpha/receipts.py +++ b/synapse/rest/client/v2_alpha/receipts.py @@ -37,7 +37,7 @@ class ReceiptRestServlet(RestServlet): self.hs = hs self.auth = hs.get_auth() self.receipts_handler = hs.get_handlers().receipts_handler - self.presence_handler = hs.get_handlers().presence_handler + self.presence_handler = hs.get_presence_handler() @defer.inlineCallbacks def on_POST(self, request, room_id, receipt_type, event_id): diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 60d3dc4030..812abe22b1 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -83,7 +83,7 @@ class SyncRestServlet(RestServlet): self.sync_handler = hs.get_handlers().sync_handler self.clock = hs.get_clock() self.filtering = hs.get_filtering() - self.presence_handler = hs.get_handlers().presence_handler + self.presence_handler = hs.get_presence_handler() @defer.inlineCallbacks def on_GET(self, request): |