diff options
author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-09-28 10:58:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-28 10:58:25 -0400 |
commit | 7766bd5b354cd4ea1a33351ba320e54a14d3aeac (patch) | |
tree | faaf463defa05e4c6d146120b5954baf0d458ef5 | |
parent | Document that the 'auto_join_rooms' option works with Spaces (#13931) (diff) | |
download | synapse-7766bd5b354cd4ea1a33351ba320e54a14d3aeac.tar.xz |
Stop returning an unused column when handling new receipts. (#13933)
-rw-r--r-- | changelog.d/13933.feature | 1 | ||||
-rw-r--r-- | synapse/storage/databases/main/event_push_actions.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/13933.feature b/changelog.d/13933.feature new file mode 100644 index 0000000000..d0cb902dff --- /dev/null +++ b/changelog.d/13933.feature @@ -0,0 +1 @@ +Experimental support for thread-specific receipts ([MSC3771](https://github.com/matrix-org/matrix-spec-proposals/pull/3771)). diff --git a/synapse/storage/databases/main/event_push_actions.py b/synapse/storage/databases/main/event_push_actions.py index f4cdc2e399..3e4b4485d6 100644 --- a/synapse/storage/databases/main/event_push_actions.py +++ b/synapse/storage/databases/main/event_push_actions.py @@ -1053,7 +1053,7 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas ) sql = """ - SELECT r.stream_id, r.room_id, r.user_id, e.stream_ordering + SELECT 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 |