From ea8290f74ca867d879bfb60f2919ce6d31f5485a Mon Sep 17 00:00:00 2001 From: Bulat Kurbanov Date: Tue, 14 Oct 2025 17:52:15 +0200 Subject: [PATCH] Clean up code formatting and error handling The commit includes better handling of API errors, cleaner match patterns, and consistent whitespace/formatting in file_utils.rs. --- src/core/file_utils.rs | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/core/file_utils.rs b/src/core/file_utils.rs index 22008ef..ef29a3f 100644 --- a/src/core/file_utils.rs +++ b/src/core/file_utils.rs @@ -1,6 +1,7 @@ use std::error::Error; use axum::body::Bytes; +use moka::future::Cache; use once_cell::sync::Lazy; use serde::Serialize; use teloxide::{ @@ -9,7 +10,6 @@ use teloxide::{ }; use tokio::fs::File; use tracing::log; -use moka::future::Cache; use super::bot::ROUND_ROBIN_BOT; use crate::config::CONFIG; @@ -44,7 +44,6 @@ pub static TEMP_FILES_CACHE: Lazy> = Lazy::new(|| { .build() }); - pub async fn upload_file( file: Bytes, filename: String, @@ -70,7 +69,6 @@ pub async fn upload_file( } } - pub async fn download_file(chat_id: i64, message_id: i32) -> Result, Box> { let bot = ROUND_ROBIN_BOT.get_bot(); @@ -84,16 +82,12 @@ pub async fn download_file(chat_id: i64, message_id: i32) -> Result { Ok(v) => v, Err(err) => { - if let teloxide::RequestError::Api(ref err) = err { - if let teloxide::ApiError::MessageToForwardNotFound = err { - return Ok(None); - } + if let teloxide::RequestError::Api(teloxide::ApiError::MessageToForwardNotFound) = err { + return Ok(None); } - if let teloxide::RequestError::Api(ref err) = err { - if let teloxide::ApiError::MessageIdInvalid = err { - return Ok(None); - } + if let teloxide::RequestError::Api(teloxide::ApiError::MessageIdInvalid) = err { + return Ok(None); } log::error!("Error: {}", err); @@ -103,7 +97,9 @@ pub async fn download_file(chat_id: i64, message_id: i32) -> Result let file_id = forwarded_message.document().unwrap().file.id.clone(); - TEMP_FILES_CACHE.insert(message_id, forwarded_message.id).await; + TEMP_FILES_CACHE + .insert(message_id, forwarded_message.id) + .await; let path = match bot.get_file(file_id.clone()).await { Ok(v) => v.path, @@ -116,7 +112,6 @@ pub async fn download_file(chat_id: i64, message_id: i32) -> Result Ok(Some(File::open(path).await?)) } - pub async fn clean_files() -> Result<(), Box> { let bots_folder = "/var/lib/telegram-bot-api/"; let documents_folder_name = "documents";