diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py
index c65c9c9c47..eb15fb751b 100644
--- a/synapse/storage/event_push_actions.py
+++ b/synapse/storage/event_push_actions.py
@@ -338,6 +338,36 @@ class EventPushActionsStore(SQLBaseStore):
defer.returnValue(notifs[:limit])
@defer.inlineCallbacks
+ def get_push_actions_for_user(self, user_id, before=None, limit=50):
+ def f(txn):
+ before_clause = ""
+ if before:
+ before_clause = "AND stream_ordering < ?"
+ args = [user_id, before, limit]
+ else:
+ args = [user_id, limit]
+ sql = (
+ "SELECT epa.event_id, epa.room_id,"
+ " epa.stream_ordering, epa.topological_ordering,"
+ " epa.actions, epa.profile_tag, e.received_ts"
+ " FROM event_push_actions epa, events e"
+ " WHERE epa.room_id = e.room_id AND epa.event_id = e.event_id"
+ " AND epa.user_id = ? %s"
+ " ORDER BY epa.stream_ordering DESC"
+ " LIMIT ?"
+ % (before_clause,)
+ )
+ txn.execute(sql, args)
+ return self.cursor_to_dict(txn)
+
+ push_actions = yield self.runInteraction(
+ "get_push_actions_for_user", f
+ )
+ for pa in push_actions:
+ pa["actions"] = json.loads(pa["actions"])
+ defer.returnValue(push_actions)
+
+ @defer.inlineCallbacks
def get_time_of_last_push_action_before(self, stream_ordering):
def f(txn):
sql = (
diff --git a/synapse/storage/receipts.py b/synapse/storage/receipts.py
index 3ad916103f..ccc3811e84 100644
--- a/synapse/storage/receipts.py
+++ b/synapse/storage/receipts.py
@@ -95,6 +95,31 @@ class ReceiptsStore(SQLBaseStore):
defer.returnValue({row["room_id"]: row["event_id"] for row in rows})
@defer.inlineCallbacks
+ def get_receipts_for_user_with_orderings(self, user_id, receipt_type):
+ def f(txn):
+ sql = (
+ "SELECT rl.room_id, rl.event_id,"
+ " e.topological_ordering, e.stream_ordering"
+ " FROM receipts_linearized AS rl"
+ " INNER JOIN events AS e USING (room_id, event_id)"
+ " WHERE rl.room_id = e.room_id"
+ " AND rl.event_id = e.event_id"
+ " AND user_id = ?"
+ )
+ txn.execute(sql, (user_id,))
+ return txn.fetchall()
+ rows = yield self.runInteraction(
+ "get_receipts_for_user_with_orderings", f
+ )
+ defer.returnValue({
+ row[0]: {
+ "event_id": row[1],
+ "topological_ordering": row[2],
+ "stream_ordering": row[3],
+ } for row in rows
+ })
+
+ @defer.inlineCallbacks
def get_linearized_receipts_for_rooms(self, room_ids, to_key, from_key=None):
"""Get receipts for multiple rooms for sending to clients.
|
