From bae194b2bf07cded436d0ccbc7864eeced66d8fb Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Fri, 19 Sep 2025 17:14:56 +0300 Subject: [PATCH] chore: fix clippy warnings --- src/lib.rs | 1 + src/main.rs | 32 ++++++++++++++++---------------- src/telemetry.rs | 7 ++----- 3 files changed, 19 insertions(+), 21 deletions(-) create mode 100644 src/lib.rs diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..304af1e --- /dev/null +++ b/src/lib.rs @@ -0,0 +1 @@ +pub mod telemetry; diff --git a/src/main.rs b/src/main.rs index 60419c4..e41933c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -36,25 +36,25 @@ enum MediaKind { async fn main() -> color_eyre::Result<()> { dotenv().ok(); color_eyre::install()?; - setup_logger()?; + setup_logger(); let bot = Bot::from_env(); teloxide::repl(bot, |bot: Bot, msg: Message| async move { - if let Some(text) = msg.text() { - if let Some(shortcode) = extract_instagram_shortcode(text) { - let bot_cloned = bot.clone(); - let chat = msg.chat.id; + if let Some(text) = msg.text() + && let Some(shortcode) = extract_instagram_shortcode(text) + { + let bot_cloned = bot.clone(); + let chat = msg.chat.id; - tokio::spawn(async move { - if let Err(e) = fetch_and_send(&bot_cloned, chat, &shortcode).await { - error!("error fetching/sending: {:?}", e); - let _ = bot_cloned - .send_message(chat, "Failed to fetch Instagram media.") - .await; - } - }); - } + tokio::spawn(async move { + if let Err(e) = fetch_and_send(&bot_cloned, chat, &shortcode).await { + error!("error fetching/sending: {:?}", e); + let _ = bot_cloned + .send_message(chat, "Failed to fetch Instagram media.") + .await; + } + }); } respond(()) }) @@ -77,7 +77,7 @@ async fn fetch_and_send(bot: &Bot, chat_id: ChatId, shortcode: &str) -> Result<( let dir_path = dir.path().to_path_buf(); dbg!(&dir_path); - let target = format!("-{}", shortcode); + let target = format!("-{shortcode}"); dbg!(&target); let status = Command::new("instaloader") .arg("--dirname-pattern") @@ -134,7 +134,7 @@ async fn fetch_and_send(bot: &Bot, chat_id: ChatId, shortcode: &str) -> Result<( fn ext_lower(path: &Path) -> Option { path.extension() .and_then(|s| s.to_str()) - .map(|s| s.to_ascii_lowercase()) + .map(str::to_ascii_lowercase) } fn kind_by_magic(path: &Path) -> Option { diff --git a/src/telemetry.rs b/src/telemetry.rs index 988151e..c6da987 100644 --- a/src/telemetry.rs +++ b/src/telemetry.rs @@ -1,9 +1,8 @@ -use color_eyre::Result; use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer}; use tracing_subscriber::{EnvFilter, layer::SubscriberExt, util::SubscriberInitExt}; -/// # Errors -pub fn setup_logger() -> Result<()> { +/// Initialise tracing with bunyan-style JSON output. +pub fn setup_logger() { let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| "info".into()); let formatter = BunyanFormattingLayer::new("tg-relay-rs".into(), std::io::stdout); @@ -12,6 +11,4 @@ pub fn setup_logger() -> Result<()> { .with(JsonStorageLayer) .with(formatter) .init(); - - Ok(()) }