feat: migrate get_email to use db_*

src/pages/panel/notifications.rs

@@ -74,16 +74,7 @@ pub async fn notifications(data: AppData, id: Identity) -> PageResult<impl Respo
     // TODO handle error where payload.to doesnt exist
 
     //    let mut notifications = runner::get_notification(&data, &receiver).await?;
-    let mut notifications = data
-        .dblib
-        .get_all_unread_notifications(&receiver)
-        .await
-        .map_err(|e| {
-            let se: ServiceError = e.into();
-            let pe: PageError = se.into();
-            pe
-        })?;
-
+    let mut notifications = data.dblib.get_all_unread_notifications(&receiver).await?;
     let notifications = notifications.drain(0..).map(|x| x.into()).collect();
 
     let body = IndexPage::new(notifications).render_once().unwrap();

src/pages/panel/settings.rs

@@ -69,22 +69,13 @@ pub struct IndexPage<'a> {
 async fn settings(data: AppData, id: Identity) -> PageResult<impl Responder> {
     let username = id.identity().unwrap();
 
-    struct DBResult {
-        email: Option<String>,
-        secret: String,
-    }
-
-    let details = sqlx::query_as!(
-        DBResult,
-        r#"SELECT email, secret  FROM mcaptcha_users WHERE name = ($1)"#,
-        &username,
-    )
-    .fetch_one(&data.db)
-    .await?;
+    let secret = data.dblib.get_secret(&username).await?;
+    let secret = secret.secret;
+    let email = data.dblib.get_email(&username).await?;
 
     let data = IndexPage {
-        email: details.email,
-        secret: details.secret,
+        email,
+        secret,
         username: &username,
     };
 

src/pages/panel/sitekey/view.rs

@@ -20,6 +20,8 @@ use actix_web::{web, HttpResponse, Responder};
 use futures::{future::TryFutureExt, try_join};
 use sailfish::TemplateOnce;
 
+use libmcaptcha::defense::Level;
+
 use crate::errors::*;
 use crate::stats::fetch::Stats;
 use crate::AppData;
@@ -33,11 +35,6 @@ struct McaptchaConfig {
     name: String,
 }
 
-#[derive(Clone)]
-struct Level {
-    difficulty_factor: i32,
-    visitor_threshold: i32,
-}
 #[derive(TemplateOnce, Clone)]
 #[template(path = "panel/sitekey/view/index.html")]
 struct IndexPage {
@@ -89,19 +86,9 @@ pub async fn view_sitekey(
     .fetch_one(&data.db)
     .await?;
 
-    let levels_fut = sqlx::query_as!(
-        Level,
-        "SELECT 
-            difficulty_factor, visitor_threshold 
-        FROM 
-            mcaptcha_levels 
-        WHERE config_id = $1 ORDER BY difficulty_factor ASC",
-        &config.config_id
-    )
-    .fetch_all(&data.db)
-    .err_into();
+    let levels = data.dblib.get_captcha_levels(Some(&username), &key).await?;
 
-    let (stats, levels) = try_join!(Stats::new(&username, &key, &data.db), levels_fut)?;
+    let stats = Stats::new(&username, &key, &data.db).await?;
 
     let body = IndexPage::new(stats, config, levels, key)
         .render_once()