MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-25 11:14:30 +01:00
Code Issues Projects Releases Wiki Activity

Ignore notification counts from rooms you've left (#16954)

Browse source 
Co-authored-by: reivilibre <oliverw@matrix.org>
This commit is contained in:
Andrew Morgan 2024-02-23 14:12:10 +00:00 committed by GitHub
parent 8de3283ebe
commit 274f289a52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/16954.bugfix Normal file
View file

@ -0,0 +1 @@
Fix a bug introduced in v1.100.0 where notifications from rooms you've left would continue to be counted.

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

@ -404,7 +404,11 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas
SELECT e.room_id, notif_count, e.stream_ordering, e.thread_id, last_receipt_stream_ordering, SELECT e.room_id, notif_count, e.stream_ordering, e.thread_id, last_receipt_stream_ordering,
ev.stream_ordering AS receipt_stream_ordering ev.stream_ordering AS receipt_stream_ordering
FROM event_push_summary AS e FROM event_push_summary AS e
INNER JOIN local_current_membership USING (user_id, room_id) INNER JOIN local_current_membership AS lcm ON (
e.user_id = lcm.user_id
AND e.room_id = lcm.room_id
AND lcm.membership = 'join'
)
LEFT JOIN receipts_linearized AS r ON ( LEFT JOIN receipts_linearized AS r ON (
e.user_id = r.user_id e.user_id = r.user_id
AND e.room_id = r.room_id AND e.room_id = r.room_id
@ -472,7 +476,11 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas
SELECT e.room_id, e.stream_ordering, e.thread_id, SELECT e.room_id, e.stream_ordering, e.thread_id,
ev.stream_ordering AS receipt_stream_ordering ev.stream_ordering AS receipt_stream_ordering
FROM event_push_actions AS e FROM event_push_actions AS e
INNER JOIN local_current_membership USING (user_id, room_id) INNER JOIN local_current_membership AS lcm ON (
e.user_id = lcm.user_id
AND e.room_id = lcm.room_id
AND lcm.membership = 'join'
)
LEFT JOIN receipts_linearized AS r ON ( LEFT JOIN receipts_linearized AS r ON (
e.user_id = r.user_id e.user_id = r.user_id
AND e.room_id = r.room_id AND e.room_id = r.room_id
@ -514,7 +522,11 @@ class EventPushActionsWorkerStore(ReceiptsWorkerStore, StreamWorkerStore, SQLBas
SELECT e.room_id, e.stream_ordering, e.thread_id, SELECT e.room_id, e.stream_ordering, e.thread_id,
ev.stream_ordering AS receipt_stream_ordering ev.stream_ordering AS receipt_stream_ordering
FROM event_push_actions AS e FROM event_push_actions AS e
INNER JOIN local_current_membership USING (user_id, room_id) INNER JOIN local_current_membership AS lcm ON (
e.user_id = lcm.user_id
AND e.room_id = lcm.room_id
AND lcm.membership = 'join'
)
LEFT JOIN receipts_linearized AS r ON ( LEFT JOIN receipts_linearized AS r ON (
e.user_id = r.user_id e.user_id = r.user_id
AND e.room_id = r.room_id AND e.room_id = r.room_id