client-api: Stabilize authenticated media endpoints

According to Matrix 1.11

crates/ruma-client-api/CHANGELOG.md

@@ -14,7 +14,8 @@ Improvements:
 - Heroes in `sync::sync_events::v4`: `SyncRequestList` and `RoomSubscription`
   both have a new `include_heroes` field. `SlidingSyncRoom` has a new `heroes`
   field, with a new type `SlidingSyncRoomHero`.
-- Add unstable support for authenticated media endpoints, according to MSC3916.
+- Add support for authenticated media endpoints, according to MSC3916 / Matrix
+  1.11.
 
 Bug fixes:
 

crates/ruma-client-api/Cargo.toml

@@ -48,7 +48,6 @@ unstable-msc3488 = []
 unstable-msc3575 = []
 unstable-msc3814 = []
 unstable-msc3843 = []
-unstable-msc3916 = []
 unstable-msc3983 = []
 unstable-msc4108 = []
 unstable-msc4121 = []

crates/ruma-client-api/src/authenticated_media.rs

@@ -1,6 +1,6 @@
-//! Authenticated endpoints for the media repository, according to [MSC3916].
+//! Authenticated endpoints for the [content repository].
 //!
-//! [MSC3916]: https://github.com/matrix-org/matrix-spec-proposals/pull/3916
+//! [content repository]: https://spec.matrix.org/latest/client-server-api/#content-repository
 
 pub mod get_content;
 pub mod get_content_as_filename;

crates/ruma-client-api/src/authenticated_media/get_content.rs

@@ -2,10 +2,10 @@
 //!
 //! Retrieve content from the media store.
 
-pub mod unstable {
-    //! `/unstable/org.matrix.msc3916/` ([MSC])
+pub mod v1 {
+    //! `/v1/` ([spec])
     //!
-    //! [MSC]: https://github.com/matrix-org/matrix-spec-proposals/pull/3916
+    //! [spec]: https://spec.matrix.org/latest/client-server-api/#get_matrixclientv1mediadownloadservernamemediaid
 
     use std::time::Duration;
 
@@ -17,10 +17,11 @@ pub mod unstable {
 
     const METADATA: Metadata = metadata! {
         method: GET,
-        rate_limited: false,
+        rate_limited: true,
         authentication: AccessToken,
         history: {
             unstable => "/_matrix/client/unstable/org.matrix.msc3916/media/download/:server_name/:media_id",
+            1.11 => "/_matrix/client/v1/media/download/:server_name/:media_id",
         }
     };
 

crates/ruma-client-api/src/authenticated_media/get_content_as_filename.rs

@@ -2,10 +2,10 @@
 //!
 //! Retrieve content from the media store, specifying a filename to return.
 
-pub mod unstable {
-    //! `/unstable/org.matrix.msc3916/` ([MSC])
+pub mod v1 {
+    //! `/v1/` ([spec])
     //!
-    //! [MSC]: https://github.com/matrix-org/matrix-spec-proposals/pull/3916
+    //! [spec]: https://spec.matrix.org/latest/client-server-api/#get_matrixclientv1mediadownloadservernamemediaidfilename
 
     use std::time::Duration;
 
@@ -17,10 +17,11 @@ pub mod unstable {
 
     const METADATA: Metadata = metadata! {
         method: GET,
-        rate_limited: false,
+        rate_limited: true,
         authentication: AccessToken,
         history: {
             unstable => "/_matrix/client/unstable/org.matrix.msc3916/media/download/:server_name/:media_id/:filename",
+            1.11 => "/_matrix/client/v1/media/download/:server_name/:media_id/:filename",
         }
     };
 

crates/ruma-client-api/src/authenticated_media/get_content_thumbnail.rs

@@ -2,10 +2,10 @@
 //!
 //! Get a thumbnail of content from the media store.
 
-pub mod unstable {
-    //! `/unstable/org.matrix.msc3916/` ([MSC])
+pub mod v1 {
+    //! `/v1/` ([spec])
     //!
-    //! [MSC]: https://github.com/matrix-org/matrix-spec-proposals/pull/3916
+    //! [spec]: https://spec.matrix.org/latest/client-server-api/#get_matrixclientv1mediathumbnailservernamemediaid
 
     use std::time::Duration;
 
@@ -24,6 +24,7 @@ pub mod unstable {
         authentication: AccessToken,
         history: {
             unstable => "/_matrix/client/unstable/org.matrix.msc3916/media/thumbnail/:server_name/:media_id",
+            1.11 => "/_matrix/client/v1/media/thumbnail/:server_name/:media_id",
         }
     };
 

crates/ruma-client-api/src/authenticated_media/get_media_config.rs

@@ -2,10 +2,10 @@
 //!
 //! Gets the config for the media repository.
 
-pub mod unstable {
-    //! `/unstable/org.matrix.msc3916/` ([MSC])
+pub mod v1 {
+    //! `/v1/` ([spec])
     //!
-    //! [MSC]: https://github.com/matrix-org/matrix-spec-proposals/pull/3916
+    //! [spec]: https://spec.matrix.org/latest/client-server-api/#get_matrixclientv1mediaconfig
 
     use js_int::UInt;
     use ruma_common::{
@@ -19,6 +19,7 @@ pub mod unstable {
         authentication: AccessToken,
         history: {
             unstable => "/_matrix/client/unstable/org.matrix.msc3916/media/config",
+            1.11 => "/_matrix/client/v1/media/config",
         }
     };
 

crates/ruma-client-api/src/authenticated_media/get_media_preview.rs

@@ -2,10 +2,10 @@
 //!
 //! Get a preview for a URL.
 
-pub mod unstable {
-    //! `/unstable/org.matrix.msc3916/` ([MSC])
+pub mod v1 {
+    //! `/v1/` ([spec])
     //!
-    //! [MSC]: https://github.com/matrix-org/matrix-spec-proposals/pull/3916
+    //! [spec]: https://spec.matrix.org/latest/client-server-api/#get_matrixclientv1mediapreview_url
 
     use ruma_common::{
         api::{request, response, Metadata},
@@ -20,6 +20,7 @@ pub mod unstable {
         authentication: AccessToken,
         history: {
             unstable => "/_matrix/client/unstable/org.matrix.msc3916/media/preview_url",
+            1.11 => "/_matrix/client/v1/media/preview_url",
         }
     };
 

crates/ruma-client-api/src/lib.rs

@@ -12,7 +12,6 @@
 pub mod account;
 pub mod alias;
 pub mod appservice;
-#[cfg(feature = "unstable-msc3916")]
 pub mod authenticated_media;
 pub mod backup;
 pub mod config;

crates/ruma/Cargo.toml

@@ -217,7 +217,6 @@ unstable-msc3618 = ["ruma-federation-api?/unstable-msc3618"]
 unstable-msc3723 = ["ruma-federation-api?/unstable-msc3723"]
 unstable-msc3814 = ["ruma-client-api?/unstable-msc3814"]
 unstable-msc3843 = ["ruma-client-api?/unstable-msc3843", "ruma-federation-api?/unstable-msc3843"]
-unstable-msc3916 = ["ruma-client-api?/unstable-msc3916"]
 unstable-msc3927 = ["ruma-events?/unstable-msc3927"]
 unstable-msc3930 = ["ruma-common/unstable-msc3930"]
 unstable-msc3931 = ["ruma-common/unstable-msc3931"]
@@ -273,7 +272,6 @@ __ci = [
     "unstable-msc3723",
     "unstable-msc3814",
     "unstable-msc3843",
-    "unstable-msc3916",
     "unstable-msc3927",
     "unstable-msc3930",
     "unstable-msc3931",