impl MSC4380

.clippy.toml

@@ -1,3 +1,4 @@
+enum-variant-size-threshold = 512
 avoid-breaking-exported-api = false
 disallowed-methods = [
     # https://github.com/serde-rs/json/issues/160

Cargo.toml

@@ -37,6 +37,9 @@ serde = { version = "1.0.164", features = ["derive"] }
 serde_html_form = "0.2.0"
 serde_json = "1.0.87"
 similar = "2.6.0"
+smallstr = { version = "0.3", features = ["ffi", "serde", "std", "union"] }
+smallvec = { version = "1.15", features = ["const_generics", "const_new", "serde", "union", "write"] }
+
 thiserror = "2.0.0"
 toml = { version = "0.9.6", default-features = false, features = ["parse", "serde"] }
 tracing = { version = "0.1.37", default-features = false, features = ["std"] }
@@ -54,6 +57,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 unreachable_pub = "warn"
 unused_import_braces = "warn"
 unused_qualifications = "warn"
+deprecated = "allow"
 
 [workspace.lints.clippy]
 branches_sharing_code = "warn"

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

@@ -104,8 +104,14 @@ pub struct Registration {
     /// Whether the application service wants to receive ephemeral data.
     ///
     /// Defaults to `false`.
-    #[serde(default, skip_serializing_if = "ruma_common::serde::is_default")]
+    #[serde(default)]
     pub receive_ephemeral: bool,
+
+    /// Whether the application service wants to do device management, as part of MSC4190.
+    ///
+    /// Defaults to `false`
+    #[serde(default, rename = "io.element.msc4190")]
+    pub device_management: bool,
 }
 
 /// Initial set of fields of `Registration`.
@@ -168,6 +174,7 @@ impl From<RegistrationInit> for Registration {
             rate_limited,
             protocols,
             receive_ephemeral: false,
+            device_management: false,
         }
     }
 }

crates/ruma-client-api/CHANGELOG.md

@@ -36,6 +36,8 @@ Breaking changes:
 - Allow specifying the event format for `state::get_state_event_for_key`, meaning the response may
   either be `Raw<AnyStateEvent>` or `Raw<AnyStateEventContent>`, depending on the format specified
   in the request.
+- Use `StrippedState` instead of `AnyStrippedStateEvent`, to allow non-stripped events to be
+  represented for `sync_events`.
 - `sync_events::v3::State` is now an enum, to prepare for the stabilization of MSC4222. The state
   before the timeline, corresponding to the `state` field in the Matrix specification, is available
   in the `Before` variant, and the struct representing its content was renamed to `StateEvents`. 
@@ -47,9 +49,16 @@ Breaking changes:
   should always be identical.
 - Add `set_presence` field to `sync_events::v5::Request` as per MSC4186; specified identically
   to the field appearing in prior sync versions.
+- Add `tags`, `not_tags`, and `spaces` fields to `sync_events::v5::request::ListFilters` as
+  specified in MSC4186 `SlidingRoomFilter` properties.
 
 Improvements:
 
