Merge pull request #523 from matrix-org/dbkr/no_push_unless_notify

Better fix for actions with both dont_notify and tweaks

synapse/push/bulk_push_rule_evaluator.py

@@ -139,16 +139,8 @@ 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 and notify:
+                    if actions and 'notify' in actions:
                         actions_by_user[uid] = actions
                     break
         defer.returnValue(actions_by_user)