diff --git a/crates/ruma-client-api/CHANGELOG.md b/crates/ruma-client-api/CHANGELOG.md index 2706cf9f..4de586fb 100644 --- a/crates/ruma-client-api/CHANGELOG.md +++ b/crates/ruma-client-api/CHANGELOG.md @@ -11,7 +11,7 @@ Improvements: * Add support for refresh tokens (MSC2918) * Add `ErrorKind::{UnableToAuthorizeJoin, UnableToGrantJoin}` encountered for restricted rooms * Add unstable support for timestamp massaging (MSC3316) -* Add unstable support for querying relating events (MSC2675) +* Add support for querying relating events (MSC2675) * Move `filter::RelationType` to `ruma_common::events::relations` * Add unstable support for discovering an OpenID Connect server (MSC2965) diff --git a/crates/ruma-client-api/Cargo.toml b/crates/ruma-client-api/Cargo.toml index febdb8c4..32624989 100644 --- a/crates/ruma-client-api/Cargo.toml +++ b/crates/ruma-client-api/Cargo.toml @@ -22,7 +22,6 @@ unstable-msc2246 = [] unstable-msc2666 = [] unstable-msc2448 = [] unstable-msc2654 = [] -unstable-msc2675 = [] unstable-msc2676 = [] unstable-msc2677 = [] unstable-msc2965 = [] diff --git a/crates/ruma-client-api/src/lib.rs b/crates/ruma-client-api/src/lib.rs index 2417cb5d..86341025 100644 --- a/crates/ruma-client-api/src/lib.rs +++ b/crates/ruma-client-api/src/lib.rs @@ -32,7 +32,6 @@ pub mod push; pub mod read_marker; pub mod receipt; pub mod redact; -#[cfg(feature = "unstable-msc2675")] pub mod relations; pub mod room; pub mod search; diff --git a/crates/ruma-client-api/src/relations/get_relating_events.rs b/crates/ruma-client-api/src/relations/get_relating_events.rs index d7cc8db2..ad6ffc0d 100644 --- a/crates/ruma-client-api/src/relations/get_relating_events.rs +++ b/crates/ruma-client-api/src/relations/get_relating_events.rs @@ -3,9 +3,9 @@ //! Retrieve all of the child events for a given parent event. pub mod v1 { - //! `/unstable/` ([MSC2675]) + //! `/v1/` ([spec]) //! - //! [MSC2675]: https://github.com/matrix-org/matrix-spec-proposals/pull/2675 + //! [spec]: https://spec.matrix.org/v1.3/client-server-api/#get_matrixclientv1roomsroomidrelationseventid use js_int::UInt; use ruma_common::{api::ruma_api, events::AnyMessageLikeEvent, serde::Raw, EventId, RoomId}; @@ -16,8 +16,10 @@ pub mod v1 { method: GET, name: "get_relating_events", unstable_path: "/_matrix/client/unstable/rooms/:room_id/relations/:event_id", + stable_path: "/_matrix/client/v1/rooms/:room_id/relations/:event_id", rate_limited: false, authentication: AccessToken, + added: 1.3, } request: { diff --git a/crates/ruma-client-api/src/relations/get_relating_events_with_rel_type.rs b/crates/ruma-client-api/src/relations/get_relating_events_with_rel_type.rs index 451b8190..a58a4968 100644 --- a/crates/ruma-client-api/src/relations/get_relating_events_with_rel_type.rs +++ b/crates/ruma-client-api/src/relations/get_relating_events_with_rel_type.rs @@ -4,9 +4,9 @@ //! using the given `rel_type`. pub mod v1 { - //! `/unstable/` ([MSC2675]) + //! `/v1/` ([spec]) //! - //! [MSC2675]: https://github.com/matrix-org/matrix-spec-proposals/pull/2675 + //! [spec]: https://spec.matrix.org/v1.3/client-server-api/#get_matrixclientv1roomsroomidrelationseventidreltype use js_int::UInt; use ruma_common::{ @@ -22,8 +22,10 @@ pub mod v1 { method: GET, name: "get_relating_events_with_rel_type", unstable_path: "/_matrix/client/unstable/rooms/:room_id/relations/:event_id/:rel_type", + stable_path: "/_matrix/client/v1/rooms/:room_id/relations/:event_id/:rel_type", rate_limited: false, authentication: AccessToken, + added: 1.3, } request: { diff --git a/crates/ruma-client-api/src/relations/get_relating_events_with_rel_type_and_event_type.rs b/crates/ruma-client-api/src/relations/get_relating_events_with_rel_type_and_event_type.rs index 0996b086..43c8254d 100644 --- a/crates/ruma-client-api/src/relations/get_relating_events_with_rel_type_and_event_type.rs +++ b/crates/ruma-client-api/src/relations/get_relating_events_with_rel_type_and_event_type.rs @@ -4,9 +4,9 @@ //! using the given `rel_type` and having the given `event_type`. pub mod v1 { - //! `/unstable/` ([MSC2675]) + //! `/v1/` ([spec]) //! - //! [MSC2675]: https://github.com/matrix-org/matrix-spec-proposals/pull/2675 + //! [spec]: https://spec.matrix.org/v1.3/client-server-api/#get_matrixclientv1roomsroomidrelationseventidreltypeeventtype use js_int::UInt; use ruma_common::{ @@ -22,8 +22,10 @@ pub mod v1 { method: GET, name: "get_relating_events_with_rel_type_and_event_type", unstable_path: "/_matrix/client/unstable/rooms/:room_id/relations/:event_id/:rel_type/:event_type", + stable_path: "/_matrix/client/v1/rooms/:room_id/relations/:event_id/:rel_type/:event_type", rate_limited: false, authentication: AccessToken, + added: 1.3, } request: { diff --git a/crates/ruma/Cargo.toml b/crates/ruma/Cargo.toml index f0baa4a7..2f2e9f9d 100644 --- a/crates/ruma/Cargo.toml +++ b/crates/ruma/Cargo.toml @@ -126,7 +126,6 @@ unstable-msc2448 = [ unstable-msc2654 = ["ruma-client-api?/unstable-msc2654"] unstable-msc2666 = ["ruma-client-api?/unstable-msc2666"] unstable-msc2675 = [ - "ruma-client-api?/unstable-msc2675", "ruma-common/unstable-msc2675", ] unstable-msc2676 = [