YoursFunny/TelegramTwitterMediaBot
1
0
Fork 0
mirror of https://github.com/TheFunny/TelegramTwitterMediaBot.git synced 2026-10-02 00:42:10 +00:00
Code Releases Activity

refactor(send): inline the per-kind media builders into media_from

Browse Source 
photo_media, video_media and animation_media each wrapped the same five lines (build the kind, attach the caption, attach the spoiler) for exactly one caller — media_from's own match arms. The arms carry those lines now; three pub(super) functions and their call indirection are gone, and the dispatch the doc already described as 'the one place' actually is the one place.
This commit is contained in:
YoursFunny
2026-09-24 04:37:53 +08:00
parent 9fc5533676
commit e72cb1b98f
1 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/xmedia-bot/src/send/input_media.rs
+28 -36
View File
@@ -43,39 +43,6 @@ impl MediaItemPayload {
} }
} }
pub(super) fn photo_media(file: InputFile, caption: Option<&str>, spoiler: bool) -> InputMedia {
let mut photo = InputMediaPhoto::new(file).parse_mode(ParseMode::Html);
if let Some(caption) = caption {
photo = photo.caption(caption);
}
if spoiler {
photo = photo.spoiler();
}
InputMedia::Photo(photo)
}
pub(super) fn video_media(file: InputFile, caption: Option<&str>, spoiler: bool) -> InputMedia {
let mut video = InputMediaVideo::new(file).parse_mode(ParseMode::Html);
if let Some(caption) = caption {
video = video.caption(caption);
}
if spoiler {
video = video.spoiler();
}
InputMedia::Video(video)
}
pub(super) fn animation_media(file: InputFile, caption: Option<&str>, spoiler: bool) -> InputMedia {
let mut animation = InputMediaAnimation::new(file).parse_mode(ParseMode::Html);
if let Some(caption) = caption {
animation = animation.caption(caption);
}
if spoiler {
animation = animation.spoiler();
}
InputMedia::Animation(animation)
}
/// Builds one media-group item around an already-selected file: the per-kind /// Builds one media-group item around an already-selected file: the per-kind
/// `InputMedia` (same spoiler/caption handling) plus the video's thumbnail, /// `InputMedia` (same spoiler/caption handling) plus the video's thumbnail,
/// which Telegram takes as a separate upload/URL. The one place that dispatch /// which Telegram takes as a separate upload/URL. The one place that dispatch
@@ -87,10 +54,35 @@ pub(super) fn media_from(
thumbnail: Option<&str>, thumbnail: Option<&str>,
) -> Result<InputMedia, String> { ) -> Result<InputMedia, String> {
let media = match item { let media = match item {
MediaItemPayload::Photo { has_spoiler, .. } => photo_media(file, caption, *has_spoiler), MediaItemPayload::Photo { has_spoiler, .. } => {
MediaItemPayload::Video { has_spoiler, .. } => video_media(file, caption, *has_spoiler), let mut media = InputMediaPhoto::new(file).parse_mode(ParseMode::Html);
if let Some(caption) = caption {
media = media.caption(caption);
}
if *has_spoiler {
media = media.spoiler();
}
InputMedia::Photo(media)
}
MediaItemPayload::Video { has_spoiler, .. } => {
let mut media = InputMediaVideo::new(file).parse_mode(ParseMode::Html);
if let Some(caption) = caption {
media = media.caption(caption);
}
if *has_spoiler {
media = media.spoiler();
}
InputMedia::Video(media)
}
MediaItemPayload::Animation { has_spoiler, .. } => { MediaItemPayload::Animation { has_spoiler, .. } => {
animation_media(file, caption, *has_spoiler) let mut media = InputMediaAnimation::new(file).parse_mode(ParseMode::Html);
if let Some(caption) = caption {
media = media.caption(caption);
}
if *has_spoiler {
media = media.spoiler();
}
InputMedia::Animation(media)
} }
}; };
match (thumbnail, media) { match (thumbnail, media) {