diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-07-01 11:08:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 11:08:25 +0100 |
| commit | 74d3e177f0443f27e670f0b99299d715c58fd238 (patch) | |
| tree | b55a6e76b5a06f031f3f331875ad7ccd6be3286e /synapse/push | |
| parent | Additional configuration options for auto-join rooms (#7763) (diff) | |
| download | synapse-74d3e177f0443f27e670f0b99299d715c58fd238.tar.xz | |
Back out MSC2625 implementation (#7761)
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/bulk_push_rule_evaluator.py | 7 | ||||
| -rw-r--r-- | synapse/push/push_tools.py | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index 5b00602a56..43ffe6faf0 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -189,11 +189,8 @@ class BulkPushRuleEvaluator(object): ) if matches: actions = [x for x in rule["actions"] if x != "dont_notify"] - if ( - "notify" in actions - or "org.matrix.msc2625.mark_unread" in actions - ): - # Push rules say we should act on this event. + if actions and "notify" in actions: + # Push rules say we should notify the user of this event actions_by_user[uid] = actions break diff --git a/synapse/push/push_tools.py b/synapse/push/push_tools.py index 4ea683fee0..5dae4648c0 100644 --- a/synapse/push/push_tools.py +++ b/synapse/push/push_tools.py @@ -39,10 +39,7 @@ def get_badge_count(store, user_id): ) # return one badge count per conversation, as count per # message is so noisy as to be almost useless - # We're populating this badge using the unread_count (instead of the - # notify_count) as this badge is the number of missed messages, not the - # number of missed notifications. - badge += 1 if notifs.get("unread_count") else 0 + badge += 1 if notifs["notify_count"] else 0 return badge |