From 91955501e215bea3ae2554ee77e3534f9a6d617e Mon Sep 17 00:00:00 2001 From: Aravinth Manivannan Date: Sun, 24 Mar 2024 08:37:26 +0530 Subject: [PATCH 1/2] feat: enable easy PoW configuration auto-enhance by default --- config/default.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/default.toml b/config/default.toml index 51d787dfd..1ab35feb1 100644 --- a/config/default.toml +++ b/config/default.toml @@ -34,11 +34,11 @@ enable_stats = true [captcha.default_difficulty_strategy] avg_traffic_difficulty = 50000 # almost instant solution -#avg_traffic_time = 1 # almost instant solution +avg_traffic_time = 1 # almost instant solution peak_sustainable_traffic_difficulty = 3000000 # roughly 1.5s -#peak_sustainable_traffic_time = 3 +peak_sustainable_traffic_time = 3 broke_my_site_traffic_difficulty = 5000000 # greater than 3.5s -#broke_my_site_traffic_time = 5 +broke_my_site_traffic_time = 5 duration = 30 # cooldown period in seconds [database] From 3a7e71b4996260c4aee4de85ff78bd508f652c13 Mon Sep 17 00:00:00 2001 From: Aravinth Manivannan Date: Sun, 24 Mar 2024 08:40:52 +0530 Subject: [PATCH 2/2] fix: exit loop when paginated DB query returns empty array fixes: https://github.com/mCaptcha/mCaptcha/issues/154 --- src/easy.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/easy.rs b/src/easy.rs index e6d880f1c..2fbef1694 100644 --- a/src/easy.rs +++ b/src/easy.rs @@ -55,6 +55,9 @@ impl UpdateEasyCaptcha { } let mut patterns = data.db.get_all_easy_captchas(limit, offset).await?; + if patterns.is_empty() { + break; + } for pattern in patterns.drain(0..) { if !Self::can_run(rx) { return Ok(()); @@ -85,6 +88,7 @@ impl UpdateEasyCaptcha { } page += 1; } + Ok(()) } fn can_run(rx: &mut Receiver<()>) -> bool {