Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

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

Merged
merged 2 commits into from
Apr 26, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
448c857
Do not return experimental push rules by default.
clokep Apr 26, 2023
c3964fc
Newsfragment
clokep Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/15494.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug introduced in Synapse 1.73.0 where some experimental push rules were returned by default.
5 changes: 4 additions & 1 deletion rust/src/push/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
{
Comment on lines +571 to +574
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wouldn't be naturally obvious to me that msc1767_enabled controls enables both of these. (I can see that the second explicitly builds on the former though.)

I guess we can rip out these experimental guards some day, and this isn't going to live around forever?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wouldn't be naturally obvious to me that msc1767_enabled controls enables both of these. (I can see that the second explicitly builds on the former though.)

I guess we can rip out these experimental guards some day, and this isn't going to live around forever?

Me neither, the comment for the experimental config flag says "MSC1767 and friends"... There's like 4 or 5 other MSCs all related and it is confusing IMO.

So yes, hopefully we burn this with fire at some point?

return false;
}

Expand Down