From 86d33b9d81cd25ce072ef663cfc129b683398657 Mon Sep 17 00:00:00 2001 From: Bulat Kurbanov Date: Mon, 7 Aug 2023 02:04:56 +0200 Subject: [PATCH] Fix --- src/bots/approved_bot/modules/download.rs | 60 +++++++++-------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/src/bots/approved_bot/modules/download.rs b/src/bots/approved_bot/modules/download.rs index f11933f..faffdd7 100644 --- a/src/bots/approved_bot/modules/download.rs +++ b/src/bots/approved_bot/modules/download.rs @@ -497,44 +497,30 @@ async fn download_archive( return Ok(()); } - // let downloaded_data = match download_file_by_link( - // task.result_filename.unwrap(), - // task.result_link.unwrap() - // ).await { - // Ok(v) => v, - // Err(err) => { - // send_error_message(bot, message.chat.id, message.id).await; - // log::error!("{:?}", err); - // return Err(err); - // }, - // }; + let downloaded_data = match download_file_by_link( + task.result_filename.unwrap(), + task.result_link.unwrap() + ).await { + Ok(v) => v, + Err(err) => { + send_error_message(bot, message.chat.id, message.id).await; + log::error!("{:?}", err); + return Err(err); + }, + }; - // match _send_downloaded_file( - // &message, - // bot.clone(), - // downloaded_data, - // ).await { - // Ok(_) => (), - // Err(err) => { - // send_error_message(bot, message.chat.id, message.id).await; - // log::error!("{:?}", err); - // return Err(err); - // }, - // } - - match bot - .send_document( - message.chat.id, - InputFile::url(Url::parse(&task.result_link.unwrap()).unwrap()) - .file_name(task.result_filename.unwrap()) - ).await { - Ok(_) => (), - Err(err) => { - send_error_message(bot, message.chat.id, message.id).await; - log::error!("{:?}", err); - return Err(Box::new(err)); - }, - } + match _send_downloaded_file( + &message, + bot.clone(), + downloaded_data, + ).await { + Ok(_) => (), + Err(err) => { + send_error_message(bot, message.chat.id, message.id).await; + log::error!("{:?}", err); + return Err(err); + }, + } bot .delete_message(message.chat.id, message.id)