|
|
@@ -527,6 +527,7 @@ pub struct FilteredPushRules { |
|
|
|
msc1767_enabled: bool, |
|
|
|
msc3381_polls_enabled: bool, |
|
|
|
msc3664_enabled: bool, |
|
|
|
msc4028_push_encrypted_events: bool, |
|
|
|
} |
|
|
|
|
|
|
|
#[pymethods] |
|
|
@@ -538,6 +539,7 @@ impl FilteredPushRules { |
|
|
|
msc1767_enabled: bool, |
|
|
|
msc3381_polls_enabled: bool, |
|
|
|
msc3664_enabled: bool, |
|
|
|
msc4028_push_encrypted_events: bool, |
|
|
|
) -> Self { |
|
|
|
Self { |
|
|
|
push_rules, |
|
|
@@ -545,6 +547,7 @@ impl FilteredPushRules { |
|
|
|
msc1767_enabled, |
|
|
|
msc3381_polls_enabled, |
|
|
|
msc3664_enabled, |
|
|
|
msc4028_push_encrypted_events, |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
@@ -581,6 +584,12 @@ impl FilteredPushRules { |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
if !self.msc4028_push_encrypted_events |
|
|
|
&& rule.rule_id == "global/override/.org.matrix.msc4028.encrypted_event" |
|
|
|
{ |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
true |
|
|
|
}) |
|
|
|
.map(|r| { |
|
|
|