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

Merge pull request #678 from matrix-org/dbkr/push_obey_enable 

Don't ignore the obey overlay if the rule has an enabled attribute of False
pull/679/head
David Baker 2016-03-31 10:26:22 +01:00
parent a68c1b15aa c27c51484a
commit c9500a9c1d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/push/push_rule_evaluator.py
View File

@ -133,8 +133,9 @@ class PushRuleEvaluator:
enabled = self.enabled_map.get(r['rule_id'], None) enabled = self.enabled_map.get(r['rule_id'], None)
if enabled is not None and not enabled: if enabled is not None and not enabled:
continue continue
elif enabled is None and not r.get("enabled", True):
if not r.get("enabled", True): # if no override, check enabled on the rule itself
# (may have come from a base rule)
continue continue
conditions = r['conditions'] conditions = r['conditions']