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

push-rule: Stabilize default room server ACL push rule

Browse Source
This commit is contained in:
Kévin Commaille 2022-09-30 19:17:39 +02:00 committed by Kévin Commaille
parent a091faa7d2
commit 5b25f2f223
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/ruma-common/CHANGELOG.md
View File

@ -9,6 +9,7 @@ Breaking changes:
Improvements: Improvements:
* Add `MatrixVersion::V1_4` * Add `MatrixVersion::V1_4`
* Stabilize default room server ACL push rule
# 0.10.3 # 0.10.3

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

@ -47,7 +47,6 @@ unstable-msc3551 = ["unstable-msc1767"]
unstable-msc3552 = ["unstable-msc3551"] unstable-msc3552 = ["unstable-msc3551"]
unstable-msc3553 = ["unstable-msc3552"] unstable-msc3553 = ["unstable-msc3552"]
unstable-msc3554 = ["unstable-msc1767"] unstable-msc3554 = ["unstable-msc1767"]
unstable-msc3786 = []
unstable-msc3827 = [] unstable-msc3827 = []
unstable-pdu = [] unstable-pdu = []
unstable-sanitize = ["dep:html5ever", "dep:phf"] unstable-sanitize = ["dep:html5ever", "dep:phf"]

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

@ -26,7 +26,6 @@ impl Ruleset {
ConditionalPushRule::member_event(), ConditionalPushRule::member_event(),
ConditionalPushRule::contains_display_name(), ConditionalPushRule::contains_display_name(),
ConditionalPushRule::tombstone(), ConditionalPushRule::tombstone(),
#[cfg(feature = "unstable-msc3786")]
ConditionalPushRule::server_acl(), ConditionalPushRule::server_acl(),
ConditionalPushRule::roomnotif(), ConditionalPushRule::roomnotif(),
#[cfg(feature = "unstable-msc2677")] #[cfg(feature = "unstable-msc2677")]
@ -174,14 +173,13 @@ impl ConditionalPushRule {
/// Matches [room server ACLs]. /// Matches [room server ACLs].
/// ///
/// [room server ACLs]: https://spec.matrix.org/v1.3/client-server-api/#server-access-control-lists-acls-for-rooms /// [room server ACLs]: https://spec.matrix.org/v1.4/client-server-api/#server-access-control-lists-acls-for-rooms
#[cfg(feature = "unstable-msc3786")]
pub fn server_acl() -> Self { pub fn server_acl() -> Self {
Self { Self {
actions: vec![], actions: vec![],
default: true, default: true,
enabled: true, enabled: true,
rule_id: ".org.matrix.msc3786.rule.room.server_acl".into(), rule_id: ".m.rule.room.server_acl".into(),
conditions: vec![ conditions: vec![
EventMatch { key: "type".into(), pattern: "m.room.server_acl".into() }, EventMatch { key: "type".into(), pattern: "m.room.server_acl".into() },
EventMatch { key: "state_key".into(), pattern: "".into() }, EventMatch { key: "state_key".into(), pattern: "".into() },

2
crates/ruma/Cargo.toml
View File

@ -157,7 +157,6 @@ unstable-msc3554 = ["ruma-common/unstable-msc3554"]
unstable-msc3575 = ["ruma-client-api?/unstable-msc3575"] unstable-msc3575 = ["ruma-client-api?/unstable-msc3575"]
unstable-msc3618 = ["ruma-federation-api?/unstable-msc3618"] unstable-msc3618 = ["ruma-federation-api?/unstable-msc3618"]
unstable-msc3723 = ["ruma-federation-api?/unstable-msc3723"] unstable-msc3723 = ["ruma-federation-api?/unstable-msc3723"]
unstable-msc3786 = ["ruma-common/unstable-msc3786"]
unstable-msc3827 = ["ruma-common/unstable-msc3827"] unstable-msc3827 = ["ruma-common/unstable-msc3827"]
unstable-pdu = ["ruma-common/unstable-pdu"] unstable-pdu = ["ruma-common/unstable-pdu"]
unstable-sanitize = ["ruma-common/unstable-sanitize"] unstable-sanitize = ["ruma-common/unstable-sanitize"]
@ -195,7 +194,6 @@ __ci = [
"unstable-msc3575", "unstable-msc3575",
"unstable-msc3618", "unstable-msc3618",
"unstable-msc3723", "unstable-msc3723",
"unstable-msc3786",
"unstable-msc3827", "unstable-msc3827",
] ]