Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 09:06:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Stop returning an unused column when handling new receipts. (#13933)" (#13935)

Browse source 
This reverts commit 7766bd5b35 (#13933).

The unused column is actually used, but much further down in the function.
This commit is contained in:
Patrick Cloke 2022-09-28 11:01:41 -04:00 • committed by GitHub
parent 7766bd5b35
commit 1386ce4735
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/storage/databases/main/event_push_actions.py
View file

@ -1053,7 +1053,7 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas
)
sql = """
SELECT r.room_id, r.user_id, e.stream_ordering
SELECT r.stream_id, r.room_id, r.user_id, e.stream_ordering
FROM receipts_linearized AS r
INNER JOIN events AS e USING (event_id)
WHERE ? < r.stream_id AND r.stream_id <= ? AND user_id LIKE ?
@ -1078,7 +1078,7 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas
# For each new read receipt we delete push actions from before it and
# recalculate the summary.
for room_id, user_id, stream_ordering in rows:
for _, room_id, user_id, stream_ordering in rows:
# Only handle our own read receipts.
if not self.hs.is_mine_id(user_id):
continue