feat: migrate get captcha levels to use db_*

src/api/v1/mcaptcha/get.rs

@@ -17,6 +17,7 @@
 use actix_identity::Identity;
 use actix_web::{web, HttpResponse, Responder};
 
+use libmcaptcha::defense::Level;
 use serde::{Deserialize, Serialize};
 
 use super::create::MCaptchaDetails;
@@ -56,20 +57,8 @@ pub mod runner {
         key: &str,
         username: &str,
         data: &AppData,
-    ) -> ServiceResult<Vec<I32Levels>> {
+    ) -> ServiceResult<Vec<Level>> {
-        let levels = sqlx::query_as!(
+        let levels = data.dblib.get_captcha_levels(Some(username), key).await?;
-            I32Levels,
-            "SELECT difficulty_factor, visitor_threshold FROM mcaptcha_levels  WHERE
-            config_id = (
-                SELECT config_id FROM mcaptcha_config WHERE key = ($1)
-                AND user_id = (SELECT ID from mcaptcha_users WHERE name = $2)
-                )
-            ORDER BY difficulty_factor ASC;",
-            key,
-            &username
-        )
-        .fetch_all(&data.db)
-        .await?;
 
         Ok(levels)
     }

src/api/v1/mcaptcha/update.rs

@@ -14,8 +14,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-use std::borrow::Cow;
-
 use actix_identity::Identity;
 use actix_web::{web, HttpResponse, Responder};
 use libmcaptcha::defense::Level;
@@ -45,19 +43,14 @@ pub async fn update_key(
     loop {
         key = get_random(32);
 
-        let mut key;
+        match data
-        loop {
+            .dblib
-            key = get_random(32);
+            .update_captcha_key(&username, &payload.key, &key)
-
+            .await
-            match data
+        {
-                .dblib
+            Ok(_) => break,
-                .update_captcha_key(&username, &payload.key, &key)
+            Err(DBError::SecretTaken) => continue,
-                .await
+            Err(e) => return Err(e.into()),
-            {
-                Ok(_) => break,
-                Err(DBError::SecretTaken) => continue,
-                Err(e) => return Err(e.into()),
-            }
         }
     }
 
@@ -100,7 +93,6 @@ pub async fn update_captcha(
 }
 
 pub mod runner {
-    use futures::future::try_join_all;
     use libmcaptcha::{master::messages::RemoveCaptcha, DefenseBuilder};
 
     use super::*;

src/api/v1/pow/get_config.rs

@@ -23,7 +23,6 @@ use libmcaptcha::{
 };
 use serde::{Deserialize, Serialize};
 
-use super::I32Levels;
 use crate::errors::*;
 use crate::stats::record::record_fetch;
 use crate::AppData;
@@ -108,29 +107,20 @@ pub async fn get_config(
 /// creates [MCaptcha][libmcaptcha::MCaptcha] and adds it to [Master][libmcaptcha::Defense]
 async fn init_mcaptcha(data: &AppData, key: &str) -> ServiceResult<()> {
     // get levels
-    let levels_fut = sqlx::query_as!(
+    let levels = data.dblib.get_captcha_levels(None, key).await?;
-        I32Levels,
-        "SELECT difficulty_factor, visitor_threshold FROM mcaptcha_levels  WHERE
-            config_id = (
-                SELECT config_id FROM mcaptcha_config WHERE key = ($1)
-                ) ORDER BY difficulty_factor ASC;",
-        &key,
-    )
-    .fetch_all(&data.db);
-
     struct DurationResp {
         duration: i32,
     }
     // get duration
-    let duration_fut = sqlx::query_as!(
+    let duration = sqlx::query_as!(
         DurationResp,
         "SELECT duration FROM mcaptcha_config  
         WHERE key = $1",
         &key,
     )
-    .fetch_one(&data.db);
+    .fetch_one(&data.db)
+    .await?;
     //let (levels, duration) = futures::try_join!(levels_fut, duration_fut).await?;
-    let (levels, duration) = futures::try_join!(levels_fut, duration_fut)?;
 
     // build defense
     let mut defense = DefenseBuilder::default();