+- Add `M_INVITE_BLOCKED` candidate error code proposed by
+  [MSC4380](https://github.com/matrix-org/matrix-spec-proposals/pull/4380)
+  sharing an unstable prefix with the preceding
+  [MSC4155](https://github.com/matrix-org/matrix-spec-proposals/pull/4155).
+
 - Added support for the sliding sync extension for thread subscriptions, as well as the
   accompanying endpoint, both from experimental MSC4308.
 - Added support for the experiment MSC4306 thread subscription endpoints.
@@ -210,6 +219,7 @@ Improvements:
 - Allow constructing `error::ErrorBody::NotJson` outside of this crate.
 - Add function for checking if a `Content-Type` is considered "safe" for `inline`
   rendering, according to MSC2702 / Matrix 1.12.
+- Allow constructing `error::ErrorBody::NotJson` outside of this crate.
 
 Bug fixes:
 

crates/ruma-client-api/Cargo.toml

@@ -39,6 +39,7 @@ compat-upload-signatures = []
 unstable-msc2666 = ["ruma-common/unstable-msc2666"]
 unstable-msc2448 = []
 unstable-msc2654 = []
+unstable-msc2815 = []
 unstable-msc2967 = []
 unstable-msc3488 = []
 unstable-msc3814 = []
@@ -52,10 +53,12 @@ unstable-msc4140 = ["ruma-common/unstable-msc4140"]
 unstable-msc4143 = []
 unstable-msc4186 = ["ruma-common/unstable-msc4186"]
 unstable-msc4191 = []
+unstable-msc4195 = ["unstable-msc4143"]
 unstable-msc4222 = []
 # Thread subscription support.
 unstable-msc4306 = []
 unstable-msc4308 = []
+unstable-msc4380 = ["ruma-common/unstable-msc4380", "ruma-events/unstable-msc4380"]
 
 [dependencies]
 as_variant = { workspace = true }
@@ -71,6 +74,8 @@ ruma-events = { workspace = true }
 serde = { workspace = true }
 serde_html_form = { workspace = true }
 serde_json = { workspace = true }
+smallstr = { workspace = true }
+smallvec = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true, features = ["serde"] }
 web-time = { workspace = true }

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

@@ -7,15 +7,17 @@ pub mod v1 {
     //!
     //! [spec]: https://spec.matrix.org/latest/client-server-api/#get_matrixclientv1mediadownloadservernamemediaid
 
-    use std::time::Duration;
+    use std::{borrow::Cow, time::Duration};
 
-    use http::header::{CONTENT_DISPOSITION, CONTENT_TYPE};
+    use http::header::{CACHE_CONTROL, CONTENT_DISPOSITION, CONTENT_TYPE};
     use ruma_common::{
         api::{request, response, Metadata},
         http_headers::ContentDisposition,
-        metadata, IdParseError, MxcUri, OwnedServerName,
+        metadata, IdParseError, Mxc, MxcUri, OwnedServerName,
     };
 
+    use crate::http_headers::CROSS_ORIGIN_RESOURCE_POLICY;
+
     const METADATA: Metadata = metadata! {
         method: GET,
         rate_limited: true,
@@ -59,12 +61,32 @@ pub mod v1 {
 
         /// The content type of the file that was previously uploaded.
         #[ruma_api(header = CONTENT_TYPE)]
-        pub content_type: Option<String>,
+        pub content_type: Option<Cow<'static, str>>,
 
         /// The value of the `Content-Disposition` HTTP header, possibly containing the name of the
         /// file that was previously uploaded.
         #[ruma_api(header = CONTENT_DISPOSITION)]
         pub content_disposition: Option<ContentDisposition>,
+
+        /// The value of the `Cross-Origin-Resource-Policy` HTTP header.
+        ///
+        /// See [MDN] for the syntax.
+        ///
+        /// [MDN]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cross-Origin-Resource-Policy#syntax
+        ///
+        /// TODO: make this use Cow static str's
+        #[ruma_api(header = CROSS_ORIGIN_RESOURCE_POLICY)]
+        pub cross_origin_resource_policy: Option<Cow<'static, str>>,
+
+        /// The value of the `Cache-Control` HTTP header.
+        ///
+        /// See [MDN] for the syntax.
+        ///
+        /// [MDN]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control#syntax
+        ///
+        /// TODO: make this use Cow static str's
+        #[ruma_api(header = CACHE_CONTROL)]
+        pub cache_control: Option<Cow<'static, str>>,
     }
 
     impl Request {
@@ -79,7 +101,7 @@ pub mod v1 {
 
         /// Creates a new `Request` with the given URI.
         pub fn from_uri(uri: &MxcUri) -> Result<Self, IdParseError> {
-            let (server_name, media_id) = uri.parts()?;
+            let Mxc { server_name, media_id, .. } = uri.parts()?;
 
             Ok(Self::new(media_id.to_owned(), server_name.to_owned()))
         }
@@ -89,13 +111,15 @@ pub mod v1 {
         /// Creates a new `Response` with the given file contents.
         pub fn new(
             file: Vec<u8>,
-            content_type: String,
+            content_type: Cow<'static, str>,
             content_disposition: ContentDisposition,
         ) -> Self {
             Self {
                 file,
                 content_type: Some(content_type),
                 content_disposition: Some(content_disposition),
+                cross_origin_resource_policy: None,
+                cache_control: None,
             }
         }
     }

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

@@ -7,15 +7,17 @@ pub mod v1 {
     //!
     //! [spec]: https://spec.matrix.org/latest/client-server-api/#get_matrixclientv1mediadownloadservernamemediaidfilename
 
-    use std::time::Duration;
+    use std::{borrow::Cow, time::Duration};
 
-    use http::header::{CONTENT_DISPOSITION, CONTENT_TYPE};
+    use http::header::{CACHE_CONTROL, CONTENT_DISPOSITION, CONTENT_TYPE};
     use ruma_common::{
         api::{request, response, Metadata},
         http_headers::ContentDisposition,
-        metadata, IdParseError, MxcUri, OwnedServerName,
+        metadata, IdParseError, Mxc, MxcUri, OwnedServerName,
     };
 
+    use crate::http_headers::CROSS_ORIGIN_RESOURCE_POLICY;
+
     const METADATA: Metadata = metadata! {
         method: GET,
         rate_limited: true,
@@ -63,12 +65,32 @@ pub mod v1 {
 
         /// The content type of the file that was previously uploaded.
         #[ruma_api(header = CONTENT_TYPE)]
-        pub content_type: Option<String>,
+        pub content_type: Option<Cow<'static, str>>,
 
         /// The value of the `Content-Disposition` HTTP header, possibly containing the name of the
         /// file that was previously uploaded.
         #[ruma_api(header = CONTENT_DISPOSITION)]
         pub content_disposition: Option<ContentDisposition>,
+
+        /// The value of the `Cross-Origin-Resource-Policy` HTTP header.
+        ///
+        /// See [MDN] for the syntax.
+        ///
+        /// [MDN]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cross-Origin-Resource-Policy#syntax
+        ///
+        /// TODO: make this use Cow static str's
+        #[ruma_api(header = CROSS_ORIGIN_RESOURCE_POLICY)]
+        pub cross_origin_resource_policy: Option<Cow<'static, str>>,
+
+        /// The value of the `Cache-Control` HTTP header.
+        ///
+        /// See [MDN] for the syntax.
+        ///
+        /// [MDN]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control#syntax
+        ///
+        /// TODO: make this use Cow static str's
+        #[ruma_api(header = CACHE_CONTROL)]
+        pub cache_control: Option<Cow<'static, str>>,
     }
 
     impl Request {
@@ -84,7 +106,7 @@ pub mod v1 {
 
         /// Creates a new `Request` with the given URI and filename.
         pub fn from_uri(uri: &MxcUri, filename: String) -> Result<Self, IdParseError> {
-            let (server_name, media_id) = uri.parts()?;
+            let Mxc { server_name, media_id, .. } = uri.parts()?;
 
             Ok(Self::new(media_id.to_owned(), server_name.to_owned(), filename))
         }
@@ -94,13 +116,15 @@ pub mod v1 {
         /// Creates a new `Response` with the given file.
         pub fn new(
             file: Vec<u8>,
-            content_type: String,
+            content_type: Cow<'static, str>,
             content_disposition: ContentDisposition,
         ) -> Self {
             Self {
                 file,
                 content_type: Some(content_type),
                 content_disposition: Some(content_disposition),
+                cross_origin_resource_policy: None,
+                cache_control: None,
             }
         }
     }