|
|
@@ -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" |
|
|
|
{ |
|
|
|