Add send_voice_message api

Author: alfogrillo

bindings/matrix-sdk-ffi/src/room.rs

@@ -818,6 +818,30 @@ impl Room {
         }))
     }
 
+    pub fn send_voice_message(
+        self: Arc<Self>,
+        url: String,
+        audio_info: AudioInfo,
+        waveform: Vec<u16>,
+        progress_watcher: Option<Box<dyn ProgressWatcher>>,
+    ) -> Arc<SendAttachmentJoinHandle> {
+        SendAttachmentJoinHandle::new(RUNTIME.spawn(async move {
+            let mime_str =
+                audio_info.mimetype.as_ref().ok_or(RoomError::InvalidAttachmentMimeType)?;
+            let mime_type =
+                mime_str.parse::<Mime>().map_err(|_| RoomError::InvalidAttachmentMimeType)?;
+
+            let base_audio_info: BaseAudioInfo = BaseAudioInfo::try_from(&audio_info)
+                .map_err(|_| RoomError::InvalidAttachmentData)?;
+
+            let waveform_amplitudes = waveform.iter().map(|v| (*v).into()).collect();
+            let attachment_info = AttachmentInfo::Voice(base_audio_info, Some(waveform_amplitudes));
+            let attachment_config = AttachmentConfig::new().info(attachment_info);
+
+            self.send_attachment(url, mime_type, attachment_config, progress_watcher).await
+        }))
+    }
+
     pub fn send_file(
         self: Arc<Self>,
         url: String,

crates/matrix-sdk/src/attachment.rs

@@ -22,9 +22,12 @@ use std::time::Duration;
 use image::GenericImageView;
 use ruma::{
     assign,
-    events::room::{
-        message::{AudioInfo, FileInfo, VideoInfo},
-        ImageInfo, ThumbnailInfo,
+    events::{
+        audio::Amplitude,
+        room::{
+            message::{AudioInfo, FileInfo, VideoInfo},
+            ImageInfo, ThumbnailInfo,
+        },
     },
     OwnedTransactionId, TransactionId, UInt,
 };
@@ -77,7 +80,7 @@ pub struct BaseFileInfo {
 }
 
 /// Types of metadata for an attachment.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum AttachmentInfo {
     /// The metadata of an image.
     Image(BaseImageInfo),
@@ -87,6 +90,8 @@ pub enum AttachmentInfo {
     Audio(BaseAudioInfo),
     /// The metadata of a file.
     File(BaseFileInfo),
+    /// The metadata of a voice message
+    Voice(BaseAudioInfo, Option<Vec<Amplitude>>),
 }
 
 impl From<AttachmentInfo> for ImageInfo {

crates/matrix-sdk/src/encryption/mod.rs

@@ -46,7 +46,8 @@ use ruma::{
     events::room::{
         message::{
             AudioInfo, AudioMessageEventContent, FileInfo, FileMessageEventContent,
-            ImageMessageEventContent, MessageType, VideoInfo, VideoMessageEventContent,
+            ImageMessageEventContent, MessageType, UnstableAudioDetailsContentBlock,
+            UnstableVoiceContentBlock, VideoInfo, VideoMessageEventContent,
         },
         ImageInfo, MediaSource, ThumbnailInfo,
     },
@@ -202,13 +203,24 @@ impl Client {
                 MessageType::Image(content)
             }
             mime::AUDIO => {
-                let info = assign!(info.map(AudioInfo::from).unwrap_or_default(), {
+                let audio_info = assign!(info.clone().map(AudioInfo::from).unwrap_or_default(), {
                     mimetype: Some(content_type.as_ref().to_owned()),
                 });
-                let content = assign!(AudioMessageEventContent::encrypted(body.to_owned(), file), {
-                    info: Some(Box::new(info))
-                });
-                MessageType::Audio(content)
+
+                let mut audio_message_event_content =
+                    assign!(AudioMessageEventContent::encrypted(body.to_owned(), file), {
+                        info: Some(Box::new(audio_info))
+                    });
+
+                if let Some(AttachmentInfo::Voice(audio_info, Some(waveform))) = info {
+                    if let Some(duration) = audio_info.duration {
+                        audio_message_event_content.audio =
+                            Some(UnstableAudioDetailsContentBlock::new(duration, waveform));
+                    }
+                    audio_message_event_content.voice = Some(UnstableVoiceContentBlock::new());
+                }
+
+                MessageType::Audio(audio_message_event_content)
             }
             mime::VIDEO => {
                 let info = assign!(info.map(VideoInfo::from).unwrap_or_default(), {
@@ -1352,4 +1364,4 @@ mod tests {
         let after_taking_lock_second_time = client.olm_machine().await.as_ref().unwrap().clone();
         assert!(after_taking_lock_first_time.same_as(&after_taking_lock_second_time));
     }
-}
+}

crates/matrix-sdk/src/media.rs

@@ -33,7 +33,8 @@ use ruma::{
     events::room::{
         message::{
             self, AudioInfo, FileInfo, FileMessageEventContent, ImageMessageEventContent,
-            MessageType, VideoInfo, VideoMessageEventContent,
+            MessageType, UnstableAudioDetailsContentBlock, UnstableVoiceContentBlock, VideoInfo,
+            VideoMessageEventContent,
         },
         ImageInfo, MediaSource, ThumbnailInfo,
     },
@@ -438,13 +439,23 @@ impl Media {
                 )
             }
             mime::AUDIO => {
-                let info = assign!(info.map(AudioInfo::from).unwrap_or_default(), {
+                let audio_info = assign!(info.clone().map(AudioInfo::from).unwrap_or_default(), {
                     mimetype: Some(content_type.as_ref().to_owned()),
                 });
-                MessageType::Audio(
+
+                let mut audio_message_event_content =
                     message::AudioMessageEventContent::plain(body.to_owned(), url)
-                        .info(Box::new(info)),
-                )
+                        .info(Box::new(audio_info));
+
+                if let Some(AttachmentInfo::Voice(audio_info, Some(waveform))) = info {
+                    if let Some(duration) = audio_info.duration {
+                        audio_message_event_content.audio =
+                            Some(UnstableAudioDetailsContentBlock::new(duration, waveform));
+                    }
+                    audio_message_event_content.voice = Some(UnstableVoiceContentBlock::new());
+                }
+
+                MessageType::Audio(audio_message_event_content)
             }
             mime::VIDEO => {
                 let info = assign!(info.map(VideoInfo::from).unwrap_or_default(), {