1 files changed, 9 insertions, 1 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py
index ec917c2398..c211c58923 100644
--- a/synapse/push/bulk_push_rule_evaluator.py
+++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -139,8 +139,16 @@ class BulkPushRuleEvaluator:
evaluator, rule['conditions'], uid, display_name, condition_cache
)
if matches:
+ notify = False
+ actions = []
+ for a in rule['actions']:
+ if a != 'dont_notify':
+ actions.append(a)
+ elif a == 'notify':
+ notify = True
+
actions = [x for x in rule['actions'] if x != 'dont_notify']
- if actions:
+ if actions and notify:
actions_by_user[uid] = actions
break
defer.returnValue(actions_by_user)
|