summary refs log tree commit diff
diff options
context:
space:
mode:
authorKarlinde <Karlinde@users.noreply.github.com>2020-03-31 16:08:56 +0200
committerGitHub <noreply@github.com>2020-03-31 15:08:56 +0100
commitfe1580bfd91151c2c375d3c403ed911828f3899e (patch)
tree1120e802ce7ce5729f5708734ff210a120a6e78a
parentOnly setdefault for signatures if device has key_json (#7177) (diff)
downloadsynapse-fe1580bfd91151c2c375d3c403ed911828f3899e.tar.xz
Fill in the 'default' field for user-defined push rules (#6639)
Signed-off-by: Karl Linderhed <git@karlinde.se>
-rw-r--r--changelog.d/6639.bugfix1
-rw-r--r--synapse/storage/data_stores/main/push_rule.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/6639.bugfix b/changelog.d/6639.bugfix
new file mode 100644

index 0000000000..c7593a6e84 --- /dev/null +++ b/changelog.d/6639.bugfix
@@ -0,0 +1 @@ +Fix missing field `default` when fetching user-defined push rules. diff --git a/synapse/storage/data_stores/main/push_rule.py b/synapse/storage/data_stores/main/push_rule.py
index 62ac88d9f2..46f9bda773 100644 --- a/synapse/storage/data_stores/main/push_rule.py +++ b/synapse/storage/data_stores/main/push_rule.py
@@ -41,6 +41,7 @@ def _load_rules(rawrules, enabled_map): rule = dict(rawrule) rule["conditions"] = json.loads(rawrule["conditions"]) rule["actions"] = json.loads(rawrule["actions"]) + rule["default"] = False ruleslist.append(rule) # We're going to be mutating this a lot, so do a deep copy