mirrors/synapse
mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2025-03-31 03:45:13 +00:00
Code Activity

Revert "Ignore notification counts from rooms you've left" (#16981)

Browse source
This commit is contained in:
Andrew Morgan 2024-03-05 16:02:54 +00:00 • committed by GitHub
parent 274f289a52
commit ab80b3412e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/16954.bugfix
View file

@ -1 +0,0 @@
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,11 +404,7 @@ 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 AS lcm ON ( INNER JOIN local_current_membership USING (user_id, room_id)
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
@ -476,11 +472,7 @@ 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 AS lcm ON ( INNER JOIN local_current_membership USING (user_id, room_id)
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
@ -522,11 +514,7 @@ 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 AS lcm ON ( INNER JOIN local_current_membership USING (user_id, room_id)
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