diff options
Diffstat (limited to '')
| -rw-r--r-- | synapse/push/httppusher.py | 8 | ||||
| -rw-r--r-- | synapse/push/push_tools.py | 16 |
2 files changed, 13 insertions, 11 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index a0d0234e2e..9f51106d0f 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -96,7 +96,9 @@ class HttpPusher(object): # We could check the receipts are actually m.read receipts here, # but currently that's the only type of receipt anyway... with Measure(self.clock, "push.on_new_receipts"): - badge = yield push_tools.get_badge_count(self.hs, self.user_id) + badge = yield push_tools.get_badge_count( + self.hs.get_datastore(), self.user_id + ) yield self.send_badge(badge) @defer.inlineCallbacks @@ -185,7 +187,7 @@ class HttpPusher(object): defer.returnValue(True) tweaks = push_rule_evaluator.tweaks_for_actions(push_action['actions']) - badge = yield push_tools.get_badge_count(self.hs, self.user_id) + badge = yield push_tools.get_badge_count(self.hs.get_datastore(), self.user_id) event = yield self.store.get_event(push_action['event_id'], allow_none=True) if event is None: @@ -215,7 +217,7 @@ class HttpPusher(object): @defer.inlineCallbacks def _build_notification_dict(self, event, tweaks, badge): - ctx = yield push_tools.get_context_for_event(self.hs, event) + ctx = yield push_tools.get_context_for_event(self.hs.get_datastore(), event) d = { 'notification': { diff --git a/synapse/push/push_tools.py b/synapse/push/push_tools.py index e1e61e49e8..e71d01e77d 100644 --- a/synapse/push/push_tools.py +++ b/synapse/push/push_tools.py @@ -17,13 +17,13 @@ from twisted.internet import defer @defer.inlineCallbacks -def get_badge_count(hs, user_id): +def get_badge_count(store, user_id): invites, joins = yield defer.gatherResults([ - hs.get_datastore().get_invited_rooms_for_user(user_id), - hs.get_datastore().get_rooms_for_user(user_id), + store.get_invited_rooms_for_user(user_id), + store.get_rooms_for_user(user_id), ], consumeErrors=True) - my_receipts_by_room = yield hs.get_datastore().get_receipts_for_user( + my_receipts_by_room = yield store.get_receipts_for_user( user_id, "m.read", ) @@ -34,7 +34,7 @@ def get_badge_count(hs, user_id): last_unread_event_id = my_receipts_by_room[r.room_id] notifs = yield ( - hs.get_datastore().get_unread_event_push_actions_by_room_for_user( + store.get_unread_event_push_actions_by_room_for_user( r.room_id, user_id, last_unread_event_id ) ) @@ -43,8 +43,8 @@ def get_badge_count(hs, user_id): @defer.inlineCallbacks -def get_context_for_event(hs, ev): - name_aliases = yield hs.get_datastore().get_room_name_and_aliases( +def get_context_for_event(store, ev): + name_aliases = yield store.get_room_name_and_aliases( ev.room_id ) @@ -52,7 +52,7 @@ def get_context_for_event(hs, ev): if name_aliases[0] is not None: ctx['name'] = name_aliases[0] - their_member_events_for_room = yield hs.get_datastore().get_current_state( + their_member_events_for_room = yield store.get_current_state( room_id=ev.room_id, event_type='m.room.member', state_key=ev.user_id |