mirror of
https://github.com/element-hq/synapse
synced 2024-09-05 22:20:06 +00:00
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
This commit is contained in:
commit
c9500a9c1d
1 changed files with 3 additions and 2 deletions
|
@ -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']
|
||||||
|
|
Loading…
Reference in a new issue