tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

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

Browse source 
Don't add notifications to the table unless there's actually a 'notify' action
This commit is contained in:
David Baker 2016-01-22 17:06:52 +00:00
commit 0e0e441b33
1 changed files with 9 additions and 1 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,8 +139,16 @@ 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: if actions and notify:
actions_by_user[uid] = actions actions_by_user[uid] = actions
break break
defer.returnValue(actions_by_user) defer.returnValue(actions_by_user)