feat(timeline): Expose method to send galleries in matrix-sdk-ui

bindings/matrix-sdk-ffi/Cargo.toml

@@ -17,7 +17,7 @@ release = true
 crate-type = ["cdylib", "staticlib"]
 
 [features]
-default = ["bundled-sqlite"]
+default = ["bundled-sqlite", "matrix-sdk-ui/unstable-msc4274"]
 bundled-sqlite = ["matrix-sdk/bundled-sqlite"]
 
 [dependencies]

crates/matrix-sdk-ui/CHANGELOG.md

@@ -27,6 +27,9 @@ All notable changes to this project will be documented in this file.
   ([#5055](https://github.com/matrix-org/matrix-rust-sdk/pull/5055))
 - `Timeline::mark_as_read()` unsets the unread flag of the room if it was set.
   ([#5055](https://github.com/matrix-org/matrix-rust-sdk/pull/5055))
+- Add new method `Timeline::send_gallery` to allow sending MSC4274-style
+  galleries.
+  ([#5125](https://github.com/matrix-org/matrix-rust-sdk/pull/5125))
 
 ## [0.11.0] - 2025-04-11
 

crates/matrix-sdk-ui/Cargo.toml

@@ -22,6 +22,9 @@ uniffi = ["dep:uniffi", "matrix-sdk/uniffi", "matrix-sdk-base/uniffi"]
 # Add support for encrypted extensible events.
 unstable-msc3956 = ["ruma/unstable-msc3956"]
 
+# Add support for inline media galleries via msgtypes
+unstable-msc4274 = ["matrix-sdk/unstable-msc4274"]
+
 [dependencies]
 as_variant.workspace = true
 async-rx.workspace = true

crates/matrix-sdk-ui/src/timeline/controller/mod.rs

@@ -232,19 +232,21 @@ pub fn default_event_filter(event: &AnySyncTimelineEvent, room_version: &RoomVer
                                 return false;
                             }
 
-                            matches!(
-                                content.msgtype,
+                            match content.msgtype {
                                 MessageType::Audio(_)
-                                    | MessageType::Emote(_)
-                                    | MessageType::File(_)
-                                    | MessageType::Image(_)
-                                    | MessageType::Location(_)
-                                    | MessageType::Notice(_)
-                                    | MessageType::ServerNotice(_)
-                                    | MessageType::Text(_)
-                                    | MessageType::Video(_)
-                                    | MessageType::VerificationRequest(_)
-                            )
+                                | MessageType::Emote(_)
+                                | MessageType::File(_)
+                                | MessageType::Image(_)
+                                | MessageType::Location(_)
+                                | MessageType::Notice(_)
+                                | MessageType::ServerNotice(_)
+                                | MessageType::Text(_)
+                                | MessageType::Video(_)
+                                | MessageType::VerificationRequest(_) => true,
+                                #[cfg(feature = "unstable-msc4274")]
+                                MessageType::Gallery(_) => true,
+                                _ => false,
+                            }
                         }
 
                         AnyMessageLikeEventContent::Sticker(_)

crates/matrix-sdk-ui/src/timeline/event_item/mod.rs

@@ -362,17 +362,17 @@ impl EventTimelineItem {
 
         match self.content() {
             TimelineItemContent::MsgLike(msglike) => match &msglike.kind {
-                MsgLikeKind::Message(message) => {
-                    matches!(
-                        message.msgtype(),
-                        MessageType::Text(_)
-                            | MessageType::Emote(_)
-                            | MessageType::Audio(_)
-                            | MessageType::File(_)
-                            | MessageType::Image(_)
-                            | MessageType::Video(_)
-                    )
-                }
+                MsgLikeKind::Message(message) => match message.msgtype() {
+                    MessageType::Text(_)
+                    | MessageType::Emote(_)
+                    | MessageType::Audio(_)
+                    | MessageType::File(_)
+                    | MessageType::Image(_)
+                    | MessageType::Video(_) => true,
+                    #[cfg(feature = "unstable-msc4274")]
+                    MessageType::Gallery(_) => true,
+                    _ => false,
+                },
                 MsgLikeKind::Poll(poll) => {
                     poll.response_data.is_empty() && poll.end_event_timestamp.is_none()
                 }

crates/matrix-sdk-ui/src/timeline/futures.rs

@@ -92,3 +92,48 @@ impl<'a> IntoFuture for SendAttachment<'a> {
         Box::pin(fut.instrument(tracing_span))
     }
 }
+
+#[cfg(feature = "unstable-msc4274")]
+pub use galleries::*;
+
+#[cfg(feature = "unstable-msc4274")]
+mod galleries {
+    use std::future::IntoFuture;
+
+    use matrix_sdk::attachment::GalleryConfig;
+    use matrix_sdk_base::boxed_into_future;
+    use tracing::{Instrument as _, Span};
+
+    use super::{Error, Timeline};
+
+    pub struct SendGallery<'a> {
+        timeline: &'a Timeline,
+        gallery: GalleryConfig,
+        tracing_span: Span,
+    }
+
+    impl<'a> SendGallery<'a> {
+        pub(crate) fn new(timeline: &'a Timeline, gallery: GalleryConfig) -> Self {
+            Self { timeline, gallery, tracing_span: Span::current() }
+        }
+    }
+
+    impl<'a> IntoFuture for SendGallery<'a> {
+        type Output = Result<(), Error>;
+        boxed_into_future!(extra_bounds: 'a);
+
+        fn into_future(self) -> Self::IntoFuture {
+            let Self { timeline, gallery, tracing_span } = self;
+
+            let fut = async move {
+                let send_queue = timeline.room().send_queue();
+                let fut = send_queue.send_gallery(gallery);
+                fut.await.map_err(|_| Error::FailedSendingAttachment)?;
+
+                Ok(())
+            };
+
+            Box::pin(fut.instrument(tracing_span))
+        }
+    }
+}

crates/matrix-sdk-ui/src/timeline/mod.rs

@@ -21,8 +21,12 @@ use std::{fs, path::PathBuf, sync::Arc};
 use algorithms::rfind_event_by_item_id;
 use event_item::TimelineItemHandle;
 use eyeball_im::VectorDiff;
+#[cfg(feature = "unstable-msc4274")]
+use futures::SendGallery;
 use futures_core::Stream;
 use imbl::Vector;
+#[cfg(feature = "unstable-msc4274")]
+use matrix_sdk::attachment::GalleryConfig;
 use matrix_sdk::{
     attachment::AttachmentConfig,
     deserialized_responses::TimelineEvent,
@@ -416,6 +420,28 @@ impl Timeline {
         SendAttachment::new(self, source.into(), mime_type, config)
     }
 
+    /// Sends a media gallery to the room.
+    ///
+    /// If the encryption feature is enabled, this method will transparently
+    /// encrypt the room message if the room is encrypted.
+    ///
+    /// The attachments and their optional thumbnails are stored in the media
+    /// cache and can be retrieved at any time, by calling
+    /// [`Media::get_media_content()`] with the `MediaSource` that can be found
+    /// in the corresponding `TimelineEventItem`, and using a
+    /// `MediaFormat::File`.
+    ///
+    /// # Arguments
+    /// * `gallery` - A configuration object containing details about the
+    ///   gallery like files, thumbnails, etc.
+    ///
+    /// [`Media::get_media_content()`]: matrix_sdk::Media::get_media_content
+    #[cfg(feature = "unstable-msc4274")]
+    #[instrument(skip_all)]
+    pub fn send_gallery(&self, gallery: GalleryConfig) -> SendGallery<'_> {
+        SendGallery::new(self, gallery)
+    }
+
     /// Redact an event given its [`TimelineEventItemId`] and an optional
     /// reason.
     pub async fn redact(