refactor(quark): port ban_create, ban_list, ban_remove, emoji_list, invites_fetch

#283
This commit is contained in:
Paul Makles
2024-04-07 20:48:36 +01:00
parent b2d3344ddd
commit 03340a2b5a
11 changed files with 250 additions and 189 deletions

View File

@@ -1,60 +1,33 @@
use revolt_quark::models::{File, ServerBan, User};
use revolt_quark::{perms, Db, Permission, Ref, Result};
use futures::future::join_all;
use revolt_database::util::permissions::DatabasePermissionQuery;
use revolt_database::util::reference::Reference;
use revolt_database::{Database, User};
use revolt_models::v0;
use revolt_permissions::{calculate_server_permissions, ChannelPermission};
use revolt_result::Result;
use rocket::serde::json::Json;
use serde::{Deserialize, Serialize};
/// # Banned User
///
/// Just enoguh user information to list bans.
#[derive(Serialize, Deserialize, JsonSchema)]
struct BannedUser {
/// Id of the banned user
#[serde(rename = "_id")]
pub id: String,
/// Username of the banned user
pub username: String,
/// Discriminator of the banned user
pub discriminator: String,
/// Avatar of the banned user
pub avatar: Option<File>,
}
/// # Ban List Result
#[derive(Serialize, Deserialize, JsonSchema)]
pub struct BanListResult {
/// Users objects
users: Vec<BannedUser>,
/// Ban objects
bans: Vec<ServerBan>,
}
impl From<User> for BannedUser {
fn from(user: User) -> Self {
BannedUser {
id: user.id,
username: user.username,
discriminator: user.discriminator,
avatar: user.avatar,
}
}
}
use rocket::State;
/// # Fetch Bans
///
/// Fetch all bans on a server.
#[openapi(tag = "Server Members")]
#[get("/<target>/bans")]
pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<BanListResult>> {
pub async fn list(
db: &State<Database>,
user: User,
target: Reference,
) -> Result<Json<v0::BanListResult>> {
let server = target.as_server(db).await?;
perms(&user)
.server(&server)
.throw_permission(db, Permission::BanMembers)
.await?;
let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
calculate_server_permissions(&mut query)
.await
.throw_if_lacking_channel_permission(ChannelPermission::BanMembers)?;
let bans = db.fetch_bans(&server.id).await?;
let users = db
.fetch_users(
let users = join_all(
db.fetch_users(
&bans
.iter()
.map(|x| &x.id.user)
@@ -63,8 +36,12 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<BanListResult>
)
.await?
.into_iter()
.map(|x| x.into())
.collect();
.map(|u| u.into_self()),
)
.await;
Ok(Json(BanListResult { users, bans }))
Ok(Json(v0::BanListResult {
users: users.into_iter().map(Into::into).collect(),
bans: bans.into_iter().map(Into::into).collect(),
}))
}