Skip to content

Commit 5c0bb6a

Browse files
committed
chore(send_queue): rename RoomSendQueueUpdate::UploadedMedia to MediaUpload to prepare it for communicating upload progress
Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
1 parent d2f47f3 commit 5c0bb6a

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,7 @@ impl<P: RoomDataProvider, D: Decryptor> TimelineController<P, D> {
13171317
.await;
13181318
}
13191319

1320-
RoomSendQueueUpdate::UploadedMedia { related_to, .. } => {
1320+
RoomSendQueueUpdate::MediaUpload { related_to, .. } => {
13211321
// TODO(bnjbvr): Do something else?
13221322
info!(txn_id = %related_to, "some media for a media event has been uploaded");
13231323
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ impl RoomSendQueue {
619619
}
620620

621621
SentRequestKey::Media(media_info) => {
622-
let _ = updates.send(RoomSendQueueUpdate::UploadedMedia {
622+
let _ = updates.send(RoomSendQueueUpdate::MediaUpload {
623623
related_to: related_txn_id.as_ref().unwrap_or(&txn_id).clone(),
624624
file: media_info.file,
625625
});
@@ -2129,8 +2129,9 @@ pub enum RoomSendQueueUpdate {
21292129
event_id: OwnedEventId,
21302130
},
21312131

2132-
/// A media has been successfully uploaded.
2133-
UploadedMedia {
2132+
/// A media upload (consisting of a file and possibly a thumbnail) has made
2133+
/// progress.
2134+
MediaUpload {
21342135
/// The media event this uploaded media relates to.
21352136
related_to: OwnedTransactionId,
21362137

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ macro_rules! assert_update {
164164
// Returns a tuple of (transaction_id, send_handle).
165165
($watch:ident => uploaded { related_to = $related_to:expr, mxc = $mxc:expr }) => {{
166166
assert_let!(
167-
Ok(Ok(RoomSendQueueUpdate::UploadedMedia {
167+
Ok(Ok(RoomSendQueueUpdate::MediaUpload {
168168
related_to,
169169
file,
170170
})) = timeout(Duration::from_secs(1), $watch.recv()).await

0 commit comments

Comments
 (0)