mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-14 02:13:46 +01:00
Co-authored-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
This commit is contained in:
parent
e363881592
commit
4ffed6330f
2 changed files with 5 additions and 4 deletions
1
changelog.d/17043.bugfix
Normal file
1
changelog.d/17043.bugfix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Fix the `.m.rule.encrypted_room_one_to_one` and `.m.rule.room_one_to_one` default underride push rules being in the wrong order. Contributed by @Sumpy1.
|
|
@ -304,12 +304,12 @@ pub const BASE_APPEND_UNDERRIDE_RULES: &[PushRule] = &[
|
||||||
default_enabled: true,
|
default_enabled: true,
|
||||||
},
|
},
|
||||||
PushRule {
|
PushRule {
|
||||||
rule_id: Cow::Borrowed("global/underride/.m.rule.room_one_to_one"),
|
rule_id: Cow::Borrowed("global/underride/.m.rule.encrypted_room_one_to_one"),
|
||||||
priority_class: 1,
|
priority_class: 1,
|
||||||
conditions: Cow::Borrowed(&[
|
conditions: Cow::Borrowed(&[
|
||||||
Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
|
Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
|
||||||
key: Cow::Borrowed("type"),
|
key: Cow::Borrowed("type"),
|
||||||
pattern: Cow::Borrowed("m.room.message"),
|
pattern: Cow::Borrowed("m.room.encrypted"),
|
||||||
})),
|
})),
|
||||||
Condition::Known(KnownCondition::RoomMemberCount {
|
Condition::Known(KnownCondition::RoomMemberCount {
|
||||||
is: Some(Cow::Borrowed("2")),
|
is: Some(Cow::Borrowed("2")),
|
||||||
|
@ -320,12 +320,12 @@ pub const BASE_APPEND_UNDERRIDE_RULES: &[PushRule] = &[
|
||||||
default_enabled: true,
|
default_enabled: true,
|
||||||
},
|
},
|
||||||
PushRule {
|
PushRule {
|
||||||
rule_id: Cow::Borrowed("global/underride/.m.rule.encrypted_room_one_to_one"),
|
rule_id: Cow::Borrowed("global/underride/.m.rule.room_one_to_one"),
|
||||||
priority_class: 1,
|
priority_class: 1,
|
||||||
conditions: Cow::Borrowed(&[
|
conditions: Cow::Borrowed(&[
|
||||||
Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
|
Condition::Known(KnownCondition::EventMatch(EventMatchCondition {
|
||||||
key: Cow::Borrowed("type"),
|
key: Cow::Borrowed("type"),
|
||||||
pattern: Cow::Borrowed("m.room.encrypted"),
|
pattern: Cow::Borrowed("m.room.message"),
|
||||||
})),
|
})),
|
||||||
Condition::Known(KnownCondition::RoomMemberCount {
|
Condition::Known(KnownCondition::RoomMemberCount {
|
||||||
is: Some(Cow::Borrowed("2")),
|
is: Some(Cow::Borrowed("2")),
|
||||||
|
|
Loading…
Reference in a new issue