diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-02-01 06:24:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-01 06:24:02 -0500 |
| commit | 73403d5e5e7740e96834a364f81ad8e00e3f2f0e (patch) | |
| tree | 6b6fa0c2910a46e558c8a70a086028363648c92e | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-73403d5e5e7740e96834a364f81ad8e00e3f2f0e.tar.xz | |
Fix inconsistencies between MSC3952 and implementation. (#14957)
* Correct the push rule IDs. * Removes the sound tweak for room notifications.
| -rw-r--r-- | changelog.d/14957.feature | 1 | ||||
| -rw-r--r-- | rust/src/push/base_rules.rs | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/changelog.d/14957.feature b/changelog.d/14957.feature new file mode 100644 index 0000000000..8293e99eff --- /dev/null +++ b/changelog.d/14957.feature @@ -0,0 +1 @@ +Experimental support for [MSC3952](https://github.com/matrix-org/matrix-spec-proposals/pull/3952): intentional mentions. diff --git a/rust/src/push/base_rules.rs b/rust/src/push/base_rules.rs index 880eed0ef4..49add4e951 100644 --- a/rust/src/push/base_rules.rs +++ b/rust/src/push/base_rules.rs @@ -132,7 +132,7 @@ pub const BASE_APPEND_OVERRIDE_RULES: &[PushRule] = &[ default_enabled: true, }, PushRule { - rule_id: Cow::Borrowed(".org.matrix.msc3952.is_user_mentioned"), + rule_id: Cow::Borrowed(".org.matrix.msc3952.is_user_mention"), priority_class: 5, conditions: Cow::Borrowed(&[Condition::Known(KnownCondition::IsUserMention)]), actions: Cow::Borrowed(&[Action::Notify, HIGHLIGHT_ACTION, SOUND_ACTION]), @@ -148,7 +148,7 @@ pub const BASE_APPEND_OVERRIDE_RULES: &[PushRule] = &[ default_enabled: true, }, PushRule { - rule_id: Cow::Borrowed(".org.matrix.msc3952.is_room_mentioned"), + rule_id: Cow::Borrowed(".org.matrix.msc3952.is_room_mention"), priority_class: 5, conditions: Cow::Borrowed(&[ Condition::Known(KnownCondition::IsRoomMention), @@ -156,7 +156,7 @@ pub const BASE_APPEND_OVERRIDE_RULES: &[PushRule] = &[ key: Cow::Borrowed("room"), }), ]), - actions: Cow::Borrowed(&[Action::Notify, HIGHLIGHT_ACTION, SOUND_ACTION]), + actions: Cow::Borrowed(&[Action::Notify, HIGHLIGHT_ACTION]), default: true, default_enabled: true, }, |