chore: commit the things that are to be commited

src/routes/bots/create.rs

@@ -2,7 +2,7 @@ use crate::util::{regex::RE_USERNAME, variables::MAX_BOT_COUNT};
 
 use nanoid::nanoid;
 use revolt_quark::{
-    models::{Bot, User},
+    models::{Bot, User, user::BotInformation},
     Db, Error, Result,
 };
 
@@ -31,13 +31,28 @@ pub async fn create_bot(db: &Db, user: User, info: Json<Data>) -> Result<Json<Bo
         return Err(Error::ReachedMaximumBots);
     }
 
+    if db.is_username_taken(&info.name).await? {
+        return Err(Error::UsernameTaken);
+    }
+
+    let id = Ulid::new().to_string();
+    let bot_user = User {
+        id: id.clone(),
+        username: info.name,
+        bot: Some(BotInformation {
+            owner: user.id.clone()
+        }),
+        ..Default::default()
+    };
+
     let bot = Bot {
-        id: Ulid::new().to_string(),
+        id,
         owner: user.id,
         token: nanoid!(64),
         ..Default::default()
     };
 
+    db.insert_user(&bot_user).await?;
     db.insert_bot(&bot).await?;
     Ok(Json(bot))
 }

src/routes/bots/edit.rs

@@ -49,9 +49,9 @@ pub async fn edit_bot(db: &Db, user: User, target: Ref, data: Json<Data>) -> Res
     }
 
     if data.public.is_none()
-        || data.analytics.is_none()
-        || data.interactions_url.is_none()
-        || data.remove.is_none()
+        && data.analytics.is_none()
+        && data.interactions_url.is_none()
+        && data.remove.is_none()
     {
         return Ok(Json(bot));
     }

src/routes/bots/invite.rs

@@ -1,5 +1,5 @@
 use revolt_quark::{
-    models::{Channel, User, Member, server_member::MemberCompositeKey},
+    models::{server_member::MemberCompositeKey, Channel, Member, User},
     perms, ChannelPermission, Db, EmptyResponse, Error, Ref, Result, ServerPermission,
 };
 
@@ -46,14 +46,12 @@ pub async fn invite_bot(
             let member = Member {
                 id: MemberCompositeKey {
                     server: server.id,
-                    user: bot.id
+                    user: bot.id,
                 },
                 ..Default::default()
             };
 
-            db.insert_member(&member)
-                .await
-                .map(|_| EmptyResponse)
+            db.insert_member(&member).await.map(|_| EmptyResponse)
         }
         Destination::Group { group } => {
             let channel = db.fetch_channel(&group).await?;