diff --git a/migrations/2025-07-22-195121_add_ban/down.sql b/migrations/2025-07-22-195121_add_ban/down.sql deleted file mode 100644 index 62fe554..0000000 --- a/migrations/2025-07-22-195121_add_ban/down.sql +++ /dev/null @@ -1,2 +0,0 @@ --- This file should undo anything in `up.sql` -DROP TABLE guild_bans; diff --git a/migrations/2025-07-22-195121_add_ban/up.sql b/migrations/2025-07-22-195121_add_ban/up.sql deleted file mode 100644 index 020a1b0..0000000 --- a/migrations/2025-07-22-195121_add_ban/up.sql +++ /dev/null @@ -1,7 +0,0 @@ --- 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) -); diff --git a/src/api/v1/members/mod.rs b/src/api/v1/members/mod.rs index 59ceac2..34b6938 100644 --- a/src/api/v1/members/mod.rs +++ b/src/api/v1/members/mod.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use axum::{ Router, - routing::{delete, get, post}, + routing::{delete, get}, }; use crate::AppState; @@ -13,5 +13,4 @@ pub fn router() -> Router> { Router::new() .route("/{uuid}", get(uuid::get)) .route("/{uuid}", delete(uuid::delete)) - .route("/{uuid}/ban", post(uuid::ban::post)) } diff --git a/src/api/v1/members/uuid/ban.rs b/src/api/v1/members/uuid/ban.rs deleted file mode 100644 index 986b98d..0000000 --- a/src/api/v1/members/uuid/ban.rs +++ /dev/null @@ -1,50 +0,0 @@ -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>, - Path(member_uuid): Path, - Extension(CurrentUser(uuid)): Extension>, - Json(payload): Json, -) -> Result { - 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) -} diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs index 7c39bff..244f5f8 100644 --- a/src/api/v1/members/uuid/mod.rs +++ b/src/api/v1/members/uuid/mod.rs @@ -1,7 +1,5 @@ //! `/api/v1/members/{uuid}` Member specific endpoints -pub mod ban; - use std::sync::Arc; use crate::{ @@ -31,7 +29,7 @@ pub async fn get( let me = Me::get(&mut conn, uuid).await?; - let member = Member::fetch_one_with_member(&app_state, Some(&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?; Ok((StatusCode::OK, Json(member))) @@ -48,7 +46,7 @@ pub async fn delete( let me = Me::get(&mut conn, uuid).await?; - let member = Member::fetch_one_with_member(&app_state, Some(&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?; diff --git a/src/objects/member.rs b/src/objects/member.rs index d07b701..8678f4a 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -10,7 +10,6 @@ use crate::{ AppState, Conn, error::Error, objects::{Me, Permissions, Role}, - schema::guild_bans, schema::guild_members, }; @@ -74,13 +73,6 @@ pub struct Member { user: User, } -#[derive(Serialize, Deserialize)] -pub struct GuildBan { - pub guild_uuid: Uuid, - pub user_uuid: Uuid, - pub reason: String, -} - impl Member { pub async fn count(conn: &mut Conn, guild_uuid: Uuid) -> Result { use guild_members::dsl; @@ -130,7 +122,7 @@ impl Member { pub async fn fetch_one_with_member( app_state: &AppState, - me: Option<&Me>, + me: &Me, uuid: Uuid, ) -> Result { let mut conn = app_state.pool.get().await?; @@ -142,7 +134,7 @@ impl Member { .get_result(&mut conn) .await?; - member.build(app_state, me).await + member.build(app_state, Some(me)).await } pub async fn fetch_all( @@ -177,18 +169,6 @@ impl Member { ) -> Result { 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 = MemberBuilder { @@ -215,20 +195,4 @@ impl Member { 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(()) - } } diff --git a/src/schema.rs b/src/schema.rs index 54284d6..4095dcd 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -47,15 +47,6 @@ diesel::table! { } } -diesel::table! { - guild_bans (user_uuid, guild_uuid) { - guild_uuid -> Uuid, - user_uuid -> Uuid, - #[max_length = 200] - reason -> Nullable, - } -} - diesel::table! { guild_members (uuid) { uuid -> Uuid, @@ -163,8 +154,6 @@ diesel::joinable!(access_tokens -> refresh_tokens (refresh_token)); diesel::joinable!(access_tokens -> users (uuid)); diesel::joinable!(channel_permissions -> channels (channel_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 -> users (user_uuid)); diesel::joinable!(instance_permissions -> users (uuid)); @@ -182,7 +171,6 @@ diesel::allow_tables_to_appear_in_same_query!( channels, friend_requests, friends, - guild_bans, guild_members, guilds, instance_permissions,