ffi: Expose filename and formatted body fields for media captions

In relevance to MSC2530
matrix-org · Mar 14, 2024 · 2520804 · 2520804
1 parent 73684ab
commit 2520804
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/bindings/matrix-sdk-ffi/src/ruma.rs b/bindings/matrix-sdk-ffi/src/ruma.rs
@@ -174,18 +174,25 @@ impl TryFrom<MessageType> for RumaMessageType {
             }
             MessageType::Image { content } => Self::Image(
                 RumaImageMessageEventContent::new(content.body, (*content.source).clone())
+                    .formatted(content.formatted.map(Into::into))
+                    .filename(content.filename)
                     .info(content.info.map(Into::into).map(Box::new)),
             ),
             MessageType::Audio { content } => Self::Audio(
                 RumaAudioMessageEventContent::new(content.body, (*content.source).clone())
+                    .formatted(content.formatted.map(Into::into))
+                    .filename(content.filename)
                     .info(content.info.map(Into::into).map(Box::new)),
             ),
             MessageType::Video { content } => Self::Video(
                 RumaVideoMessageEventContent::new(content.body, (*content.source).clone())
+                    .formatted(content.formatted.map(Into::into))
+                    .filename(content.filename)
                     .info(content.info.map(Into::into).map(Box::new)),
             ),
             MessageType::File { content } => Self::File(
                 RumaFileMessageEventContent::new(content.body, (*content.source).clone())
+                    .formatted(content.formatted.map(Into::into))
                     .filename(content.filename)
                     .info(content.info.map(Into::into).map(Box::new)),
             ),
@@ -221,13 +228,17 @@ impl From<RumaMessageType> for MessageType {
             RumaMessageType::Image(c) => MessageType::Image {
                 content: ImageMessageContent {
                     body: c.body.clone(),
+                    formatted: c.formatted.as_ref().map(Into::into),
+                    filename: c.filename.clone(),
                     source: Arc::new(c.source.clone()),
                     info: c.info.as_deref().map(Into::into),
                 },
             },
             RumaMessageType::Audio(c) => MessageType::Audio {
                 content: AudioMessageContent {
                     body: c.body.clone(),
+                    formatted: c.formatted.as_ref().map(Into::into),
+                    filename: c.filename.clone(),
                     source: Arc::new(c.source.clone()),
                     info: c.info.as_deref().map(Into::into),
                     audio: c.audio.map(Into::into),
@@ -237,13 +248,16 @@ impl From<RumaMessageType> for MessageType {
             RumaMessageType::Video(c) => MessageType::Video {
                 content: VideoMessageContent {
                     body: c.body.clone(),
+                    formatted: c.formatted.as_ref().map(Into::into),
+                    filename: c.filename.clone(),
                     source: Arc::new(c.source.clone()),
                     info: c.info.as_deref().map(Into::into),
                 },
             },
             RumaMessageType::File(c) => MessageType::File {
                 content: FileMessageContent {
                     body: c.body.clone(),
+                    formatted: c.formatted.as_ref().map(Into::into),
                     filename: c.filename.clone(),
                     source: Arc::new(c.source.clone()),
                     info: c.info.as_deref().map(Into::into),
@@ -295,13 +309,17 @@ pub struct EmoteMessageContent {
 #[derive(Clone, uniffi::Record)]
 pub struct ImageMessageContent {
     pub body: String,
+    pub formatted: Option<FormattedBody>,
+    pub filename: Option<String>,
     pub source: Arc<MediaSource>,
     pub info: Option<ImageInfo>,
 }
 
 #[derive(Clone, uniffi::Record)]
 pub struct AudioMessageContent {
     pub body: String,
+    pub formatted: Option<FormattedBody>,
+    pub filename: Option<String>,
     pub source: Arc<MediaSource>,
     pub info: Option<AudioInfo>,
     pub audio: Option<UnstableAudioDetailsContent>,
@@ -311,13 +329,16 @@ pub struct AudioMessageContent {
 #[derive(Clone, uniffi::Record)]
 pub struct VideoMessageContent {
     pub body: String,
+    pub formatted: Option<FormattedBody>,
+    pub filename: Option<String>,
     pub source: Arc<MediaSource>,
     pub info: Option<VideoInfo>,
 }
 
 #[derive(Clone, uniffi::Record)]
 pub struct FileMessageContent {
     pub body: String,
+    pub formatted: Option<FormattedBody>,
     pub filename: Option<String>,
     pub source: Arc<MediaSource>,
     pub info: Option<FileInfo>,