diff --git a/crates/ruma-common/CHANGELOG.md b/crates/ruma-common/CHANGELOG.md index 1a8cca2a..d125558b 100644 --- a/crates/ruma-common/CHANGELOG.md +++ b/crates/ruma-common/CHANGELOG.md @@ -9,6 +9,7 @@ Breaking changes: Improvements: * Add `MatrixVersion::V1_4` +* Stabilize default room server ACL push rule # 0.10.3 diff --git a/crates/ruma-common/Cargo.toml b/crates/ruma-common/Cargo.toml index 9cb1df92..25fdc2c5 100644 --- a/crates/ruma-common/Cargo.toml +++ b/crates/ruma-common/Cargo.toml @@ -47,7 +47,6 @@ unstable-msc3551 = ["unstable-msc1767"] unstable-msc3552 = ["unstable-msc3551"] unstable-msc3553 = ["unstable-msc3552"] unstable-msc3554 = ["unstable-msc1767"] -unstable-msc3786 = [] unstable-msc3827 = [] unstable-pdu = [] unstable-sanitize = ["dep:html5ever", "dep:phf"] diff --git a/crates/ruma-common/src/push/predefined.rs b/crates/ruma-common/src/push/predefined.rs index 98afe9f9..992ed7dc 100644 --- a/crates/ruma-common/src/push/predefined.rs +++ b/crates/ruma-common/src/push/predefined.rs @@ -26,7 +26,6 @@ impl Ruleset { ConditionalPushRule::member_event(), ConditionalPushRule::contains_display_name(), ConditionalPushRule::tombstone(), - #[cfg(feature = "unstable-msc3786")] ConditionalPushRule::server_acl(), ConditionalPushRule::roomnotif(), #[cfg(feature = "unstable-msc2677")] @@ -174,14 +173,13 @@ impl ConditionalPushRule { /// Matches [room server ACLs]. /// - /// [room server ACLs]: https://spec.matrix.org/v1.3/client-server-api/#server-access-control-lists-acls-for-rooms - #[cfg(feature = "unstable-msc3786")] + /// [room server ACLs]: https://spec.matrix.org/v1.4/client-server-api/#server-access-control-lists-acls-for-rooms pub fn server_acl() -> Self { Self { actions: vec![], default: true, enabled: true, - rule_id: ".org.matrix.msc3786.rule.room.server_acl".into(), + rule_id: ".m.rule.room.server_acl".into(), conditions: vec![ EventMatch { key: "type".into(), pattern: "m.room.server_acl".into() }, EventMatch { key: "state_key".into(), pattern: "".into() }, diff --git a/crates/ruma/Cargo.toml b/crates/ruma/Cargo.toml index 244f69d3..17ad66b2 100644 --- a/crates/ruma/Cargo.toml +++ b/crates/ruma/Cargo.toml @@ -157,7 +157,6 @@ unstable-msc3554 = ["ruma-common/unstable-msc3554"] unstable-msc3575 = ["ruma-client-api?/unstable-msc3575"] unstable-msc3618 = ["ruma-federation-api?/unstable-msc3618"] unstable-msc3723 = ["ruma-federation-api?/unstable-msc3723"] -unstable-msc3786 = ["ruma-common/unstable-msc3786"] unstable-msc3827 = ["ruma-common/unstable-msc3827"] unstable-pdu = ["ruma-common/unstable-pdu"] unstable-sanitize = ["ruma-common/unstable-sanitize"] @@ -195,7 +194,6 @@ __ci = [ "unstable-msc3575", "unstable-msc3618", "unstable-msc3723", - "unstable-msc3786", "unstable-msc3827", ]