feat: clean up bot restrictions

This commit is contained in:
Paul Makles
2022-05-07 15:20:42 +01:00
parent 97fef56bad
commit 09e918d8e0
15 changed files with 59 additions and 9 deletions

View File

@@ -1,5 +1,5 @@
use revolt_quark::models::User;
use revolt_quark::{Database, Result};
use revolt_quark::{Database, Error, Result};
use rocket::serde::json::Json;
use rocket::State;
@@ -11,6 +11,11 @@ use rocket::State;
#[put("/<username>/friend")]
pub async fn req(db: &State<Database>, user: User, username: String) -> Result<Json<User>> {
let mut target = db.fetch_user_by_username(&username).await?;
if user.bot.is_some() || target.bot.is_some() {
return Err(Error::IsBot);
}
user.add_friend(db, &mut target).await?;
Ok(Json(target.with_auto_perspective(db, &user).await))
}

View File

@@ -24,6 +24,10 @@ pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<M
return Err(Error::InvalidOperation);
}
if user.bot.is_some() {
return Err(Error::IsBot);
}
let target = target.as_user(db).await?;
if perms(&user)

View File

@@ -1,5 +1,5 @@
use revolt_quark::models::User;
use revolt_quark::{Database, Result};
use revolt_quark::{Database, Error, Result};
use rocket::serde::json::Json;
use rocket::State;
@@ -11,6 +11,11 @@ use rocket::State;
#[delete("/<target>/friend")]
pub async fn req(db: &State<Database>, user: User, target: String) -> Result<Json<User>> {
let mut target = db.fetch_user(&target).await?;
if user.bot.is_some() || target.bot.is_some() {
return Err(Error::IsBot);
}
user.remove_friend(db, &mut target).await?;
Ok(Json(target.with_auto_perspective(db, &user).await))
}