chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

push: Set feature flag per rule instead of per set.

Browse Source 
Allows more flexibility when several feature flags change the same set.
This commit is contained in:
Kévin Commaille 2022-07-16 12:01:47 +02:00 committed by Kévin Commaille
parent d80e7c9c32
commit c63f03912b
2 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ruma-common/Cargo.toml
View File

@ -57,7 +57,7 @@ form_urlencoded = "1.0.0"
getrandom = { version = "0.2.6", optional = true } getrandom = { version = "0.2.6", optional = true }
html5ever = { version = "0.25.2", optional = true } html5ever = { version = "0.25.2", optional = true }
http = { version = "0.2.2", optional = true } http = { version = "0.2.2", optional = true }
indexmap = { version = "1.6.2", features = ["serde-1"] } indexmap = { version = "1.9.1", features = ["serde"] }
itoa = "1.0.1" itoa = "1.0.1"
js_int = { version = "0.2.0", features = ["serde"] } js_int = { version = "0.2.0", features = ["serde"] }
js_option = "0.1.0" js_option = "0.1.0"

39
crates/ruma-common/src/push/predefined.rs
View File

@ -1,8 +1,6 @@
///! Constructors for [predefined push rules]. ///! Constructors for [predefined push rules].
///! ///!
///! [predefined push rules]: https://spec.matrix.org/v1.2/client-server-api/#predefined-rules ///! [predefined push rules]: https://spec.matrix.org/v1.2/client-server-api/#predefined-rules
use indexmap::indexset;
use super::{ use super::{
Action::*, ConditionalPushRule, PatternedPushRule, PushCondition::*, RoomMemberCountIs, Action::*, ConditionalPushRule, PatternedPushRule, PushCondition::*, RoomMemberCountIs,
Ruleset, Tweak, Ruleset, Tweak,
@ -20,9 +18,8 @@ impl Ruleset {
/// user's ID (for instance those to send notifications when they are mentioned). /// user's ID (for instance those to send notifications when they are mentioned).
pub fn server_default(user_id: &UserId) -> Self { pub fn server_default(user_id: &UserId) -> Self {
Self { Self {
content: indexset![PatternedPushRule::contains_user_name(user_id)], content: [PatternedPushRule::contains_user_name(user_id)].into(),
#[cfg(feature = "unstable-msc2677")] override_: [
override_: indexset![
ConditionalPushRule::master(), ConditionalPushRule::master(),
ConditionalPushRule::suppress_notices(), ConditionalPushRule::suppress_notices(),
ConditionalPushRule::invite_for_me(user_id), ConditionalPushRule::invite_for_me(user_id),
@ -30,38 +27,26 @@ impl Ruleset {
ConditionalPushRule::contains_display_name(), ConditionalPushRule::contains_display_name(),
ConditionalPushRule::tombstone(), ConditionalPushRule::tombstone(),
ConditionalPushRule::roomnotif(), ConditionalPushRule::roomnotif(),
#[cfg(feature = "unstable-msc2677")]
ConditionalPushRule::reaction(), ConditionalPushRule::reaction(),
], ]
#[cfg(not(feature = "unstable-msc2677"))] .into(),
override_: indexset![ underride: [
ConditionalPushRule::master(),
ConditionalPushRule::suppress_notices(),
ConditionalPushRule::invite_for_me(user_id),
ConditionalPushRule::member_event(),
ConditionalPushRule::contains_display_name(),
ConditionalPushRule::tombstone(),
ConditionalPushRule::roomnotif(),
],
#[cfg(feature = "unstable-msc3381")]
underride: indexset![
ConditionalPushRule::call(), ConditionalPushRule::call(),
ConditionalPushRule::encrypted_room_one_to_one(), ConditionalPushRule::encrypted_room_one_to_one(),
ConditionalPushRule::room_one_to_one(), ConditionalPushRule::room_one_to_one(),
ConditionalPushRule::message(), ConditionalPushRule::message(),
ConditionalPushRule::encrypted(), ConditionalPushRule::encrypted(),
#[cfg(feature = "unstable-msc3381")]
ConditionalPushRule::poll_start_one_to_one(), ConditionalPushRule::poll_start_one_to_one(),
#[cfg(feature = "unstable-msc3381")]
ConditionalPushRule::poll_start(), ConditionalPushRule::poll_start(),
#[cfg(feature = "unstable-msc3381")]
ConditionalPushRule::poll_end_one_to_one(), ConditionalPushRule::poll_end_one_to_one(),
#[cfg(feature = "unstable-msc3381")]
ConditionalPushRule::poll_end(), ConditionalPushRule::poll_end(),
], ]
#[cfg(not(feature = "unstable-msc3381"))] .into(),
underride: indexset![
ConditionalPushRule::call(),
ConditionalPushRule::encrypted_room_one_to_one(),
ConditionalPushRule::room_one_to_one(),
ConditionalPushRule::message(),
ConditionalPushRule::encrypted(),
],
..Default::default() ..Default::default()
} }
} }