feat(core): permissions query, finish bots impl

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

@@ -1,60 +1,32 @@
-use crate::util::regex::RE_USERNAME;
-
-use revolt_quark::{
-    models::{
-        bot::{FieldsBot, PartialBot},
-        Bot, User,
-    },
-    Db, Error, Ref, Result,
-};
+use revolt_database::{util::reference::Reference, Database, PartialBot, User};
+use revolt_models::v0::{self, DataEditBot};
+use revolt_result::{create_error, Result};
+use rocket::State;
 
 use rocket::serde::json::Json;
-use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-/// # Bot Details
-#[derive(Validate, Serialize, Deserialize, JsonSchema)]
-pub struct DataEditBot {
-    /// Bot username
-    #[validate(length(min = 2, max = 32), regex = "RE_USERNAME")]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    name: Option<String>,
-    /// Whether the bot can be added by anyone
-    public: Option<bool>,
-    /// Whether analytics should be gathered for this bot
-    ///
-    /// Must be enabled in order to show up on [Revolt Discover](https://rvlt.gg).
-    analytics: Option<bool>,
-    /// Interactions URL
-    #[validate(length(min = 1, max = 2048))]
-    interactions_url: Option<String>,
-    /// Fields to remove from bot object
-    #[validate(length(min = 1))]
-    remove: Option<Vec<FieldsBot>>,
-}
-
 /// # Edit Bot
 ///
 /// Edit bot details by its id.
 #[openapi(tag = "Bots")]
 #[patch("/<target>", data = "<data>")]
 pub async fn edit_bot(
-    db: &Db,
+    db: &State<Database>,
     user: User,
-    target: Ref,
+    target: Reference,
     data: Json<DataEditBot>,
-) -> Result<Json<Bot>> {
-    if user.bot.is_some() {
-        return Err(Error::IsBot);
-    }
-
+) -> Result<Json<v0::Bot>> {
     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 mut bot = target.as_bot(db).await?;
     if bot.owner != user.id {
-        return Err(Error::NotFound);
+        return Err(create_error!(NotFound));
     }
 
     if let Some(name) = data.name {
@@ -67,7 +39,7 @@ pub async fn edit_bot(
         && data.interactions_url.is_none()
         && data.remove.is_none()
     {
-        return Ok(Json(bot));
+        return Ok(Json(bot.into()));
     }
 
     let DataEditBot {
@@ -78,26 +50,23 @@ pub async fn edit_bot(
         ..
     } = data;
 
-    let mut partial = PartialBot {
+    let partial = PartialBot {
         public,
         analytics,
         interactions_url,
         ..Default::default()
     };
 
-    if let Some(remove) = &remove {
-        for field in remove {
-            bot.remove(field);
-        }
+    bot.update(
+        db,
+        partial,
+        remove
+            .unwrap_or_default()
+            .into_iter()
+            .map(|v| v.into())
+            .collect(),
+    )
+    .await?;
 
-        if remove.iter().any(|x| x == &FieldsBot::Token) {
-            partial.token = Some(bot.token.clone());
-        }
-    }
-
-    db.update_bot(&bot.id, &partial, remove.unwrap_or_default())
-        .await?;
-
-    bot.apply_options(partial);
-    Ok(Json(bot))
+    Ok(Json(bot.into()))
 }