wip/kick #36
4 changed files with 13 additions and 14 deletions
|
@ -2,11 +2,10 @@ use std::sync::Arc;
|
||||||
|
|
||||||
use axum::{
|
use axum::{
|
||||||
Router,
|
Router,
|
||||||
middleware::from_fn_with_state,
|
routing::{delete, get},
|
||||||
routing::{any, delete, get, patch},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::{AppState, api::v1::auth::CurrentUser};
|
use crate::AppState;
|
||||||
|
|
||||||
mod uuid;
|
mod uuid;
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ use crate::{
|
||||||
AppState,
|
AppState,
|
||||||
api::v1::auth::CurrentUser,
|
api::v1::auth::CurrentUser,
|
||||||
error::Error,
|
error::Error,
|
||||||
objects::{Channel, Member, Permissions, Me},
|
objects::{Me, Member, Permissions},
|
||||||
utils::global_checks,
|
utils::global_checks,
|
||||||
};
|
};
|
||||||
use axum::{
|
use axum::{
|
||||||
|
@ -16,7 +16,6 @@ use axum::{
|
||||||
response::IntoResponse,
|
response::IntoResponse,
|
||||||
};
|
};
|
||||||
|
|
||||||
use serde::Deserialize;
|
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
pub async fn get(
|
pub async fn get(
|
||||||
|
@ -32,7 +31,6 @@ pub async fn get(
|
||||||
|
|
||||||
let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?;
|
let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?;
|
||||||
Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
|
Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
|
||||||
|
|
||||||
|
|
||||||
Ok((StatusCode::OK, Json(member)))
|
Ok((StatusCode::OK, Json(member)))
|
||||||
}
|
}
|
||||||
|
@ -51,11 +49,12 @@ pub async fn delete(
|
||||||
let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?;
|
let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?;
|
||||||
|
|
||||||
let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
|
let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
|
||||||
|
|
||||||
deleter.check_permission(&app_state, Permissions::ManageMember).await?;
|
deleter
|
||||||
|
.check_permission(&app_state, Permissions::ManageMember)
|
||||||
|
.await?;
|
||||||
|
|
||||||
member.delete(&mut conn).await?;
|
member.delete(&mut conn).await?;
|
||||||
|
|
||||||
Ok(StatusCode::OK)
|
Ok(StatusCode::OK)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,9 +11,9 @@ mod channels;
|
||||||
mod guilds;
|
mod guilds;
|
||||||
mod invites;
|
mod invites;
|
||||||
mod me;
|
mod me;
|
||||||
|
mod members;
|
||||||
mod stats;
|
mod stats;
|
||||||
mod users;
|
mod users;
|
||||||
mod members;
|
|
||||||
|
|
||||||
pub fn router(app_state: Arc<AppState>) -> Router<Arc<AppState>> {
|
pub fn router(app_state: Arc<AppState>) -> Router<Arc<AppState>> {
|
||||||
let router_with_auth = Router::new()
|
let router_with_auth = Router::new()
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
use diesel::{
|
use diesel::{
|
||||||
delete, insert_into, ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper
|
ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, delete,
|
||||||
|
insert_into,
|
||||||
};
|
};
|
||||||
use diesel_async::RunQueryDsl;
|
use diesel_async::RunQueryDsl;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
@ -119,10 +120,10 @@ impl Member {
|
||||||
member.build(app_state, Some(me)).await
|
member.build(app_state, Some(me)).await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn fetch_one_with_member (
|
pub async fn fetch_one_with_member(
|
||||||
app_state: &AppState,
|
app_state: &AppState,
|
||||||
me: &Me,
|
me: &Me,
|
||||||
uuid: Uuid
|
uuid: Uuid,
|
||||||
) -> Result<Self, Error> {
|
) -> Result<Self, Error> {
|
||||||
let mut conn = app_state.pool.get().await?;
|
let mut conn = app_state.pool.get().await?;
|
||||||
|
|
||||||
|
@ -191,7 +192,7 @@ impl Member {
|
||||||
.filter(guild_members::uuid.eq(self.uuid))
|
.filter(guild_members::uuid.eq(self.uuid))
|
||||||
.execute(conn)
|
.execute(conn)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue