Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(timeline): allow sending mentions along with media #4475

Merged
merged 1 commit into from
Jan 8, 2025
Merged

feat(timeline): allow sending mentions along with media #4475

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions bindings/matrix-sdk-ffi/src/timeline/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ impl Timeline {
image_info: ImageInfo,
caption: Option<String>,
formatted_caption: Option<FormattedBody>,
mentions: Option<Mentions>,
progress_watcher: Option<Box<dyn ProgressWatcher>>,
use_send_queue: bool,
) -> Arc<SendAttachmentJoinHandle> {
Expand All @@ -313,7 +314,8 @@ impl Timeline {
.thumbnail(thumbnail)
.info(attachment_info)
.caption(caption)
.formatted_caption(formatted_caption);
.formatted_caption(formatted_caption)
.mentions(mentions.map(Into::into));

self.send_attachment(
url,
Expand All @@ -334,6 +336,7 @@ impl Timeline {
video_info: VideoInfo,
caption: Option<String>,
formatted_caption: Option<FormattedBody>,
mentions: Option<Mentions>,
progress_watcher: Option<Box<dyn ProgressWatcher>>,
use_send_queue: bool,
) -> Arc<SendAttachmentJoinHandle> {
Expand All @@ -349,7 +352,8 @@ impl Timeline {
.thumbnail(thumbnail)
.info(attachment_info)
.caption(caption)
.formatted_caption(formatted_caption.map(Into::into));
.formatted_caption(formatted_caption.map(Into::into))
.mentions(mentions.map(Into::into));

self.send_attachment(
url,
Expand All @@ -362,12 +366,14 @@ impl Timeline {
}))
}

#[allow(clippy::too_many_arguments)]
pub fn send_audio(
self: Arc<Self>,
url: String,
audio_info: AudioInfo,
caption: Option<String>,
formatted_caption: Option<FormattedBody>,
mentions: Option<Mentions>,
progress_watcher: Option<Box<dyn ProgressWatcher>>,
use_send_queue: bool,
) -> Arc<SendAttachmentJoinHandle> {
Expand All @@ -381,7 +387,8 @@ impl Timeline {
let attachment_config = AttachmentConfig::new()
.info(attachment_info)
.caption(caption)
.formatted_caption(formatted_caption.map(Into::into));
.formatted_caption(formatted_caption.map(Into::into))
.mentions(mentions.map(Into::into));

self.send_attachment(
url,
Expand All @@ -401,6 +408,7 @@ impl Timeline {
audio_info: AudioInfo,
waveform: Vec<u16>,
caption: Option<String>,
mentions: Option<Mentions>,
formatted_caption: Option<FormattedBody>,
progress_watcher: Option<Box<dyn ProgressWatcher>>,
use_send_queue: bool,
Expand All @@ -416,7 +424,8 @@ impl Timeline {
let attachment_config = AttachmentConfig::new()
.info(attachment_info)
.caption(caption)
.formatted_caption(formatted_caption.map(Into::into));
.formatted_caption(formatted_caption.map(Into::into))
.mentions(mentions.map(Into::into));

self.send_attachment(
url,
Expand All @@ -429,12 +438,14 @@ impl Timeline {
}))
}

#[allow(clippy::too_many_arguments)]
pub fn send_file(
self: Arc<Self>,
url: String,
file_info: FileInfo,
caption: Option<String>,
formatted_caption: Option<FormattedBody>,
mentions: Option<Mentions>,
progress_watcher: Option<Box<dyn ProgressWatcher>>,
use_send_queue: bool,
) -> Arc<SendAttachmentJoinHandle> {
Expand All @@ -448,7 +459,8 @@ impl Timeline {
let attachment_config = AttachmentConfig::new()
.info(attachment_info)
.caption(caption)
.formatted_caption(formatted_caption.map(Into::into));
.formatted_caption(formatted_caption.map(Into::into))
.mentions(mentions.map(Into::into));

self.send_attachment(
url,
Expand Down
Loading