Merge branch 'wip/ban'
This commit is contained in:
commit
d64dc92b99
12 changed files with 231 additions and 8 deletions
57
src/api/v1/guilds/uuid/bans.rs
Normal file
57
src/api/v1/guilds/uuid/bans.rs
Normal file
|
@ -0,0 +1,57 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use axum::{
|
||||
Extension, Json,
|
||||
extract::{Path, State},
|
||||
http::StatusCode,
|
||||
response::IntoResponse,
|
||||
};
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{
|
||||
AppState,
|
||||
api::v1::auth::CurrentUser,
|
||||
error::Error,
|
||||
objects::{GuildBan, Member, Permissions},
|
||||
utils::global_checks,
|
||||
};
|
||||
|
||||
pub async fn get(
|
||||
State(app_state): State<Arc<AppState>>,
|
||||
Path(guild_uuid): Path<Uuid>,
|
||||
Extension(CurrentUser(uuid)): Extension<CurrentUser<Uuid>>,
|
||||
) -> Result<impl IntoResponse, Error> {
|
||||
global_checks(&app_state, uuid).await?;
|
||||
|
||||
let mut conn = app_state.pool.get().await?;
|
||||
|
||||
let caller = Member::check_membership(&mut conn, uuid, guild_uuid).await?;
|
||||
caller
|
||||
.check_permission(&app_state, Permissions::BanMember)
|
||||
.await?;
|
||||
|
||||
let all_guild_bans = GuildBan::fetch_all(&mut conn, guild_uuid).await?;
|
||||
|
||||
Ok((StatusCode::OK, Json(all_guild_bans)))
|
||||
}
|
||||
|
||||
pub async fn unban(
|
||||
State(app_state): State<Arc<AppState>>,
|
||||
Path((guild_uuid, user_uuid)): Path<(Uuid, Uuid)>,
|
||||
Extension(CurrentUser(uuid)): Extension<CurrentUser<Uuid>>,
|
||||
) -> Result<impl IntoResponse, Error> {
|
||||
global_checks(&app_state, uuid).await?;
|
||||
|
||||
let mut conn = app_state.pool.get().await?;
|
||||
|
||||
let caller = Member::check_membership(&mut conn, uuid, guild_uuid).await?;
|
||||
caller
|
||||
.check_permission(&app_state, Permissions::BanMember)
|
||||
.await?;
|
||||
|
||||
let ban = GuildBan::fetch_one(&mut conn, guild_uuid, user_uuid).await?;
|
||||
|
||||
ban.unban(&mut conn).await?;
|
||||
|
||||
Ok(StatusCode::OK)
|
||||
}
|
|
@ -7,11 +7,12 @@ use axum::{
|
|||
extract::{Multipart, Path, State},
|
||||
http::StatusCode,
|
||||
response::IntoResponse,
|
||||
routing::{get, patch, post},
|
||||
routing::{delete, get, patch, post},
|
||||
};
|
||||
use bytes::Bytes;
|
||||
use uuid::Uuid;
|
||||
|
||||
mod bans;
|
||||
mod channels;
|
||||
mod invites;
|
||||
mod members;
|
||||
|
@ -42,6 +43,9 @@ pub fn router() -> Router<Arc<AppState>> {
|
|||
.route("/invites", post(invites::create))
|
||||
// Members
|
||||
.route("/members", get(members::get))
|
||||
// Bans
|
||||
.route("/bans", get(bans::get))
|
||||
.route("/bans/{uuid}", delete(bans::unban))
|
||||
}
|
||||
|
||||
/// `GET /api/v1/guilds/{uuid}` DESCRIPTION
|
||||
|
|
|
@ -2,7 +2,7 @@ use std::sync::Arc;
|
|||
|
||||
use axum::{
|
||||
Router,
|
||||
routing::{delete, get},
|
||||
routing::{delete, get, post},
|
||||
};
|
||||
|
||||
use crate::AppState;
|
||||
|
@ -13,4 +13,5 @@ pub fn router() -> Router<Arc<AppState>> {
|
|||
Router::new()
|
||||
.route("/{uuid}", get(uuid::get))
|
||||
.route("/{uuid}", delete(uuid::delete))
|
||||
.route("/{uuid}/ban", post(uuid::ban::post))
|
||||
}
|
||||
|
|
47
src/api/v1/members/uuid/ban.rs
Normal file
47
src/api/v1/members/uuid/ban.rs
Normal file
|
@ -0,0 +1,47 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use axum::{
|
||||
Extension,
|
||||
extract::{Json, Path, State},
|
||||
http::StatusCode,
|
||||
response::IntoResponse,
|
||||
};
|
||||
use serde::Deserialize;
|
||||
|
||||
use crate::{
|
||||
AppState,
|
||||
api::v1::auth::CurrentUser,
|
||||
error::Error,
|
||||
objects::{Member, Permissions},
|
||||
utils::global_checks,
|
||||
};
|
||||
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct RequstBody {
|
||||
reason: String,
|
||||
}
|
||||
|
||||
pub async fn post(
|
||||
State(app_state): State<Arc<AppState>>,
|
||||
Path(member_uuid): Path<Uuid>,
|
||||
Extension(CurrentUser(uuid)): Extension<CurrentUser<Uuid>>,
|
||||
Json(payload): Json<RequstBody>,
|
||||
) -> Result<impl IntoResponse, Error> {
|
||||
global_checks(&app_state, uuid).await?;
|
||||
|
||||
let mut conn = app_state.pool.get().await?;
|
||||
|
||||
let member = Member::fetch_one_with_member(&app_state, None, member_uuid).await?;
|
||||
|
||||
let caller = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
|
||||
|
||||
caller
|
||||
.check_permission(&app_state, Permissions::BanMember)
|
||||
.await?;
|
||||
|
||||
member.ban(&mut conn, &payload.reason).await?;
|
||||
|
||||
Ok(StatusCode::OK)
|
||||
}
|
|
@ -1,5 +1,7 @@
|
|||
//! `/api/v1/members/{uuid}` Member specific endpoints
|
||||
|
||||
pub mod ban;
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
use crate::{
|
||||
|
@ -29,7 +31,7 @@ pub async fn get(
|
|||
|
||||
let me = Me::get(&mut conn, uuid).await?;
|
||||
|
||||
let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?;
|
||||
let member = Member::fetch_one_with_member(&app_state, Some(&me), member_uuid).await?;
|
||||
Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
|
||||
|
||||
Ok((StatusCode::OK, Json(member)))
|
||||
|
@ -46,7 +48,7 @@ pub async fn delete(
|
|||
|
||||
let me = Me::get(&mut conn, uuid).await?;
|
||||
|
||||
let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?;
|
||||
let member = Member::fetch_one_with_member(&app_state, Some(&me), member_uuid).await?;
|
||||
|
||||
let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue