1 files changed, 52 insertions, 47 deletions

diff --git a/kittybox-rs/src/frontend/onboarding.rs b/kittybox-rs/src/frontend/onboarding.rs
index 18def1d..9027201 100644
--- a/kittybox-rs/src/frontend/onboarding.rs
+++ b/kittybox-rs/src/frontend/onboarding.rs
@@ -1,25 +1,28 @@
-use kittybox_templates::{ErrorPage, Template, OnboardingPage};
-use crate::database::{Storage, Settings};
+use crate::database::{Settings, Storage};
 use axum::{
-    Json,
-    extract::{Host, Extension},
+    extract::{Extension, Host},
     http::StatusCode,
     response::{Html, IntoResponse},
+    Json,
 };
+use kittybox_templates::{ErrorPage, OnboardingPage, Template};
 use serde::Deserialize;
 use tracing::{debug, error};
 
 use super::FrontendError;
 
 pub async fn get() -> Html<String> {
-    Html(Template {
-        title: "Kittybox - Onboarding",
-        blog_name: "Kittybox",
-        feeds: vec![],
-        endpoints: None,
-        user: None,
-        content: OnboardingPage {}.to_string()
-    }.to_string())
+    Html(
+        Template {
+            title: "Kittybox - Onboarding",
+            blog_name: "Kittybox",
+            feeds: vec![],
+            endpoints: None,
+            user: None,
+            content: OnboardingPage {}.to_string(),
+        }
+        .to_string(),
+    )
 }
 
 #[derive(Deserialize, Debug)]
@@ -45,21 +48,21 @@ impl OnboardingData {
 
 #[tracing::instrument(skip(db, http))]
 async fn onboard<D: Storage + 'static>(
-    db: D, user_uid: url::Url, data: OnboardingData, http: reqwest::Client
+    db: D,
+    user_uid: url::Url,
+    data: OnboardingData,
+    http: reqwest::Client,
 ) -> Result<(), FrontendError> {
     // Create a user to pass to the backend
     // At this point the site belongs to nobody, so it is safe to do
-    let user = crate::indieauth::User::new(
-        user_uid.as_str(),
-        "https://kittybox.fireburn.ru/",
-        "create"
-    );
+    let user =
+        crate::indieauth::User::new(user_uid.as_str(), "https://kittybox.fireburn.ru/", "create");
 
     if data.user["type"][0] != "h-card" || data.first_post["type"][0] != "h-entry" {
         return Err(FrontendError::with_code(
             StatusCode::BAD_REQUEST,
-            "user and first_post should be an h-card and an h-entry"
-        ))
+            "user and first_post should be an h-card and an h-entry",
+        ));
     }
 
     db.set_setting(Settings::SiteName, user.me.as_str(), &data.blog_name)
@@ -71,7 +74,9 @@ async fn onboard<D: Storage + 'static>(
         hcard["properties"]["uid"] = serde_json::json!([&user_uid]);
         crate::micropub::normalize_mf2(hcard, &user)
     };
-    db.put_post(&hcard, user_uid.as_str()).await.map_err(FrontendError::from)?;
+    db.put_post(&hcard, user_uid.as_str())
+        .await
+        .map_err(FrontendError::from)?;
 
     debug!("Creating feeds...");
     for feed in data.feeds {
@@ -87,16 +92,18 @@ async fn onboard<D: Storage + 'static>(
             &user,
         );
 
-        db.put_post(&feed, user_uid.as_str()).await.map_err(FrontendError::from)?;
+        db.put_post(&feed, user_uid.as_str())
+            .await
+            .map_err(FrontendError::from)?;
     }
     let (uid, post) = crate::micropub::normalize_mf2(data.first_post, &user);
-    crate::micropub::_post(user, uid, post, db, http).await.map_err(|e| {
-        FrontendError {
+    crate::micropub::_post(user, uid, post, db, http)
+        .await
+        .map_err(|e| FrontendError {
             msg: "Error while posting the first post".to_string(),
             source: Some(Box::new(e)),
-            code: StatusCode::INTERNAL_SERVER_ERROR
-        }
-    })?;
+            code: StatusCode::INTERNAL_SERVER_ERROR,
+        })?;
 
     Ok(())
 }
@@ -105,36 +112,34 @@ pub async fn post<D: Storage + 'static>(
     Extension(db): Extension<D>,
     Host(host): Host,
     Json(data): Json<OnboardingData>,
-    Extension(http): Extension<reqwest::Client>
+    Extension(http): Extension<reqwest::Client>,
 ) -> axum::response::Response {
     let user_uid = format!("https://{}/", host.as_str());
 
     if db.post_exists(&user_uid).await.unwrap() {
-        IntoResponse::into_response((
-            StatusCode::FOUND,
-            [("Location", "/")]
-        ))
+        IntoResponse::into_response((StatusCode::FOUND, [("Location", "/")]))
     } else {
         match onboard(db, user_uid.parse().unwrap(), data, http).await {
-            Ok(()) => IntoResponse::into_response((
-                StatusCode::FOUND,
-                [("Location", "/")]
-            )),
+            Ok(()) => IntoResponse::into_response((StatusCode::FOUND, [("Location", "/")])),
             Err(err) => {
                 error!("Onboarding error: {}", err);
                 IntoResponse::into_response((
                     err.code(),
-                    Html(Template {
-                        title: "Kittybox - Onboarding",
-                        blog_name: "Kittybox",
-                        feeds: vec![],
-                        endpoints: None,
-                        user: None,
-                        content: ErrorPage {
-                            code: err.code(),
-                            msg: Some(err.msg().to_string()),
-                        }.to_string(),
-                    }.to_string())
+                    Html(
+                        Template {
+                            title: "Kittybox - Onboarding",
+                            blog_name: "Kittybox",
+                            feeds: vec![],
+                            endpoints: None,
+                            user: None,
+                            content: ErrorPage {
+                                code: err.code(),
+                                msg: Some(err.msg().to_string()),
+                            }
+                            .to_string(),
+                        }
+                        .to_string(),
+                    ),
                 ))
             }
         }