Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 1386ce4

Browse files
authored
Revert "Stop returning an unused column when handling new receipts. (#13933)" (#13935)
This reverts commit 7766bd5 (#13933). The unused column is actually used, but much further down in the function.
1 parent 7766bd5 commit 1386ce4

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

changelog.d/13933.feature

-1
This file was deleted.

synapse/storage/databases/main/event_push_actions.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ def _handle_new_receipts_for_notifs_txn(self, txn: LoggingTransaction) -> bool:
10531053
)
10541054

10551055
sql = """
1056-
SELECT r.room_id, r.user_id, e.stream_ordering
1056+
SELECT r.stream_id, r.room_id, r.user_id, e.stream_ordering
10571057
FROM receipts_linearized AS r
10581058
INNER JOIN events AS e USING (event_id)
10591059
WHERE ? < r.stream_id AND r.stream_id <= ? AND user_id LIKE ?
@@ -1078,7 +1078,7 @@ def _handle_new_receipts_for_notifs_txn(self, txn: LoggingTransaction) -> bool:
10781078

10791079
# For each new read receipt we delete push actions from before it and
10801080
# recalculate the summary.
1081-
for room_id, user_id, stream_ordering in rows:
1081+
for _, room_id, user_id, stream_ordering in rows:
10821082
# Only handle our own read receipts.
10831083
if not self.hs.is_mine_id(user_id):
10841084
continue

0 commit comments

Comments
 (0)