Compare commits

...

3 commits

Author SHA1 Message Date
26f528819e style: cargo clippy --fix && cargo fmt
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
ci/woodpecker/pr/build-and-publish Pipeline was successful
2025-07-23 19:10:17 +02:00
7e10086753 feat: retrive all banned users in a guild 2025-07-23 19:08:54 +02:00
3ad73f28fa feat: added ban time 2025-07-23 16:30:38 +02:00
7 changed files with 102 additions and 10 deletions

View file

@ -3,5 +3,6 @@ CREATE TABLE guild_bans (
guild_uuid uuid NOT NULL REFERENCES guilds(uuid) ON DELETE CASCADE, guild_uuid uuid NOT NULL REFERENCES guilds(uuid) ON DELETE CASCADE,
user_uuid uuid NOT NULL REFERENCES users(uuid), user_uuid uuid NOT NULL REFERENCES users(uuid),
reason VARCHAR(200) DEFAULT NULL, reason VARCHAR(200) DEFAULT NULL,
ban_time TIMESTAMPTZ NOT NULL DEFAULT NOW(),
PRIMARY KEY (user_uuid, guild_uuid) PRIMARY KEY (user_uuid, guild_uuid)
); );

View file

@ -0,0 +1,36 @@
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 member = Member::check_membership(&mut conn, uuid, guild_uuid).await?;
member
.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)))
}

View file

@ -12,6 +12,7 @@ use axum::{
use bytes::Bytes; use bytes::Bytes;
use uuid::Uuid; use uuid::Uuid;
mod bans;
mod channels; mod channels;
mod invites; mod invites;
mod members; mod members;
@ -42,6 +43,8 @@ pub fn router() -> Router<Arc<AppState>> {
.route("/invites", post(invites::create)) .route("/invites", post(invites::create))
// Members // Members
.route("/members", get(members::get)) .route("/members", get(members::get))
// Bans
.route("/bans", get(bans::get))
} }
/// `GET /api/v1/guilds/{uuid}` DESCRIPTION /// `GET /api/v1/guilds/{uuid}` DESCRIPTION

57
src/objects/bans.rs Normal file
View file

@ -0,0 +1,57 @@
use diesel::{ExpressionMethods, QueryDsl, Queryable, Selectable, SelectableHelper};
use serde::{Deserialize, Serialize};
use uuid::Uuid;
use diesel_async::RunQueryDsl;
use crate::{Conn, error::Error, objects::load_or_empty, schema::guild_bans};
#[derive(Selectable, Queryable, Serialize, Deserialize)]
#[diesel(table_name = guild_bans)]
#[diesel(check_for_backend(diesel::pg::Pg))]
pub struct GuildBan {
pub guild_uuid: Uuid,
pub user_uuid: Uuid,
pub reason: Option<String>,
pub ban_time: chrono::DateTime<chrono::Utc>,
}
impl GuildBan {
pub async fn fetch_one(
conn: &mut Conn,
guild_uuid: Uuid,
user_uuid: Uuid,
) -> Result<GuildBan, Error> {
use guild_bans::dsl;
let guild_ban = dsl::guild_bans
.filter(dsl::guild_uuid.eq(guild_uuid))
.filter(dsl::user_uuid.eq(user_uuid))
.select(GuildBan::as_select())
.get_result(conn)
.await?;
Ok(guild_ban)
}
pub async fn fetch_all(conn: &mut Conn, guild_uuid: Uuid) -> Result<Vec<Self>, Error> {
use guild_bans::dsl;
let all_guild_bans = load_or_empty(
dsl::guild_bans
.filter(dsl::guild_uuid.eq(guild_uuid))
.load(conn)
.await,
)?;
Ok(all_guild_bans)
}
pub async fn unban(self, conn: &mut Conn) -> Result<(), Error> {
use guild_bans::dsl;
diesel::delete(guild_bans::table)
.filter(dsl::guild_uuid.eq(self.guild_uuid))
.filter(dsl::user_uuid.eq(self.user_uuid))
.execute(conn)
.await?;
Ok(())
}
}

View file

@ -1,6 +1,5 @@
use diesel::{ use diesel::{
ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, delete, ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, insert_into,
insert_into,
}; };
use diesel_async::RunQueryDsl; use diesel_async::RunQueryDsl;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -74,13 +73,6 @@ 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;
@ -208,7 +200,7 @@ impl Member {
} }
pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> { pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> {
delete(guild_members::table) diesel::delete(guild_members::table)
.filter(guild_members::uuid.eq(self.uuid)) .filter(guild_members::uuid.eq(self.uuid))
.execute(conn) .execute(conn)
.await?; .await?;

View file

@ -7,6 +7,7 @@ use log::debug;
use serde::Deserialize; use serde::Deserialize;
use uuid::Uuid; use uuid::Uuid;
mod bans;
mod channel; mod channel;
mod email_token; mod email_token;
mod friends; mod friends;
@ -19,6 +20,7 @@ mod password_reset_token;
mod role; mod role;
mod user; mod user;
pub use bans::GuildBan;
pub use channel::Channel; pub use channel::Channel;
pub use email_token::EmailToken; pub use email_token::EmailToken;
pub use friends::Friend; pub use friends::Friend;

View file

@ -53,6 +53,7 @@ diesel::table! {
user_uuid -> Uuid, user_uuid -> Uuid,
#[max_length = 200] #[max_length = 200]
reason -> Nullable<Varchar>, reason -> Nullable<Varchar>,
ban_time -> Timestamptz,
} }
} }