From dcf0623c4b1980ba0ddb42050d66e4db9949890b Mon Sep 17 00:00:00 2001 From: Guillermo Date: Sun, 12 Nov 2023 19:34:44 +0100 Subject: [PATCH] no mark as spoiler corrupted images --- data.db | Bin 0 -> 32768 bytes src/spoiler_mangas/mod.rs | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 data.db diff --git a/data.db b/data.db new file mode 100644 index 0000000000000000000000000000000000000000..4c77275611598cf46a8aacf57316dcabe82df611 GIT binary patch literal 32768 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 literal 0 HcmV?d00001 diff --git a/src/spoiler_mangas/mod.rs b/src/spoiler_mangas/mod.rs index 9e60fc4..4171eea 100644 --- a/src/spoiler_mangas/mod.rs +++ b/src/spoiler_mangas/mod.rs @@ -10,8 +10,8 @@ use image::{DynamicImage,GenericImageView}; use std::io::Cursor; use tokio::io::BufStream; -const TOLERANCE: i16 = 10; -const PERCENT_ACEPTANCE: u8 = 15; +const TOLERANCE: i16 = 0; +const PERCENT_ACEPTANCE: u8 = 5; fn check_percent(img: DynamicImage) -> u8 { let mut cont = 0; @@ -64,6 +64,7 @@ pub async fn check_image(msg: Message, bot: Bot) -> anyhow::Result<()> { Some(s) => { let mut percent = 0; let mut id : Option<(String, u32)> = None; + let mut failed = true; for p in s { let file = bot.get_file(p.file.id.clone()).await?; let empty_memory: Vec = Vec::new(); @@ -73,6 +74,7 @@ pub async fn check_image(msg: Message, bot: Bot) -> anyhow::Result<()> { let raw = reader.into_inner().into_inner().leak(); match image::load_from_memory(raw) { Ok(img) => { + failed = false; let img_percent = check_percent(img); if img_percent >= percent { percent = img_percent; @@ -91,7 +93,7 @@ pub async fn check_image(msg: Message, bot: Bot) -> anyhow::Result<()> { Err(_e) => continue, } } - if percent < PERCENT_ACEPTANCE { + if !failed && percent < PERCENT_ACEPTANCE { bot.delete_message(msg.chat.id, msg.id).await?; let response = match id { Some(i) => bot.send_photo(msg.chat.id, teloxide::types::InputFile::file_id(i.0)).has_spoiler(true),