summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-08-03 16:22:42 -0700
committerAndrew Morgan <andrew@amorgan.xyz>2020-08-03 16:22:42 -0700
commite64449b7bee96703233235d70961482e860aace9 (patch)
treee73a7481fccd2b2e4c912c94f56163b39cc81d9d /synapse/handlers
parentMerge commit 'e452973fd' into dinsic (diff)
parentImplement unread counter (MSC2625) (#7673) (diff)
downloadsynapse-e64449b7bee96703233235d70961482e860aace9.tar.xz
Merge commit '46613aaf7' into dinsic
* commit '46613aaf7': (27 commits)
  Incorporate review
  Lint
  Incorporate review bits
  Pre-populate the unread_count column
  Don't update the schema version
  Use attr instead of a dict
  Lint
  Test that a mark_unread action updates the right counter when using a slave store
  Remove debug logging
  Test that a mark_unread action updates the right counter
  Fix summary rotation
  Log for invalid values of notif
  Fix SQL
  Fix schema update
  Lint
  Save the count of unread messages to event_push_summary
  Actually act on mark_unread
  Appease mypy
  Lint
  Use temporary prefixes as per the MSC
  ...
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/sync.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 4c7524493e..0b82aa72a6 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1893,6 +1893,9 @@ class SyncHandler(object):
                 if notifs is not None:
                     unread_notifications["notification_count"] = notifs["notify_count"]
                     unread_notifications["highlight_count"] = notifs["highlight_count"]
+                    unread_notifications["org.matrix.msc2625.unread_count"] = notifs[
+                        "unread_count"
+                    ]
 
                 sync_result_builder.joined.append(room_sync)