diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-10-04 07:08:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 07:08:27 -0400 |
| commit | e70c6b720ed537c0b7fc0cd4aa20eac195941d73 (patch) | |
| tree | 72150316ef07b8daec001a6b2435f4f1a72a28ef /rust/src | |
| parent | Send the appservice access token as a header. (#13996) (diff) | |
| download | synapse-e70c6b720ed537c0b7fc0cd4aa20eac195941d73.tar.xz | |
Disable pushing for server ACL events (MSC3786). (#13997)
Switches to the stable identifier for MSC3786 and enables it by default. This disables pushes of m.room.server_acl events.
Diffstat (limited to 'rust/src')
| -rw-r--r-- | rust/src/push/base_rules.rs | 2 | ||||
| -rw-r--r-- | rust/src/push/mod.rs | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/rust/src/push/base_rules.rs b/rust/src/push/base_rules.rs index bb59676bde..2a09cf99ae 100644 --- a/rust/src/push/base_rules.rs +++ b/rust/src/push/base_rules.rs @@ -173,7 +173,7 @@ pub const BASE_APPEND_OVERRIDE_RULES: &[PushRule] = &[ default_enabled: true, }, PushRule { - rule_id: Cow::Borrowed("global/override/.org.matrix.msc3786.rule.room.server_acl"), + rule_id: Cow::Borrowed("global/override/.m.rule.room.server_acl"), priority_class: 5, conditions: Cow::Borrowed(&[ Condition::Known(KnownCondition::EventMatch(EventMatchCondition { diff --git a/rust/src/push/mod.rs b/rust/src/push/mod.rs index 30fffc31ad..208b9c0d73 100644 --- a/rust/src/push/mod.rs +++ b/rust/src/push/mod.rs @@ -401,7 +401,6 @@ impl PushRules { pub struct FilteredPushRules { push_rules: PushRules, enabled_map: BTreeMap<String, bool>, - msc3786_enabled: bool, msc3772_enabled: bool, } @@ -411,13 +410,11 @@ impl FilteredPushRules { pub fn py_new( push_rules: PushRules, enabled_map: BTreeMap<String, bool>, - msc3786_enabled: bool, msc3772_enabled: bool, ) -> Self { Self { push_rules, enabled_map, - msc3786_enabled, msc3772_enabled, } } @@ -437,12 +434,6 @@ impl FilteredPushRules { .iter() .filter(|rule| { // Ignore disabled experimental push rules - if !self.msc3786_enabled - && rule.rule_id == "global/override/.org.matrix.msc3786.rule.room.server_acl" - { - return false; - } - if !self.msc3772_enabled && rule.rule_id == "global/underride/.org.matrix.msc3772.thread_reply" { |