Compare commits
6 commits
2996c6f108
...
8e31dc7aca
Author | SHA1 | Date | |
---|---|---|---|
|
8e31dc7aca | ||
|
ad24215fef | ||
|
f175c19325 | ||
|
ade45780fa | ||
|
af71937506 | ||
|
b2e6d3f553 |
7 changed files with 115 additions and 5 deletions
2
migrations/2025-07-22-195121_add_ban/down.sql
Normal file
2
migrations/2025-07-22-195121_add_ban/down.sql
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
-- This file should undo anything in `up.sql`
|
||||||
|
DROP TABLE guild_bans;
|
7
migrations/2025-07-22-195121_add_ban/up.sql
Normal file
7
migrations/2025-07-22-195121_add_ban/up.sql
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
-- Your SQL goes here
|
||||||
|
CREATE TABLE guild_bans (
|
||||||
|
guild_uuid uuid NOT NULL REFERENCES guilds(uuid) ON DELETE CASCADE,
|
||||||
|
user_uuid uuid NOT NULL REFERENCES users(uuid),
|
||||||
|
reason VARCHAR(200) DEFAULT NULL,
|
||||||
|
PRIMARY KEY (user_uuid, guild_uuid)
|
||||||
|
);
|
|
@ -2,7 +2,7 @@ use std::sync::Arc;
|
||||||
|
|
||||||
use axum::{
|
use axum::{
|
||||||
Router,
|
Router,
|
||||||
routing::{delete, get},
|
routing::{delete, get, post},
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::AppState;
|
use crate::AppState;
|
||||||
|
@ -13,4 +13,5 @@ pub fn router() -> Router<Arc<AppState>> {
|
||||||
Router::new()
|
Router::new()
|
||||||
.route("/{uuid}", get(uuid::get))
|
.route("/{uuid}", get(uuid::get))
|
||||||
.route("/{uuid}", delete(uuid::delete))
|
.route("/{uuid}", delete(uuid::delete))
|
||||||
|
.route("/{uuid}/ban", post(uuid::ban::post))
|
||||||
}
|
}
|
||||||
|
|
50
src/api/v1/members/uuid/ban.rs
Normal file
50
src/api/v1/members/uuid/ban.rs
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
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?;
|
||||||
|
|
||||||
|
if member.is_owner {
|
||||||
|
return Err(Error::Forbidden("Not allowed".to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
let baner = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
|
||||||
|
baner
|
||||||
|
.check_permission(&app_state, Permissions::ManageMember)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
member.ban(&mut conn, &payload.reason).await?;
|
||||||
|
|
||||||
|
Ok(StatusCode::OK)
|
||||||
|
}
|
|
@ -1,5 +1,7 @@
|
||||||
//! `/api/v1/members/{uuid}` Member specific endpoints
|
//! `/api/v1/members/{uuid}` Member specific endpoints
|
||||||
|
|
||||||
|
pub mod ban;
|
||||||
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
|
@ -29,7 +31,7 @@ pub async fn get(
|
||||||
|
|
||||||
let me = Me::get(&mut conn, uuid).await?;
|
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?;
|
Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
|
||||||
|
|
||||||
Ok((StatusCode::OK, Json(member)))
|
Ok((StatusCode::OK, Json(member)))
|
||||||
|
@ -46,7 +48,7 @@ pub async fn delete(
|
||||||
|
|
||||||
let me = Me::get(&mut conn, uuid).await?;
|
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?;
|
let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@ use crate::{
|
||||||
AppState, Conn,
|
AppState, Conn,
|
||||||
error::Error,
|
error::Error,
|
||||||
objects::{Me, Permissions, Role},
|
objects::{Me, Permissions, Role},
|
||||||
|
schema::guild_bans,
|
||||||
schema::guild_members,
|
schema::guild_members,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -73,6 +74,13 @@ pub struct Member {
|
||||||
user: User,
|
user: User,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
pub struct GuildBan {
|
||||||
|
pub guild_uuid: Uuid,
|
||||||
|
pub user_uuid: Uuid,
|
||||||
|
pub reason: String,
|
||||||
|
}
|
||||||
|
|
||||||
impl Member {
|
impl Member {
|
||||||
pub async fn count(conn: &mut Conn, guild_uuid: Uuid) -> Result<i64, Error> {
|
pub async fn count(conn: &mut Conn, guild_uuid: Uuid) -> Result<i64, Error> {
|
||||||
use guild_members::dsl;
|
use guild_members::dsl;
|
||||||
|
@ -122,7 +130,7 @@ impl Member {
|
||||||
|
|
||||||
pub async fn fetch_one_with_member(
|
pub async fn fetch_one_with_member(
|
||||||
app_state: &AppState,
|
app_state: &AppState,
|
||||||
me: &Me,
|
me: Option<&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?;
|
||||||
|
@ -134,7 +142,7 @@ impl Member {
|
||||||
.get_result(&mut conn)
|
.get_result(&mut conn)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
member.build(app_state, Some(me)).await
|
member.build(app_state, me).await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn fetch_all(
|
pub async fn fetch_all(
|
||||||
|
@ -169,6 +177,18 @@ impl Member {
|
||||||
) -> Result<Self, Error> {
|
) -> Result<Self, Error> {
|
||||||
let mut conn = app_state.pool.get().await?;
|
let mut conn = app_state.pool.get().await?;
|
||||||
|
|
||||||
|
use guild_bans::dsl;
|
||||||
|
let banned = dsl::guild_bans
|
||||||
|
.filter(guild_bans::guild_uuid.eq(guild_uuid))
|
||||||
|
.filter(guild_bans::user_uuid.eq(user_uuid))
|
||||||
|
.execute(&mut conn)
|
||||||
|
.await;
|
||||||
|
match banned {
|
||||||
|
Ok(_) => Err(Error::Forbidden("User banned".to_string())),
|
||||||
|
Err(diesel::result::Error::NotFound) => Ok(()),
|
||||||
|
Err(e) => Err(e.into()),
|
||||||
|
}?;
|
||||||
|
|
||||||
let member_uuid = Uuid::now_v7();
|
let member_uuid = Uuid::now_v7();
|
||||||
|
|
||||||
let member = MemberBuilder {
|
let member = MemberBuilder {
|
||||||
|
@ -195,4 +215,20 @@ impl Member {
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn ban(self, conn: &mut Conn, reason: &String) -> Result<(), Error> {
|
||||||
|
use guild_bans::dsl;
|
||||||
|
insert_into(guild_bans::table)
|
||||||
|
.values((
|
||||||
|
dsl::guild_uuid.eq(self.guild_uuid),
|
||||||
|
dsl::user_uuid.eq(self.user_uuid),
|
||||||
|
dsl::reason.eq(reason),
|
||||||
|
))
|
||||||
|
.execute(conn)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
self.delete(conn).await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,6 +47,15 @@ diesel::table! {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
guild_bans (user_uuid, guild_uuid) {
|
||||||
|
guild_uuid -> Uuid,
|
||||||
|
user_uuid -> Uuid,
|
||||||
|
#[max_length = 200]
|
||||||
|
reason -> Nullable<Varchar>,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
diesel::table! {
|
diesel::table! {
|
||||||
guild_members (uuid) {
|
guild_members (uuid) {
|
||||||
uuid -> Uuid,
|
uuid -> Uuid,
|
||||||
|
@ -154,6 +163,8 @@ diesel::joinable!(access_tokens -> refresh_tokens (refresh_token));
|
||||||
diesel::joinable!(access_tokens -> users (uuid));
|
diesel::joinable!(access_tokens -> users (uuid));
|
||||||
diesel::joinable!(channel_permissions -> channels (channel_uuid));
|
diesel::joinable!(channel_permissions -> channels (channel_uuid));
|
||||||
diesel::joinable!(channels -> guilds (guild_uuid));
|
diesel::joinable!(channels -> guilds (guild_uuid));
|
||||||
|
diesel::joinable!(guild_bans -> guilds (guild_uuid));
|
||||||
|
diesel::joinable!(guild_bans -> users (user_uuid));
|
||||||
diesel::joinable!(guild_members -> guilds (guild_uuid));
|
diesel::joinable!(guild_members -> guilds (guild_uuid));
|
||||||
diesel::joinable!(guild_members -> users (user_uuid));
|
diesel::joinable!(guild_members -> users (user_uuid));
|
||||||
diesel::joinable!(instance_permissions -> users (uuid));
|
diesel::joinable!(instance_permissions -> users (uuid));
|
||||||
|
@ -171,6 +182,7 @@ diesel::allow_tables_to_appear_in_same_query!(
|
||||||
channels,
|
channels,
|
||||||
friend_requests,
|
friend_requests,
|
||||||
friends,
|
friends,
|
||||||
|
guild_bans,
|
||||||
guild_members,
|
guild_members,
|
||||||
guilds,
|
guilds,
|
||||||
instance_permissions,
|
instance_permissions,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue