summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-06-11 15:30:42 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-06-11 15:30:42 +0100
commitea8f6e611bdc4c2ee3f6fea76893650ba8f0facd (patch)
treec59851f94b42b30988273942105d28cee4b40496
parentAppease mypy (diff)
downloadsynapse-ea8f6e611bdc4c2ee3f6fea76893650ba8f0facd.tar.xz
Actually act on mark_unread
-rw-r--r--synapse/push/bulk_push_rule_evaluator.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py

index e75d964ac8..f7c3db5828 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -191,9 +191,13 @@ class BulkPushRuleEvaluator(object): ) if matches: actions = [x for x in rule["actions"] if x != "dont_notify"] - if actions and "notify" in actions: - # Push rules say we should notify the user of this event - actions_by_user[uid] = actions + if actions: + if ( + "notify" in actions + or "org.matrix.msc2625.mark_unread" in actions + ): + # Push rules say we should act on this event. + actions_by_user[uid] = actions break # Mark in the DB staging area the push actions for users who should be