summary refs log tree commit diff
path: root/synapse/storage/databases/main
diff options
context:
space:
mode:
authorTravis Ralston <travisr@matrix.org>2022-11-28 18:02:41 -0700
committerGitHub <noreply@github.com>2022-11-28 18:02:41 -0700
commit9ccc09fe9e332a71b8cf5bf42b16f6acf5a6887d (patch)
tree2fd03d66046efdd5592ea77bfc27b119e7a52705 /synapse/storage/databases/main
parentCreate MSC1767 (extensible events) room version; Implement MSC3932 (#14521) (diff)
downloadsynapse-9ccc09fe9e332a71b8cf5bf42b16f6acf5a6887d.tar.xz
Support MSC1767's `content.body` behaviour; Add base rules from MSC3933 (#14524)
* Support MSC1767's `content.body` behaviour in push rules

* Add the base rules from MSC3933

* Changelog entry

* Flip condition around for finding `m.markup`

* Remove forgotten import
Diffstat (limited to 'synapse/storage/databases/main')
-rw-r--r--synapse/storage/databases/main/push_rule.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/push_rule.py b/synapse/storage/databases/main/push_rule.py
index 12ad44dbb3..d4c64c46ad 100644
--- a/synapse/storage/databases/main/push_rule.py
+++ b/synapse/storage/databases/main/push_rule.py
@@ -84,7 +84,10 @@ def _load_rules(
     push_rules = PushRules(ruleslist)
 
     filtered_rules = FilteredPushRules(
-        push_rules, enabled_map, msc3664_enabled=experimental_config.msc3664_enabled
+        push_rules,
+        enabled_map,
+        msc3664_enabled=experimental_config.msc3664_enabled,
+        msc1767_enabled=experimental_config.msc1767_enabled,
     )
 
     return filtered_rules