chore: refine user and bot creation methods

crates/delta/src/routes/bots/create.rs

@@ -1,11 +1,8 @@
-use nanoid::nanoid;
-
-use revolt_database::{Bot, BotInformation, Database, User};
+use revolt_database::{Bot, Database, User};
 use revolt_models::v0;
 use revolt_result::{create_error, Result};
 use rocket::serde::json::Json;
 use rocket::State;
-use ulid::Ulid;
 use validator::Validate;
 
 /// # Create Bot
@@ -18,10 +15,6 @@ pub async fn create_bot(
     user: User,
     info: Json<v0::DataCreateBot>,
 ) -> Result<Json<v0::Bot>> {
-    if user.bot.is_some() {
-        return Err(create_error!(IsBot));
-    }
-
     let info = info.into_inner();
     info.validate().map_err(|error| {
         create_error!(FailedValidation {
@@ -29,32 +22,6 @@ pub async fn create_bot(
         })
     })?;
 
-    // TODO: config
-    let max_bot_count = 5;
-    if db.get_number_of_bots_by_user(&user.id).await? >= max_bot_count {
-        return Err(create_error!(ReachedMaximumBots));
-    }
-
-    let id = Ulid::new().to_string();
-    let username = User::validate_username(info.name)?;
-    let bot_user = User {
-        id: id.clone(),
-        discriminator: User::find_discriminator(db, &username, None).await?,
-        username,
-        bot: Some(BotInformation {
-            owner: user.id.clone(),
-        }),
-        ..Default::default()
-    };
-
-    let bot = Bot {
-        id,
-        owner: user.id,
-        token: nanoid!(64),
-        ..Default::default()
-    };
-
-    db.insert_user(&bot_user).await?;
-    db.insert_bot(&bot).await?;
+    let bot = Bot::create(db, info.name, &user, None).await?;
     Ok(Json(bot.into()))
 }

crates/delta/src/routes/onboard/complete.rs

@@ -1,7 +1,8 @@
 use crate::util::regex::RE_USERNAME;
-use revolt_quark::{
-    authifier::models::Session, models::User, Database, EmptyResponse, Error, Result,
-};
+use revolt_database::{Database, User};
+use revolt_models::v0;
+use revolt_quark::authifier::models::Session;
+use revolt_result::{create_error, Result};
 
 use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
@@ -25,22 +26,22 @@ pub async fn req(
     session: Session,
     user: Option<User>,
     data: Json<DataOnboard>,
-) -> Result<EmptyResponse> {
+) -> Result<Json<v0::User>> {
     if user.is_some() {
-        return Err(Error::AlreadyOnboarded);
+        return Err(create_error!(AlreadyOnboarded));
     }
 
     let data = data.into_inner();
-    data.validate()
-        .map_err(|error| Error::FailedValidation { error })?;
+    data.validate().map_err(|error| {
+        create_error!(FailedValidation {
+            error: error.to_string()
+        })
+    })?;
 
-    let username = User::validate_username(data.username)?;
-    let user = User {
-        id: session.user_id,
-        discriminator: User::find_discriminator(db, &username, None).await?,
-        username,
-        ..Default::default()
-    };
-
-    db.insert_user(&user).await.map(|_| EmptyResponse)
+    Ok(Json(
+        User::create(db, data.username, session.user_id, None)
+            .await?
+            .into_self()
+            .await,
+    ))
 }