watcha
/
watcha-synapse
mirror of https://github.com/watcha-fr/synapse
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source
1.103.0-whithout-watcha
Andrew Morgan 9 months ago 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 all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      changelog.d/16954.bugfix
  2. 18
      synapse/storage/databases/main/event_push_actions.py

1
changelog.d/16954.bugfix
Unescape 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
Unescape 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

Write Preview
Loading…
Cancel
Save