refactor(quark): port add_friend, block_user, change_username, remove_friend, send_friend_request, unblock_user
#283
This commit is contained in:
@@ -1,37 +1,30 @@
|
||||
use revolt_quark::models::User;
|
||||
use revolt_quark::{Database, Error, Result};
|
||||
|
||||
use revolt_database::util::reference::Reference;
|
||||
use revolt_database::{Database, User};
|
||||
use revolt_models::v0;
|
||||
use revolt_result::{create_error, Result};
|
||||
use rocket::serde::json::Json;
|
||||
use rocket::State;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
/// # User Lookup Information
|
||||
#[derive(Serialize, Deserialize, JsonSchema)]
|
||||
pub struct DataSendFriendRequest {
|
||||
/// Username and discriminator combo separated by #
|
||||
username: String,
|
||||
}
|
||||
|
||||
/// # Send Friend Request
|
||||
///
|
||||
/// Send a friend request to another user.
|
||||
#[openapi(tag = "Relationships")]
|
||||
#[post("/friend", data = "<data>")]
|
||||
pub async fn req(
|
||||
pub async fn send_friend_request(
|
||||
db: &State<Database>,
|
||||
user: User,
|
||||
data: Json<DataSendFriendRequest>,
|
||||
) -> Result<Json<User>> {
|
||||
mut user: User,
|
||||
data: Json<v0::DataSendFriendRequest>,
|
||||
) -> Result<Json<v0::User>> {
|
||||
if let Some((username, discriminator)) = data.username.split_once('#') {
|
||||
let mut target = db.fetch_user_by_username(username, discriminator).await?;
|
||||
|
||||
if user.bot.is_some() || target.bot.is_some() {
|
||||
return Err(Error::IsBot);
|
||||
return Err(create_error!(IsBot));
|
||||
}
|
||||
|
||||
user.add_friend(db, &mut target).await?;
|
||||
Ok(Json(target.with_auto_perspective(db, &user).await))
|
||||
Ok(Json(target.into(db, &user).await))
|
||||
} else {
|
||||
Err(Error::InvalidProperty)
|
||||
Err(create_error!(InvalidProperty))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user