summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-22 17:21:58 +0000
committerDavid Baker <dave@matrix.org>2016-01-22 17:21:58 +0000
commit3fe8c5673605074035f132185a143bcaded1a734 (patch)
tree4f5f625583e3c2be0db056cc1d8e7e48a0d9e80f
parentRevert b4a41aa542203c03bb8a6c93097b94bc5d167265 as it's just broken. (diff)
downloadsynapse-3fe8c5673605074035f132185a143bcaded1a734.tar.xz
Better fix for actions with both dont_notify and tweaks
-rw-r--r--synapse/push/bulk_push_rule_evaluator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py
index 06250d2d96..5abab80e67 100644
--- a/synapse/push/bulk_push_rule_evaluator.py
+++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -136,7 +136,7 @@ class BulkPushRuleEvaluator:
                 )
                 if matches:
                     actions = [x for x in rule['actions'] if x != 'dont_notify']
-                    if actions:
+                    if actions and 'notify' in actions:
                         actions_by_user[uid] = actions
                     break
         defer.returnValue(actions_by_user)