misc: Add filename to the thumbnails too so they can reference the original file

Author: jmartinesp

crates/matrix-sdk/src/media.rs

@@ -729,7 +729,8 @@ impl Media {
         thumbnail: Option<Thumbnail>,
         send_progress: SharedObservable<TransmissionProgress>,
     ) -> Result<(MediaSource, Option<(MediaSource, Box<ThumbnailInfo>)>)> {
-        let upload_thumbnail = self.upload_thumbnail(thumbnail, send_progress.clone());
+        let upload_thumbnail =
+            self.upload_thumbnail(thumbnail, filename.clone(), send_progress.clone());
 
         let upload_attachment = async move {
             self.upload(content_type, data, filename, None)
@@ -747,6 +748,7 @@ impl Media {
     async fn upload_thumbnail(
         &self,
         thumbnail: Option<Thumbnail>,
+        filename: Option<String>,
         send_progress: SharedObservable<TransmissionProgress>,
     ) -> Result<Option<(MediaSource, Box<ThumbnailInfo>)>> {
         let Some(thumbnail) = thumbnail else {
@@ -755,8 +757,9 @@ impl Media {
 
         let (data, content_type, thumbnail_info) = thumbnail.into_parts();
 
+        let filename = filename.map(|name| format!("thumbnail-{name}"));
         let response = self
-            .upload(&content_type, data, None, None)
+            .upload(&content_type, data, filename, None)
             .with_send_progress_observable(send_progress)
             .await?;
         let url = response.content_uri;

crates/matrix-sdk/tests/integration/room/attachment/mod.rs

@@ -104,6 +104,8 @@ async fn test_room_attachment_send_info() {
 
     mock.mock_authenticated_media_config().ok_default().mount().await;
 
+    let filename = "image.jpg";
+
     let expected_event_id = event_id!("$h29iv0s8:example.com");
     mock.mock_room_send()
         .body_matches_partial_json(json!({
@@ -120,7 +122,15 @@ async fn test_room_attachment_send_info() {
 
     mock.mock_upload()
         .expect_mime_type("image/jpeg")
-        .expect_filename("image.jpg")
+        .expect_filename(filename)
+        .ok(mxc_uri!("mxc://example.com/AQwafuaFswefuhsfAFAgsw"))
+        .mock_once()
+        .mount()
+        .await;
+
+    mock.mock_upload()
+        .expect_mime_type("image/jpeg")
+        .expect_filename("thumbnail-image.jpg")
         .ok(mxc_uri!("mxc://example.com/AQwafuaFswefuhsfAFAgsw"))
         .mock_once()
         .mount()
@@ -136,10 +146,17 @@ async fn test_room_attachment_send_info() {
             width: Some(uint!(800)),
             ..Default::default()
         }))
-        .caption(Some("image caption".to_owned()));
+        .caption(Some("image caption".to_owned()))
+        .thumbnail(Some(Thumbnail {
+            data: "A thumbnail".as_bytes().to_owned(),
+            content_type: mime::IMAGE_JPEG,
+            height: uint!(200),
+            width: uint!(200),
+            size: uint!(200),
+        }));
 
     let response = room
-        .send_attachment("image.jpg", &mime::IMAGE_JPEG, b"Hello world".to_vec(), config)
+        .send_attachment(filename, &mime::IMAGE_JPEG, b"Hello world".to_vec(), config)
         .await
         .unwrap();
 

crates/matrix-sdk/tests/integration/send_queue.rs

@@ -2216,7 +2216,7 @@ async fn test_gallery_uploads() {
     mock_jpeg_upload(
         &mock,
         mxc_uri!("mxc://sdk.rs/thumbnail1"),
-        None,
+        Some(format!("thumbnail-{filename1}")),
         allow_upload_lock.clone(),
     )
     .mock_once()
@@ -2234,7 +2234,7 @@ async fn test_gallery_uploads() {
     mock_jpeg_upload(
         &mock,
         mxc_uri!("mxc://sdk.rs/thumbnail2"),
-        None,
+        Some(format!("thumbnail-{filename2}")),
         allow_upload_lock.clone(),
     )
     .mock_once()