OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Better fix for actions with both dont_notify and tweaks
pull/527/head
David Baker 2016-01-22 17:27:25 +00:00
parent 0e0e441b33 3fe8c56736
commit f92fe15897
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/push/bulk_push_rule_evaluator.py
View File

@ -139,16 +139,8 @@ class BulkPushRuleEvaluator:
evaluator, rule['conditions'], uid, display_name, condition_cache evaluator, rule['conditions'], uid, display_name, condition_cache
) )
if matches: 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'] 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 actions_by_user[uid] = actions
break break
defer.returnValue(actions_by_user) defer.returnValue(actions_by_user)