diff options
| author | David Baker <dave@matrix.org> | 2016-01-22 17:21:15 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-01-22 17:21:15 +0000 |
| commit | 60965bd7e5a27d3952116c431f54786380643d05 (patch) | |
| tree | 39227aed811880ffbcd5a23c07a08b1f8edead22 /synapse/push | |
| parent | Don't add notifications to the table unless there's actually a 'notify' action (diff) | |
| download | synapse-60965bd7e5a27d3952116c431f54786380643d05.tar.xz | |
Revert b4a41aa542203c03bb8a6c93097b94bc5d167265 as it's just broken.
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/bulk_push_rule_evaluator.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index c4cc85eb4b..06250d2d96 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -135,16 +135,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: actions_by_user[uid] = actions break defer.returnValue(actions_by_user) |