Browse Source

Do not return extensible events experimental push rules by default. (#15494)

tags/v1.83.0rc1
Patrick Cloke 1 year ago
committed by GitHub
parent
commit
e2e9b545ff
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
  1. +1
    -0
      changelog.d/15494.bugfix
  2. +4
    -1
      rust/src/push/mod.rs

+ 1
- 0
changelog.d/15494.bugfix View File

@@ -0,0 +1 @@
Fix a bug introduced in Synapse 1.73.0 where some experimental push rules were returned by default.

+ 4
- 1
rust/src/push/mod.rs View File

@@ -568,7 +568,10 @@ impl FilteredPushRules {
.filter(|rule| {
// Ignore disabled experimental push rules

if !self.msc1767_enabled && rule.rule_id.contains("org.matrix.msc1767") {
if !self.msc1767_enabled
&& (rule.rule_id.contains("org.matrix.msc1767")
|| rule.rule_id.contains("org.matrix.msc3933"))
{
return false;
}



Loading…
Cancel
Save