Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 12:16:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Incorporate review

Browse source
This commit is contained in:
Brendan Abolivier 2020-08-06 10:52:26 +01:00
parent e2f1cccc8a
commit dd11f575a2
No known key found for this signature in database
GPG key ID: 1E015C145F1916CD
4 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
synapse/push/baserules.py
View file

@ -24,6 +24,8 @@ def list_with_base_rules(rawrules, use_new_defaults=False):
Args:
rawrules(list): The rules the user has modified or set.
use_new_defaults(bool): Whether to use the new experimental default rules when
appending or prepending default rules.
Returns:
A new list with the rules set by the user combined with the defaults.
@ -125,11 +127,7 @@ def make_base_prepend_rules(kind, modified_base_rules, use_new_defaults=False):
rules = []
if kind == "override":
rules = (
NEW_PREPEND_OVERRIDE_RULES
if use_new_defaults
else BASE_PREPEND_OVERRIDE_RULES
)
rules = BASE_PREPEND_OVERRIDE_RULES
# Copy the rules before modifying them
rules = copy.deepcopy(rules)
@ -171,16 +169,6 @@ BASE_PREPEND_OVERRIDE_RULES = [
]
NEW_PREPEND_OVERRIDE_RULES = [
{
"rule_id": "global/override/.m.rule.master",
"enabled": False,
"conditions": [],
"actions": [],
}
]
BASE_APPEND_OVERRIDE_RULES = [
{
"rule_id": "global/override/.m.rule.suppress_notices",
@ -573,7 +561,7 @@ for r in BASE_APPEND_CONTENT_RULES:
r["default"] = True
NEW_RULE_IDS.add(r["rule_id"])
for r in NEW_PREPEND_OVERRIDE_RULES:
for r in BASE_PREPEND_OVERRIDE_RULES:
r["priority_class"] = PRIORITY_CLASS_MAP["override"]
r["default"] = True
NEW_RULE_IDS.add(r["rule_id"])