Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't add notifications to the table unless there's actually a 'notify' action

Browse Source
This commit is contained in:
David Baker 2016-01-22 16:56:48 +00:00
parent 74f49f99f9
commit b4a41aa542
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

@ -135,8 +135,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)