From 8a58774359c2a5f1ac9d1f862b42f1f800175842 Mon Sep 17 00:00:00 2001 From: Radical Date: Sun, 20 Jul 2025 20:25:15 +0200 Subject: [PATCH 01/39] fix: get cache correctly from redis --- src/api/v1/channels/mod.rs | 6 ++++-- src/api/v1/guilds/uuid/channels.rs | 3 ++- src/api/v1/guilds/uuid/roles/mod.rs | 6 ++++-- src/api/v1/guilds/uuid/roles/uuid.rs | 6 ++++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/api/v1/channels/mod.rs b/src/api/v1/channels/mod.rs index 41d029a..fa90ccd 100644 --- a/src/api/v1/channels/mod.rs +++ b/src/api/v1/channels/mod.rs @@ -1,11 +1,13 @@ use std::sync::Arc; use axum::{ - middleware::from_fn_with_state, routing::{any, delete, get, patch}, Router + Router, + middleware::from_fn_with_state, + routing::{any, delete, get, patch}, }; //use socketioxide::SocketIo; -use crate::{api::v1::auth::CurrentUser, AppState}; +use crate::{AppState, api::v1::auth::CurrentUser}; mod uuid; diff --git a/src/api/v1/guilds/uuid/channels.rs b/src/api/v1/guilds/uuid/channels.rs index 836982d..82368b9 100644 --- a/src/api/v1/guilds/uuid/channels.rs +++ b/src/api/v1/guilds/uuid/channels.rs @@ -35,8 +35,9 @@ pub async fn get( if let Ok(cache_hit) = app_state .get_cache_key(format!("{guild_uuid}_channels")) .await + && let Ok(channels) = serde_json::from_str::>(&cache_hit) { - return Ok((StatusCode::OK, Json(cache_hit)).into_response()); + return Ok((StatusCode::OK, Json(channels)).into_response()); } let channels = Channel::fetch_all(&app_state.pool, guild_uuid).await?; diff --git a/src/api/v1/guilds/uuid/roles/mod.rs b/src/api/v1/guilds/uuid/roles/mod.rs index 820ef0d..0e496a0 100644 --- a/src/api/v1/guilds/uuid/roles/mod.rs +++ b/src/api/v1/guilds/uuid/roles/mod.rs @@ -35,8 +35,10 @@ pub async fn get( Member::check_membership(&mut conn, uuid, guild_uuid).await?; - if let Ok(cache_hit) = app_state.get_cache_key(format!("{guild_uuid}_roles")).await { - return Ok((StatusCode::OK, Json(cache_hit)).into_response()); + if let Ok(cache_hit) = app_state.get_cache_key(format!("{guild_uuid}_roles")).await + && let Ok(roles) = serde_json::from_str::>(&cache_hit) + { + return Ok((StatusCode::OK, Json(roles)).into_response()); } let roles = Role::fetch_all(&mut conn, guild_uuid).await?; diff --git a/src/api/v1/guilds/uuid/roles/uuid.rs b/src/api/v1/guilds/uuid/roles/uuid.rs index 06193a1..732d553 100644 --- a/src/api/v1/guilds/uuid/roles/uuid.rs +++ b/src/api/v1/guilds/uuid/roles/uuid.rs @@ -27,8 +27,10 @@ pub async fn get( Member::check_membership(&mut conn, uuid, guild_uuid).await?; - if let Ok(cache_hit) = app_state.get_cache_key(format!("{role_uuid}")).await { - return Ok((StatusCode::OK, Json(cache_hit)).into_response()); + if let Ok(cache_hit) = app_state.get_cache_key(format!("{role_uuid}")).await + && let Ok(role) = serde_json::from_str::(&cache_hit) + { + return Ok((StatusCode::OK, Json(role)).into_response()); } let role = Role::fetch_one(&mut conn, role_uuid).await?; From f5d4211fadd8a0744b0445e29f901e4c3760428c Mon Sep 17 00:00:00 2001 From: Radical Date: Sun, 20 Jul 2025 20:29:28 +0200 Subject: [PATCH 02/39] fix: force rust 1.88 in builds --- .woodpecker/build-and-publish.yml | 4 ++-- .woodpecker/publish-docs.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker/build-and-publish.yml b/.woodpecker/build-and-publish.yml index 4e263a9..66f377d 100644 --- a/.woodpecker/build-and-publish.yml +++ b/.woodpecker/build-and-publish.yml @@ -1,6 +1,6 @@ steps: - name: build-x86_64 - image: rust:bookworm + image: rust:1.88-bookworm commands: - cargo build --release when: @@ -8,7 +8,7 @@ steps: - event: pull_request - name: build-arm64 - image: rust:bookworm + image: rust:1.88-bookworm commands: - dpkg --add-architecture arm64 - apt-get update -y && apt-get install -y crossbuild-essential-arm64 libssl-dev:arm64 diff --git a/.woodpecker/publish-docs.yml b/.woodpecker/publish-docs.yml index e6ce482..7744dc7 100644 --- a/.woodpecker/publish-docs.yml +++ b/.woodpecker/publish-docs.yml @@ -4,7 +4,7 @@ when: steps: - name: build-docs - image: rust:bookworm + image: rust:1.88-bookworm commands: - cargo doc --release --no-deps From 82f4388dab3182de9d97d4babdafcffd0db099f8 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 17:29:55 +0200 Subject: [PATCH 03/39] New endpoint 'members' with get and delete --- src/api/v1/members/mod.rs | 22 +++++++++++++ src/api/v1/members/uuid/mod.rs | 56 ++++++++++++++++++++++++++++++++++ src/api/v1/mod.rs | 4 ++- src/objects/member.rs | 28 ++++++++++++++++- 4 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 src/api/v1/members/mod.rs create mode 100644 src/api/v1/members/uuid/mod.rs diff --git a/src/api/v1/members/mod.rs b/src/api/v1/members/mod.rs new file mode 100644 index 0000000..165e533 --- /dev/null +++ b/src/api/v1/members/mod.rs @@ -0,0 +1,22 @@ +use std::sync::Arc; + +use axum::{ + Router, + middleware::from_fn_with_state, + routing::{any, delete, get, patch}, +}; +//use socketioxide::SocketIo; + +use crate::{AppState, api::v1::auth::CurrentUser}; + +mod uuid; + +pub fn router(app_state: Arc) -> Router> { + let router_with_auth = Router::new() + .route("/{uuid}", get(uuid::get)) + .route("/{uuid}", delete(uuid::delete)) + .layer(from_fn_with_state(app_state, CurrentUser::check_auth_layer)); + + Router::new() + .merge(router_with_auth) +} diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs new file mode 100644 index 0000000..9000e5a --- /dev/null +++ b/src/api/v1/members/uuid/mod.rs @@ -0,0 +1,56 @@ +//! `/api/v1/channels/{uuid}` Channel specific endpoints + +use std::sync::Arc; + +use crate::{ + AppState, + api::v1::auth::CurrentUser, + error::Error, + objects::{Channel, Member, Permissions, Me}, + utils::global_checks, +}; +use axum::{ + Extension, Json, + extract::{Path, State}, + http::StatusCode, + response::IntoResponse, +}; + +use serde::Deserialize; +use uuid::Uuid; + +pub async fn get( + State(app_state): State>, + Path(member_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; + + let me = Me::get(&mut app_state.pool.get().await?, uuid).await?; + + let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?; + + + Ok((StatusCode::OK, Json(member))) +} + +pub async fn delete( + State(app_state): State>, + Path(member_uuid): Path, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + global_checks(&app_state, uuid).await?; + + let me = Me::get(&mut app_state.pool.get().await?, uuid).await?; + + let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?; + + let deleter = Member::check_membership(&mut app_state.pool.get().await?, uuid, member.guild_uuid).await?; + + deleter.check_permission(&app_state, Permissions::ManageMember).await?; + + member.delete(&mut app_state.pool.get().await?).await?; + + Ok(StatusCode::OK) +} + diff --git a/src/api/v1/mod.rs b/src/api/v1/mod.rs index 860944c..ee9fbc8 100644 --- a/src/api/v1/mod.rs +++ b/src/api/v1/mod.rs @@ -13,6 +13,7 @@ mod invites; mod me; mod stats; mod users; +mod members; pub fn router(app_state: Arc) -> Router> { let router_with_auth = Router::new() @@ -28,6 +29,7 @@ pub fn router(app_state: Arc) -> Router> { Router::new() .route("/stats", get(stats::res)) .nest("/auth", auth::router(app_state.clone())) - .nest("/channels", channels::router(app_state)) + .nest("/channels", channels::router(app_state.clone())) + .nest("/members", members::router(app_state)) .merge(router_with_auth) } diff --git a/src/objects/member.rs b/src/objects/member.rs index 50b76b0..84ee095 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -1,5 +1,5 @@ use diesel::{ - ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, insert_into, + delete, insert_into, ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper }; use diesel_async::RunQueryDsl; use serde::{Deserialize, Serialize}; @@ -119,6 +119,23 @@ impl Member { member.build(app_state, Some(me)).await } + pub async fn fetch_one_with_member ( + app_state: &AppState, + me: &Me, + uuid: Uuid + ) -> Result { + let mut conn = app_state.pool.get().await?; + + use guild_members::dsl; + let member: MemberBuilder = dsl::guild_members + .filter(dsl::uuid.eq(uuid)) + .select(MemberBuilder::as_select()) + .get_result(&mut conn) + .await?; + + member.build(app_state, Some(me)).await + } + pub async fn fetch_all( app_state: &AppState, me: &Me, @@ -168,4 +185,13 @@ impl Member { member.build(app_state, None).await } + + pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> { + delete(guild_members::table) + .filter(guild_members::uuid.eq(self.uuid)) + .execute(conn) + .await?; + + Ok(()) + } } From 4ec36c1cda7e4fdfb7724d5d3439e631b648160b Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 17:35:02 +0200 Subject: [PATCH 04/39] path name fix --- src/api/v1/{members => member}/mod.rs | 1 - src/api/v1/{members => member}/uuid/mod.rs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) rename src/api/v1/{members => member}/mod.rs (94%) rename src/api/v1/{members => member}/uuid/mod.rs (96%) diff --git a/src/api/v1/members/mod.rs b/src/api/v1/member/mod.rs similarity index 94% rename from src/api/v1/members/mod.rs rename to src/api/v1/member/mod.rs index 165e533..3ee9718 100644 --- a/src/api/v1/members/mod.rs +++ b/src/api/v1/member/mod.rs @@ -5,7 +5,6 @@ use axum::{ middleware::from_fn_with_state, routing::{any, delete, get, patch}, }; -//use socketioxide::SocketIo; use crate::{AppState, api::v1::auth::CurrentUser}; diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/member/uuid/mod.rs similarity index 96% rename from src/api/v1/members/uuid/mod.rs rename to src/api/v1/member/uuid/mod.rs index 9000e5a..f0425dd 100644 --- a/src/api/v1/members/uuid/mod.rs +++ b/src/api/v1/member/uuid/mod.rs @@ -1,4 +1,4 @@ -//! `/api/v1/channels/{uuid}` Channel specific endpoints +//! `/api/v1/member/{uuid}` Member specific endpoints use std::sync::Arc; From 228bc68327c1e494fd0fee174891bc2cad4b0b17 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 17:38:04 +0200 Subject: [PATCH 05/39] more path name fix --- src/api/v1/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/v1/mod.rs b/src/api/v1/mod.rs index ee9fbc8..b05774e 100644 --- a/src/api/v1/mod.rs +++ b/src/api/v1/mod.rs @@ -13,7 +13,7 @@ mod invites; mod me; mod stats; mod users; -mod members; +mod member; pub fn router(app_state: Arc) -> Router> { let router_with_auth = Router::new() @@ -30,6 +30,6 @@ pub fn router(app_state: Arc) -> Router> { .route("/stats", get(stats::res)) .nest("/auth", auth::router(app_state.clone())) .nest("/channels", channels::router(app_state.clone())) - .nest("/members", members::router(app_state)) + .nest("/member", member::router(app_state)) .merge(router_with_auth) } From 0468d1adca6d2011fb538219263b8b22b2deaeaa Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 18:05:19 +0200 Subject: [PATCH 06/39] fix: Unecessary merge of routers --- src/api/v1/member/mod.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/api/v1/member/mod.rs b/src/api/v1/member/mod.rs index 3ee9718..61dc085 100644 --- a/src/api/v1/member/mod.rs +++ b/src/api/v1/member/mod.rs @@ -11,11 +11,8 @@ use crate::{AppState, api::v1::auth::CurrentUser}; mod uuid; pub fn router(app_state: Arc) -> Router> { - let router_with_auth = Router::new() + Router::new() .route("/{uuid}", get(uuid::get)) .route("/{uuid}", delete(uuid::delete)) - .layer(from_fn_with_state(app_state, CurrentUser::check_auth_layer)); - - Router::new() - .merge(router_with_auth) + .layer(from_fn_with_state(app_state, CurrentUser::check_auth_layer)) } From ea33230e58157fd7cb575a330b7218b84fda1752 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 18:10:37 +0200 Subject: [PATCH 07/39] fix: reduced numder of function calls to get conn --- src/api/v1/member/uuid/mod.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/api/v1/member/uuid/mod.rs b/src/api/v1/member/uuid/mod.rs index f0425dd..16cc7a9 100644 --- a/src/api/v1/member/uuid/mod.rs +++ b/src/api/v1/member/uuid/mod.rs @@ -1,4 +1,4 @@ -//! `/api/v1/member/{uuid}` Member specific endpoints +//! `/api/v1/members/{uuid}` Member specific endpoints use std::sync::Arc; @@ -41,15 +41,17 @@ pub async fn delete( ) -> Result { global_checks(&app_state, uuid).await?; - let me = Me::get(&mut app_state.pool.get().await?, uuid).await?; + let mut conn = app_state.pool.get().await?; + + let me = Me::get(&mut conn, uuid).await?; let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?; - let deleter = Member::check_membership(&mut app_state.pool.get().await?, 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?; - member.delete(&mut app_state.pool.get().await?).await?; + member.delete(&mut conn).await?; Ok(StatusCode::OK) } From 31596c6bfe49532620688b63c8fc1628548d7cee Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 18:26:04 +0200 Subject: [PATCH 08/39] fix: memebrs not member as endpoint --- src/api/v1/{member => members}/mod.rs | 3 +-- src/api/v1/{member => members}/uuid/mod.rs | 0 src/api/v1/mod.rs | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) rename src/api/v1/{member => members}/mod.rs (67%) rename src/api/v1/{member => members}/uuid/mod.rs (100%) diff --git a/src/api/v1/member/mod.rs b/src/api/v1/members/mod.rs similarity index 67% rename from src/api/v1/member/mod.rs rename to src/api/v1/members/mod.rs index 61dc085..9e1ea52 100644 --- a/src/api/v1/member/mod.rs +++ b/src/api/v1/members/mod.rs @@ -10,9 +10,8 @@ use crate::{AppState, api::v1::auth::CurrentUser}; mod uuid; -pub fn router(app_state: Arc) -> Router> { +pub fn router() -> Router> { Router::new() .route("/{uuid}", get(uuid::get)) .route("/{uuid}", delete(uuid::delete)) - .layer(from_fn_with_state(app_state, CurrentUser::check_auth_layer)) } diff --git a/src/api/v1/member/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs similarity index 100% rename from src/api/v1/member/uuid/mod.rs rename to src/api/v1/members/uuid/mod.rs diff --git a/src/api/v1/mod.rs b/src/api/v1/mod.rs index b05774e..b2c9c99 100644 --- a/src/api/v1/mod.rs +++ b/src/api/v1/mod.rs @@ -13,7 +13,7 @@ mod invites; mod me; mod stats; mod users; -mod member; +mod members; pub fn router(app_state: Arc) -> Router> { let router_with_auth = Router::new() @@ -29,7 +29,7 @@ pub fn router(app_state: Arc) -> Router> { Router::new() .route("/stats", get(stats::res)) .nest("/auth", auth::router(app_state.clone())) - .nest("/channels", channels::router(app_state.clone())) - .nest("/member", member::router(app_state)) + .nest("/channels", channels::router(app_state)) + .nest("/members", members::router()) .merge(router_with_auth) } From 6dd8ddb0df8c3c5ff67af1d584734a71f64c75a6 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 18:27:36 +0200 Subject: [PATCH 09/39] fix: members in router_with_auth --- src/api/v1/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/v1/mod.rs b/src/api/v1/mod.rs index b2c9c99..3aee3a0 100644 --- a/src/api/v1/mod.rs +++ b/src/api/v1/mod.rs @@ -20,6 +20,7 @@ pub fn router(app_state: Arc) -> Router> { .nest("/users", users::router()) .nest("/guilds", guilds::router()) .nest("/invites", invites::router()) + .nest("/members", members::router()) .nest("/me", me::router()) .layer(from_fn_with_state( app_state.clone(), @@ -30,6 +31,5 @@ pub fn router(app_state: Arc) -> Router> { .route("/stats", get(stats::res)) .nest("/auth", auth::router(app_state.clone())) .nest("/channels", channels::router(app_state)) - .nest("/members", members::router()) .merge(router_with_auth) } From a3c460a611f43bf3bf4d5a2ad7ebfb78f6d40d44 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 18:33:41 +0200 Subject: [PATCH 10/39] fix: Only people in a server should see its members list --- src/api/v1/members/uuid/mod.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs index 16cc7a9..48f22e5 100644 --- a/src/api/v1/members/uuid/mod.rs +++ b/src/api/v1/members/uuid/mod.rs @@ -26,9 +26,12 @@ pub async fn get( ) -> Result { global_checks(&app_state, uuid).await?; - let me = Me::get(&mut app_state.pool.get().await?, uuid).await?; + let mut conn = app_state.pool.get().await?; + + let me = Me::get(&mut conn, 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))) From c26ec49e057e472e209747a63d4c2b653d41db5b Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 18:50:17 +0200 Subject: [PATCH 11/39] fix: cargo clippy --fix && cargo fmt --- src/api/v1/members/mod.rs | 5 ++--- src/api/v1/members/uuid/mod.rs | 11 +++++------ src/api/v1/mod.rs | 2 +- src/objects/member.rs | 9 +++++---- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/api/v1/members/mod.rs b/src/api/v1/members/mod.rs index 9e1ea52..34b6938 100644 --- a/src/api/v1/members/mod.rs +++ b/src/api/v1/members/mod.rs @@ -2,11 +2,10 @@ use std::sync::Arc; use axum::{ Router, - middleware::from_fn_with_state, - routing::{any, delete, get, patch}, + routing::{delete, get}, }; -use crate::{AppState, api::v1::auth::CurrentUser}; +use crate::AppState; mod uuid; diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs index 48f22e5..244f5f8 100644 --- a/src/api/v1/members/uuid/mod.rs +++ b/src/api/v1/members/uuid/mod.rs @@ -6,7 +6,7 @@ use crate::{ AppState, api::v1::auth::CurrentUser, error::Error, - objects::{Channel, Member, Permissions, Me}, + objects::{Me, Member, Permissions}, utils::global_checks, }; use axum::{ @@ -16,7 +16,6 @@ use axum::{ response::IntoResponse, }; -use serde::Deserialize; use uuid::Uuid; 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?; Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; - 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 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?; Ok(StatusCode::OK) } - diff --git a/src/api/v1/mod.rs b/src/api/v1/mod.rs index 3aee3a0..70271ef 100644 --- a/src/api/v1/mod.rs +++ b/src/api/v1/mod.rs @@ -11,9 +11,9 @@ mod channels; mod guilds; mod invites; mod me; +mod members; mod stats; mod users; -mod members; pub fn router(app_state: Arc) -> Router> { let router_with_auth = Router::new() diff --git a/src/objects/member.rs b/src/objects/member.rs index 84ee095..8678f4a 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -1,5 +1,6 @@ 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 serde::{Deserialize, Serialize}; @@ -119,10 +120,10 @@ impl Member { member.build(app_state, Some(me)).await } - pub async fn fetch_one_with_member ( + pub async fn fetch_one_with_member( app_state: &AppState, me: &Me, - uuid: Uuid + uuid: Uuid, ) -> Result { let mut conn = app_state.pool.get().await?; @@ -191,7 +192,7 @@ impl Member { .filter(guild_members::uuid.eq(self.uuid)) .execute(conn) .await?; - + Ok(()) } } From 45978bb41af9a42197dcedc2d6a8284dc7694b8a Mon Sep 17 00:00:00 2001 From: Radical Date: Tue, 22 Jul 2025 18:55:26 +0200 Subject: [PATCH 12/39] ci: only run on push prevents duplicate CIs from running at the same time --- .woodpecker/build-and-publish.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.woodpecker/build-and-publish.yml b/.woodpecker/build-and-publish.yml index 66f377d..7f7096b 100644 --- a/.woodpecker/build-and-publish.yml +++ b/.woodpecker/build-and-publish.yml @@ -5,7 +5,6 @@ steps: - cargo build --release when: - event: push - - event: pull_request - name: build-arm64 image: rust:1.88-bookworm @@ -20,7 +19,6 @@ steps: PKG_CONFIG_PATH: /usr/aarch64-linux-gnu/lib/pkgconfig when: - event: push - - event: pull_request - name: container-build-and-publish image: docker From b2e6d3f5530cea8458374957e224a49d178e0ae9 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 21:58:14 +0200 Subject: [PATCH 13/39] feat: added ban table to the database --- migrations/2025-07-22-195121_add_ban/down.sql | 2 ++ migrations/2025-07-22-195121_add_ban/up.sql | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 migrations/2025-07-22-195121_add_ban/down.sql create mode 100644 migrations/2025-07-22-195121_add_ban/up.sql diff --git a/migrations/2025-07-22-195121_add_ban/down.sql b/migrations/2025-07-22-195121_add_ban/down.sql new file mode 100644 index 0000000..62fe554 --- /dev/null +++ b/migrations/2025-07-22-195121_add_ban/down.sql @@ -0,0 +1,2 @@ +-- 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 new file mode 100644 index 0000000..3dd5f9b --- /dev/null +++ b/migrations/2025-07-22-195121_add_ban/up.sql @@ -0,0 +1,7 @@ +-- Your SQL goes here +CREATE TABLE guild_bans ( + guild_ban uuid NOT NULL REFERENCES guilds(uuid) ON DELETE CASCADE, + user_ban uuid NOT NULL REFERENCES users(uuid), + reason VARCHAR(200) DEFAULT NULL, + PRIMARY KEY (user_uuid, guild_uuid) +); From af7193750686de6d3ebfcb7cbe3f091c19008671 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 22:01:48 +0200 Subject: [PATCH 14/39] fix: fixed the ban table names --- migrations/2025-07-22-195121_add_ban/up.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migrations/2025-07-22-195121_add_ban/up.sql b/migrations/2025-07-22-195121_add_ban/up.sql index 3dd5f9b..020a1b0 100644 --- a/migrations/2025-07-22-195121_add_ban/up.sql +++ b/migrations/2025-07-22-195121_add_ban/up.sql @@ -1,7 +1,7 @@ -- Your SQL goes here CREATE TABLE guild_bans ( - guild_ban uuid NOT NULL REFERENCES guilds(uuid) ON DELETE CASCADE, - user_ban uuid NOT NULL REFERENCES users(uuid), + 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) ); From ade45780fa72ebbcfa374833aea38b3136f924bc Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 22:04:48 +0200 Subject: [PATCH 15/39] fix: forgot to add the change on schema --- src/schema.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/schema.rs b/src/schema.rs index 4095dcd..54284d6 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -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, + } +} + diesel::table! { guild_members (uuid) { uuid -> Uuid, @@ -154,6 +163,8 @@ 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)); @@ -171,6 +182,7 @@ diesel::allow_tables_to_appear_in_same_query!( channels, friend_requests, friends, + guild_bans, guild_members, guilds, instance_permissions, From f175c1932536be1063bff8561f73fad5be32c8ee Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 23:18:21 +0200 Subject: [PATCH 16/39] fix: let you pass None to fetch_one_with_member for me --- src/api/v1/members/uuid/mod.rs | 6 ++++-- src/objects/member.rs | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs index 244f5f8..7c39bff 100644 --- a/src/api/v1/members/uuid/mod.rs +++ b/src/api/v1/members/uuid/mod.rs @@ -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?; diff --git a/src/objects/member.rs b/src/objects/member.rs index 8678f4a..337c2e9 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -122,7 +122,7 @@ impl Member { pub async fn fetch_one_with_member( app_state: &AppState, - me: &Me, + me: Option<&Me>, uuid: Uuid, ) -> Result { let mut conn = app_state.pool.get().await?; @@ -134,7 +134,7 @@ impl Member { .get_result(&mut conn) .await?; - member.build(app_state, Some(me)).await + member.build(app_state, me).await } pub async fn fetch_all( From ad24215fef631b1dc1a81e8fc9e3277f6903cf3a Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 00:50:50 +0200 Subject: [PATCH 17/39] feat: added endpoint for banning --- src/api/v1/members/mod.rs | 3 ++- src/api/v1/members/uuid/ban.rs | 47 ++++++++++++++++++++++++++++++++++ src/objects/member.rs | 37 ++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 src/api/v1/members/uuid/ban.rs diff --git a/src/api/v1/members/mod.rs b/src/api/v1/members/mod.rs index 34b6938..59ceac2 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}, + routing::{delete, get, post}, }; use crate::AppState; @@ -13,4 +13,5 @@ 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 new file mode 100644 index 0000000..3fb1b58 --- /dev/null +++ b/src/api/v1/members/uuid/ban.rs @@ -0,0 +1,47 @@ +use std::sync::Arc; + +use axum::{ + Extension, + extract::{Path, State, Json}, + http::StatusCode, + response::IntoResponse, +}; +use diesel::{insert_into, RunQueryDsl}; +use serde::Deserialize; + +use crate::{ + api::v1::auth::CurrentUser, error::Error, objects::{Me, Member, Permissions}, schema::guild_bans::{self, dsl}, utils::global_checks, AppState +}; + +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/objects/member.rs b/src/objects/member.rs index 337c2e9..40bcaee 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -1,3 +1,4 @@ +use axum::http::StatusCode; use diesel::{ ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, delete, insert_into, @@ -11,6 +12,7 @@ use crate::{ error::Error, objects::{Me, Permissions, Role}, schema::guild_members, + schema::guild_bans, }; use super::{User, load_or_empty}; @@ -73,6 +75,13 @@ 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; @@ -169,6 +178,18 @@ 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 { @@ -195,4 +216,20 @@ 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(()) + } } From 8e31dc7acab5fd147e53d2d5d0c3782b53ee418a Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 00:52:19 +0200 Subject: [PATCH 18/39] style: cargo clippy --fix && cargo fmt --- src/api/v1/members/uuid/ban.rs | 23 +++++++++++++---------- src/objects/member.rs | 3 +-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/api/v1/members/uuid/ban.rs b/src/api/v1/members/uuid/ban.rs index 3fb1b58..986b98d 100644 --- a/src/api/v1/members/uuid/ban.rs +++ b/src/api/v1/members/uuid/ban.rs @@ -2,46 +2,49 @@ use std::sync::Arc; use axum::{ Extension, - extract::{Path, State, Json}, + extract::{Json, Path, State}, http::StatusCode, response::IntoResponse, }; -use diesel::{insert_into, RunQueryDsl}; use serde::Deserialize; use crate::{ - api::v1::auth::CurrentUser, error::Error, objects::{Me, Member, Permissions}, schema::guild_bans::{self, dsl}, utils::global_checks, AppState + AppState, + api::v1::auth::CurrentUser, + error::Error, + objects::{Member, Permissions}, + utils::global_checks, }; use uuid::Uuid; #[derive(Deserialize)] pub struct RequstBody { - reason: String + reason: String, } - pub async fn post( State(app_state): State>, Path(member_uuid): Path, Extension(CurrentUser(uuid)): Extension>, Json(payload): Json, -) -> Result{ +) -> 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?; + baner + .check_permission(&app_state, Permissions::ManageMember) + .await?; member.ban(&mut conn, &payload.reason).await?; - Ok(StatusCode::OK) } diff --git a/src/objects/member.rs b/src/objects/member.rs index 40bcaee..d07b701 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -1,4 +1,3 @@ -use axum::http::StatusCode; use diesel::{ ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, delete, insert_into, @@ -11,8 +10,8 @@ use crate::{ AppState, Conn, error::Error, objects::{Me, Permissions, Role}, - schema::guild_members, schema::guild_bans, + schema::guild_members, }; use super::{User, load_or_empty}; From 71d44f6c21beb62d5a234e2b66b00831bfc16799 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 00:58:51 +0200 Subject: [PATCH 19/39] fix: Can not kick owner --- src/api/v1/members/uuid/mod.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs index 244f5f8..7f1709b 100644 --- a/src/api/v1/members/uuid/mod.rs +++ b/src/api/v1/members/uuid/mod.rs @@ -48,6 +48,10 @@ pub async fn delete( let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?; + if member.is_owner { + return Error::Forbidden("Can not kick owner".to_string()); + } + let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; deleter From 6999b4120e726425e6ca32bf87d7798eaae1a078 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 01:00:17 +0200 Subject: [PATCH 20/39] fix: Updated error message when banning owner --- src/api/v1/members/uuid/ban.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/v1/members/uuid/ban.rs b/src/api/v1/members/uuid/ban.rs index 986b98d..bbbf73e 100644 --- a/src/api/v1/members/uuid/ban.rs +++ b/src/api/v1/members/uuid/ban.rs @@ -36,7 +36,7 @@ pub async fn post( 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())); + return Err(Error::Forbidden("Can not ban owner".to_string())); } let baner = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; From 9e5d2daeab315e25a9860c4e7d80bd87c27b8dd8 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 01:07:41 +0200 Subject: [PATCH 21/39] fix: fixed error error --- src/api/v1/members/uuid/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs index 7f1709b..580c586 100644 --- a/src/api/v1/members/uuid/mod.rs +++ b/src/api/v1/members/uuid/mod.rs @@ -49,7 +49,7 @@ pub async fn delete( let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?; if member.is_owner { - return Error::Forbidden("Can not kick owner".to_string()); + return Err(Error::Forbidden("Can not kick owner".to_string())); } let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; From 2bc702f8d2097ecfc1c28f38edf26e2ae53b6080 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 01:18:08 +0200 Subject: [PATCH 22/39] fix: baner :) --- src/api/v1/members/uuid/ban.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/v1/members/uuid/ban.rs b/src/api/v1/members/uuid/ban.rs index bbbf73e..b543975 100644 --- a/src/api/v1/members/uuid/ban.rs +++ b/src/api/v1/members/uuid/ban.rs @@ -39,8 +39,8 @@ pub async fn post( return Err(Error::Forbidden("Can not ban owner".to_string())); } - let baner = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; - baner + let caller = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; + caller .check_permission(&app_state, Permissions::ManageMember) .await?; From 5fe5186142df61b407815509c21e9fd84babd349 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 01:31:28 +0200 Subject: [PATCH 23/39] feat: ban permission --- src/api/v1/members/uuid/ban.rs | 2 +- src/objects/role.rs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/api/v1/members/uuid/ban.rs b/src/api/v1/members/uuid/ban.rs index b543975..dd00ecf 100644 --- a/src/api/v1/members/uuid/ban.rs +++ b/src/api/v1/members/uuid/ban.rs @@ -41,7 +41,7 @@ pub async fn post( let caller = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; caller - .check_permission(&app_state, Permissions::ManageMember) + .check_permission(&app_state, Permissions::BanMembers) .await?; member.ban(&mut conn, &payload.reason).await?; diff --git a/src/objects/role.rs b/src/objects/role.rs index ea70686..6e6c88b 100644 --- a/src/objects/role.rs +++ b/src/objects/role.rs @@ -176,6 +176,8 @@ pub enum Permissions { ManageGuild = 32, /// Lets users change member settings (nickname, etc) ManageMember = 64, + /// Lets user ban members + BanMembers = 128, } impl Permissions { From c725d13ca8500abf55ff2d27d89af7e4bb184431 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 01:35:28 +0200 Subject: [PATCH 24/39] feat: kick permission --- src/api/v1/members/uuid/mod.rs | 2 +- src/objects/role.rs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs index 580c586..0c697c2 100644 --- a/src/api/v1/members/uuid/mod.rs +++ b/src/api/v1/members/uuid/mod.rs @@ -55,7 +55,7 @@ pub async fn delete( let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; deleter - .check_permission(&app_state, Permissions::ManageMember) + .check_permission(&app_state, Permissions::KickMember) .await?; member.delete(&mut conn).await?; diff --git a/src/objects/role.rs b/src/objects/role.rs index ea70686..5a57e5c 100644 --- a/src/objects/role.rs +++ b/src/objects/role.rs @@ -176,6 +176,8 @@ pub enum Permissions { ManageGuild = 32, /// Lets users change member settings (nickname, etc) ManageMember = 64, + /// Lets users kick members + KickMember = 256, } impl Permissions { @@ -188,6 +190,7 @@ impl Permissions { Self::ManageInvite, Self::ManageGuild, Self::ManageMember, + Self::KickMember, ]; all_perms From ceaa37cbe23564fd56d60773c7a2ea525898d3fc Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 01:37:35 +0200 Subject: [PATCH 25/39] fix: plural fix thing --- src/api/v1/members/uuid/ban.rs | 2 +- src/objects/role.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/api/v1/members/uuid/ban.rs b/src/api/v1/members/uuid/ban.rs index dd00ecf..b79da23 100644 --- a/src/api/v1/members/uuid/ban.rs +++ b/src/api/v1/members/uuid/ban.rs @@ -41,7 +41,7 @@ pub async fn post( let caller = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; caller - .check_permission(&app_state, Permissions::BanMembers) + .check_permission(&app_state, Permissions::BanMember) .await?; member.ban(&mut conn, &payload.reason).await?; diff --git a/src/objects/role.rs b/src/objects/role.rs index 6e6c88b..7b078e5 100644 --- a/src/objects/role.rs +++ b/src/objects/role.rs @@ -177,7 +177,7 @@ pub enum Permissions { /// Lets users change member settings (nickname, etc) ManageMember = 64, /// Lets user ban members - BanMembers = 128, + BanMember = 128, } impl Permissions { @@ -190,6 +190,7 @@ impl Permissions { Self::ManageInvite, Self::ManageGuild, Self::ManageMember, + Self::BanMember, ]; all_perms From cbdf6f79e2f55f76fb6174ecd6496d65e58972f9 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 01:48:31 +0200 Subject: [PATCH 26/39] feat: idiot(goin) proofing --- src/api/v1/members/uuid/ban.rs | 4 ---- src/objects/member.rs | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/v1/members/uuid/ban.rs b/src/api/v1/members/uuid/ban.rs index b79da23..5ba6702 100644 --- a/src/api/v1/members/uuid/ban.rs +++ b/src/api/v1/members/uuid/ban.rs @@ -35,10 +35,6 @@ pub async fn post( let member = Member::fetch_one_with_member(&app_state, None, member_uuid).await?; - if member.is_owner { - return Err(Error::Forbidden("Can not ban owner".to_string())); - } - let caller = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; caller .check_permission(&app_state, Permissions::BanMember) diff --git a/src/objects/member.rs b/src/objects/member.rs index d07b701..05ef7bc 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -208,6 +208,10 @@ impl Member { } pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> { + if self.is_owner { + return Err(Error::Forbidden("Can not ban owner".to_string())); + } + delete(guild_members::table) .filter(guild_members::uuid.eq(self.uuid)) .execute(conn) From e074ca89f969c0eeead2f4acb9550947a4785d5c Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 01:50:55 +0200 Subject: [PATCH 27/39] feat: idiot proofing --- src/api/v1/members/uuid/mod.rs | 4 ---- src/objects/member.rs | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs index 0c697c2..734572e 100644 --- a/src/api/v1/members/uuid/mod.rs +++ b/src/api/v1/members/uuid/mod.rs @@ -48,10 +48,6 @@ pub async fn delete( let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?; - if member.is_owner { - return Err(Error::Forbidden("Can not kick owner".to_string())); - } - let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; deleter diff --git a/src/objects/member.rs b/src/objects/member.rs index 8678f4a..dbbeb9d 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -188,6 +188,9 @@ impl Member { } pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> { + if member.is_owner { + return Err(Error::Forbidden("Can not kick owner".to_string())) + } delete(guild_members::table) .filter(guild_members::uuid.eq(self.uuid)) .execute(conn) From ac5ca90974ebe9e2c3ebfc5b3c481a7abdde2edc Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 02:03:06 +0200 Subject: [PATCH 28/39] fix: self not member --- src/objects/member.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/objects/member.rs b/src/objects/member.rs index dbbeb9d..ae3b3ef 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -188,7 +188,7 @@ impl Member { } pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> { - if member.is_owner { + if self.is_owner { return Err(Error::Forbidden("Can not kick owner".to_string())) } delete(guild_members::table) From 475e0081059bbbad48f87a6ad03f44e33080c4a8 Mon Sep 17 00:00:00 2001 From: Radical Date: Wed, 23 Jul 2025 15:03:56 +0200 Subject: [PATCH 29/39] fix: move owner check to correct function --- src/objects/member.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/objects/member.rs b/src/objects/member.rs index 05ef7bc..50a0a24 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -208,10 +208,6 @@ impl Member { } pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> { - if self.is_owner { - return Err(Error::Forbidden("Can not ban owner".to_string())); - } - delete(guild_members::table) .filter(guild_members::uuid.eq(self.uuid)) .execute(conn) @@ -221,6 +217,10 @@ impl Member { } pub async fn ban(self, conn: &mut Conn, reason: &String) -> Result<(), Error> { + if self.is_owner { + return Err(Error::Forbidden("Can not ban owner".to_string())); + } + use guild_bans::dsl; insert_into(guild_bans::table) .values(( From bb8927840de568b76e3d3e3aa6de9c3011967f15 Mon Sep 17 00:00:00 2001 From: Radical Date: Wed, 23 Jul 2025 15:04:02 +0200 Subject: [PATCH 30/39] style: formatting --- src/api/v1/members/uuid/ban.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/api/v1/members/uuid/ban.rs b/src/api/v1/members/uuid/ban.rs index 5ba6702..dfe53f6 100644 --- a/src/api/v1/members/uuid/ban.rs +++ b/src/api/v1/members/uuid/ban.rs @@ -36,6 +36,7 @@ pub async fn post( 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?; From 3ad73f28fa95efab19637b9a72f7ed358b612ff5 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 16:30:38 +0200 Subject: [PATCH 31/39] feat: added ban time --- src/schema.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/schema.rs b/src/schema.rs index 54284d6..e4d6730 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -53,6 +53,7 @@ diesel::table! { user_uuid -> Uuid, #[max_length = 200] reason -> Nullable, + ban_time -> Timestamptz, } } From 7e10086753cad7c635d0a6d4aa4e6333805e6434 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 19:08:54 +0200 Subject: [PATCH 32/39] feat: retrive all banned users in a guild --- migrations/2025-07-22-195121_add_ban/up.sql | 1 + src/api/v1/guilds/uuid/bans.rs | 24 +++++++++ src/api/v1/guilds/uuid/mod.rs | 3 ++ src/objects/bans.rs | 56 +++++++++++++++++++++ src/objects/member.rs | 14 ++---- src/objects/mod.rs | 2 + 6 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 src/api/v1/guilds/uuid/bans.rs create mode 100644 src/objects/bans.rs diff --git a/migrations/2025-07-22-195121_add_ban/up.sql b/migrations/2025-07-22-195121_add_ban/up.sql index 020a1b0..d8d7fab 100644 --- a/migrations/2025-07-22-195121_add_ban/up.sql +++ b/migrations/2025-07-22-195121_add_ban/up.sql @@ -3,5 +3,6 @@ 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, + ban_time TIMESTAMPTZ NOT NULL DEFAULT NOW(), PRIMARY KEY (user_uuid, guild_uuid) ); diff --git a/src/api/v1/guilds/uuid/bans.rs b/src/api/v1/guilds/uuid/bans.rs new file mode 100644 index 0000000..5b29f1d --- /dev/null +++ b/src/api/v1/guilds/uuid/bans.rs @@ -0,0 +1,24 @@ +use std::sync::Arc; + +use axum::{extract::{Path, State}, http::{Extensions, StatusCode}, response::IntoResponse, Extension, Json}; +use uuid::Uuid; + +use crate::{api::v1::auth::CurrentUser, error::Error, objects::{self, GuildBan, Member, Permissions}, utils::global_checks, AppState}; + + +pub async fn get( + State(app_state): State>, + Path(guild_uuid): Path, + Extension(CurrentUser(uuid)): Extension> +) -> Result { + 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))) +} diff --git a/src/api/v1/guilds/uuid/mod.rs b/src/api/v1/guilds/uuid/mod.rs index 52f0b64..a886e3d 100644 --- a/src/api/v1/guilds/uuid/mod.rs +++ b/src/api/v1/guilds/uuid/mod.rs @@ -16,6 +16,7 @@ mod channels; mod invites; mod members; mod roles; +mod bans; use crate::{ AppState, @@ -42,6 +43,8 @@ pub fn router() -> Router> { .route("/invites", post(invites::create)) // Members .route("/members", get(members::get)) + // Bans + .route("/bans", get(bans::get)) } /// `GET /api/v1/guilds/{uuid}` DESCRIPTION diff --git a/src/objects/bans.rs b/src/objects/bans.rs new file mode 100644 index 0000000..3aaa1ee --- /dev/null +++ b/src/objects/bans.rs @@ -0,0 +1,56 @@ +use diesel::{ExpressionMethods, QueryDsl, Queryable, Selectable, SelectableHelper}; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use diesel_async::RunQueryDsl; + +use crate::{ + error::Error, objects::{load_or_empty, Guild}, schema::guild_bans, Conn +}; + + +#[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, + pub ban_time: chrono::DateTime, +} + + +impl GuildBan { + pub async fn fetch_one(conn: &mut Conn, guild_uuid: Uuid, user_uuid: Uuid) -> Result { + 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, 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(()) + } +} diff --git a/src/objects/member.rs b/src/objects/member.rs index 50a0a24..0a216ea 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -1,5 +1,5 @@ use diesel::{ - ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, delete, + ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, insert_into, }; use diesel_async::RunQueryDsl; @@ -9,11 +9,12 @@ use uuid::Uuid; use crate::{ AppState, Conn, error::Error, - objects::{Me, Permissions, Role}, + objects::{Me, Permissions, Role, GuildBan}, schema::guild_bans, schema::guild_members, }; + use super::{User, load_or_empty}; #[derive(Serialize, Queryable, Selectable, Insertable)] @@ -74,12 +75,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 { @@ -208,7 +203,7 @@ impl Member { } 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)) .execute(conn) .await?; @@ -235,4 +230,5 @@ impl Member { Ok(()) } + } diff --git a/src/objects/mod.rs b/src/objects/mod.rs index 4af16d8..e53583e 100644 --- a/src/objects/mod.rs +++ b/src/objects/mod.rs @@ -18,6 +18,7 @@ mod message; mod password_reset_token; mod role; mod user; +mod bans; pub use channel::Channel; pub use email_token::EmailToken; @@ -32,6 +33,7 @@ pub use password_reset_token::PasswordResetToken; pub use role::Permissions; pub use role::Role; pub use user::User; +pub use bans::GuildBan; use crate::error::Error; From 26f528819e87afade0021748caa7d1a19d364072 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Wed, 23 Jul 2025 19:10:17 +0200 Subject: [PATCH 33/39] style: cargo clippy --fix && cargo fmt --- src/api/v1/guilds/uuid/bans.rs | 24 ++++++++++++++++++------ src/api/v1/guilds/uuid/mod.rs | 2 +- src/objects/bans.rs | 25 +++++++++++++------------ src/objects/member.rs | 8 ++------ src/objects/mod.rs | 4 ++-- 5 files changed, 36 insertions(+), 27 deletions(-) diff --git a/src/api/v1/guilds/uuid/bans.rs b/src/api/v1/guilds/uuid/bans.rs index 5b29f1d..44ed48d 100644 --- a/src/api/v1/guilds/uuid/bans.rs +++ b/src/api/v1/guilds/uuid/bans.rs @@ -1,24 +1,36 @@ use std::sync::Arc; -use axum::{extract::{Path, State}, http::{Extensions, StatusCode}, response::IntoResponse, Extension, Json}; +use axum::{ + Extension, Json, + extract::{Path, State}, + http::StatusCode, + response::IntoResponse, +}; use uuid::Uuid; -use crate::{api::v1::auth::CurrentUser, error::Error, objects::{self, GuildBan, Member, Permissions}, utils::global_checks, AppState}; - +use crate::{ + AppState, + api::v1::auth::CurrentUser, + error::Error, + objects::{GuildBan, Member, Permissions}, + utils::global_checks, +}; pub async fn get( State(app_state): State>, Path(guild_uuid): Path, - Extension(CurrentUser(uuid)): Extension> + Extension(CurrentUser(uuid)): Extension>, ) -> Result { 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?; + 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))) } diff --git a/src/api/v1/guilds/uuid/mod.rs b/src/api/v1/guilds/uuid/mod.rs index a886e3d..2174932 100644 --- a/src/api/v1/guilds/uuid/mod.rs +++ b/src/api/v1/guilds/uuid/mod.rs @@ -12,11 +12,11 @@ use axum::{ use bytes::Bytes; use uuid::Uuid; +mod bans; mod channels; mod invites; mod members; mod roles; -mod bans; use crate::{ AppState, diff --git a/src/objects/bans.rs b/src/objects/bans.rs index 3aaa1ee..9eb58f5 100644 --- a/src/objects/bans.rs +++ b/src/objects/bans.rs @@ -4,10 +4,7 @@ use uuid::Uuid; use diesel_async::RunQueryDsl; -use crate::{ - error::Error, objects::{load_or_empty, Guild}, schema::guild_bans, Conn -}; - +use crate::{Conn, error::Error, objects::load_or_empty, schema::guild_bans}; #[derive(Selectable, Queryable, Serialize, Deserialize)] #[diesel(table_name = guild_bans)] @@ -19,9 +16,12 @@ pub struct GuildBan { pub ban_time: chrono::DateTime, } - impl GuildBan { - pub async fn fetch_one(conn: &mut Conn, guild_uuid: Uuid, user_uuid: Uuid) -> Result { + pub async fn fetch_one( + conn: &mut Conn, + guild_uuid: Uuid, + user_uuid: Uuid, + ) -> Result { use guild_bans::dsl; let guild_ban = dsl::guild_bans .filter(dsl::guild_uuid.eq(guild_uuid)) @@ -35,12 +35,13 @@ impl GuildBan { pub async fn fetch_all(conn: &mut Conn, guild_uuid: Uuid) -> Result, 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 - )?; - + let all_guild_bans = load_or_empty( + dsl::guild_bans + .filter(dsl::guild_uuid.eq(guild_uuid)) + .load(conn) + .await, + )?; + Ok(all_guild_bans) } diff --git a/src/objects/member.rs b/src/objects/member.rs index 0a216ea..fcd0b6b 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -1,6 +1,5 @@ use diesel::{ - ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, - insert_into, + ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, insert_into, }; use diesel_async::RunQueryDsl; use serde::{Deserialize, Serialize}; @@ -9,12 +8,11 @@ use uuid::Uuid; use crate::{ AppState, Conn, error::Error, - objects::{Me, Permissions, Role, GuildBan}, + objects::{Me, Permissions, Role}, schema::guild_bans, schema::guild_members, }; - use super::{User, load_or_empty}; #[derive(Serialize, Queryable, Selectable, Insertable)] @@ -75,7 +73,6 @@ pub struct Member { user: User, } - impl Member { pub async fn count(conn: &mut Conn, guild_uuid: Uuid) -> Result { use guild_members::dsl; @@ -230,5 +227,4 @@ impl Member { Ok(()) } - } diff --git a/src/objects/mod.rs b/src/objects/mod.rs index e53583e..3bcce9c 100644 --- a/src/objects/mod.rs +++ b/src/objects/mod.rs @@ -7,6 +7,7 @@ use log::debug; use serde::Deserialize; use uuid::Uuid; +mod bans; mod channel; mod email_token; mod friends; @@ -18,8 +19,8 @@ mod message; mod password_reset_token; mod role; mod user; -mod bans; +pub use bans::GuildBan; pub use channel::Channel; pub use email_token::EmailToken; pub use friends::Friend; @@ -33,7 +34,6 @@ pub use password_reset_token::PasswordResetToken; pub use role::Permissions; pub use role::Role; pub use user::User; -pub use bans::GuildBan; use crate::error::Error; From c2b5f6568f08d62cdcb55763609787d637394cbd Mon Sep 17 00:00:00 2001 From: BAaboe Date: Thu, 24 Jul 2025 01:58:10 +0200 Subject: [PATCH 34/39] style: renaming parameter, ban_time -> banned_since --- migrations/2025-07-22-195121_add_ban/up.sql | 2 +- src/objects/bans.rs | 2 +- src/schema.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/migrations/2025-07-22-195121_add_ban/up.sql b/migrations/2025-07-22-195121_add_ban/up.sql index d8d7fab..a590142 100644 --- a/migrations/2025-07-22-195121_add_ban/up.sql +++ b/migrations/2025-07-22-195121_add_ban/up.sql @@ -3,6 +3,6 @@ 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, - ban_time TIMESTAMPTZ NOT NULL DEFAULT NOW(), + banned_since TIMESTAMPTZ NOT NULL DEFAULT NOW(), PRIMARY KEY (user_uuid, guild_uuid) ); diff --git a/src/objects/bans.rs b/src/objects/bans.rs index 9eb58f5..602afa6 100644 --- a/src/objects/bans.rs +++ b/src/objects/bans.rs @@ -13,7 +13,7 @@ pub struct GuildBan { pub guild_uuid: Uuid, pub user_uuid: Uuid, pub reason: Option, - pub ban_time: chrono::DateTime, + pub banned_since: chrono::DateTime, } impl GuildBan { diff --git a/src/schema.rs b/src/schema.rs index e4d6730..422c3a3 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -53,7 +53,7 @@ diesel::table! { user_uuid -> Uuid, #[max_length = 200] reason -> Nullable, - ban_time -> Timestamptz, + banned_since -> Timestamptz, } } From ba2442e7860bbd4993dbcb3069505b99f1410c60 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Thu, 24 Jul 2025 02:13:53 +0200 Subject: [PATCH 35/39] style: updated to use the new ban object --- src/objects/member.rs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/objects/member.rs b/src/objects/member.rs index fcd0b6b..ed6a77c 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -6,11 +6,7 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::{ - AppState, Conn, - error::Error, - objects::{Me, Permissions, Role}, - schema::guild_bans, - schema::guild_members, + error::Error, objects::{GuildBan, Me, Permissions, Role}, schema::{guild_bans, guild_members}, AppState, Conn }; use super::{User, load_or_empty}; @@ -169,15 +165,10 @@ 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; + let banned = GuildBan::fetch_one(&mut conn, guild_uuid, user_uuid).await; match banned { Ok(_) => Err(Error::Forbidden("User banned".to_string())), - Err(diesel::result::Error::NotFound) => Ok(()), + Err(Error::SqlError(diesel::result::Error::NotFound)) => Ok(()), Err(e) => Err(e.into()), }?; From 0e0c590e4dd0260382a6be381974e5b9244c668b Mon Sep 17 00:00:00 2001 From: BAaboe Date: Thu, 24 Jul 2025 02:14:29 +0200 Subject: [PATCH 36/39] feat: added unband endpoint --- src/api/v1/guilds/uuid/bans.rs | 23 +++++++++++++++++++++-- src/api/v1/guilds/uuid/mod.rs | 3 ++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/api/v1/guilds/uuid/bans.rs b/src/api/v1/guilds/uuid/bans.rs index 44ed48d..52e0949 100644 --- a/src/api/v1/guilds/uuid/bans.rs +++ b/src/api/v1/guilds/uuid/bans.rs @@ -25,8 +25,8 @@ pub async fn get( let mut conn = app_state.pool.get().await?; - let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?; - member + let caller = Member::check_membership(&mut conn, uuid, guild_uuid).await?; + caller .check_permission(&app_state, Permissions::BanMember) .await?; @@ -34,3 +34,22 @@ pub async fn get( Ok((StatusCode::OK, Json(all_guild_bans))) } + +pub async fn unban( + State(app_state): State>, + Path((guild_uuid, user_uuid)): Path<(Uuid, Uuid)>, + Extension(CurrentUser(uuid)): Extension>, +) -> Result { + 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) +} diff --git a/src/api/v1/guilds/uuid/mod.rs b/src/api/v1/guilds/uuid/mod.rs index 2174932..b9d8abf 100644 --- a/src/api/v1/guilds/uuid/mod.rs +++ b/src/api/v1/guilds/uuid/mod.rs @@ -7,7 +7,7 @@ use axum::{ extract::{Multipart, Path, State}, http::StatusCode, response::IntoResponse, - routing::{get, patch, post}, + routing::{get, patch, post, delete}, }; use bytes::Bytes; use uuid::Uuid; @@ -45,6 +45,7 @@ pub fn router() -> Router> { .route("/members", get(members::get)) // Bans .route("/bans", get(bans::get)) + .route("/bans/{uuid}", delete(bans::unban)) } /// `GET /api/v1/guilds/{uuid}` DESCRIPTION From b28d5b840ff593eb1b59fdf9c0e7644577d3c002 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Thu, 24 Jul 2025 02:30:52 +0200 Subject: [PATCH 37/39] style: cargo clippy --fix && cargo fmt --- src/api/v1/guilds/uuid/bans.rs | 4 +++- src/api/v1/guilds/uuid/mod.rs | 2 +- src/objects/member.rs | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/api/v1/guilds/uuid/bans.rs b/src/api/v1/guilds/uuid/bans.rs index 52e0949..29d5a05 100644 --- a/src/api/v1/guilds/uuid/bans.rs +++ b/src/api/v1/guilds/uuid/bans.rs @@ -45,7 +45,9 @@ pub async fn unban( 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?; + caller + .check_permission(&app_state, Permissions::BanMember) + .await?; let ban = GuildBan::fetch_one(&mut conn, guild_uuid, user_uuid).await?; diff --git a/src/api/v1/guilds/uuid/mod.rs b/src/api/v1/guilds/uuid/mod.rs index b9d8abf..65a7c76 100644 --- a/src/api/v1/guilds/uuid/mod.rs +++ b/src/api/v1/guilds/uuid/mod.rs @@ -7,7 +7,7 @@ use axum::{ extract::{Multipart, Path, State}, http::StatusCode, response::IntoResponse, - routing::{get, patch, post, delete}, + routing::{delete, get, patch, post}, }; use bytes::Bytes; use uuid::Uuid; diff --git a/src/objects/member.rs b/src/objects/member.rs index ed6a77c..6310de3 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -6,7 +6,10 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::{ - error::Error, objects::{GuildBan, Me, Permissions, Role}, schema::{guild_bans, guild_members}, AppState, Conn + AppState, Conn, + error::Error, + objects::{GuildBan, Me, Permissions, Role}, + schema::{guild_bans, guild_members}, }; use super::{User, load_or_empty}; @@ -169,7 +172,7 @@ impl Member { match banned { Ok(_) => Err(Error::Forbidden("User banned".to_string())), Err(Error::SqlError(diesel::result::Error::NotFound)) => Ok(()), - Err(e) => Err(e.into()), + Err(e) => Err(e), }?; let member_uuid = Uuid::now_v7(); From b38b5360f670d3f5c67b047cb9761171635847f4 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Fri, 25 Jul 2025 00:21:20 +0200 Subject: [PATCH 38/39] style: style --- src/objects/member.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/objects/member.rs b/src/objects/member.rs index 6310de3..aaa8347 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -1,5 +1,5 @@ use diesel::{ - ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, insert_into, + ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, insert_into, delete, }; use diesel_async::RunQueryDsl; use serde::{Deserialize, Serialize}; @@ -194,7 +194,7 @@ impl Member { } pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> { - diesel::delete(guild_members::table) + delete(guild_members::table) .filter(guild_members::uuid.eq(self.uuid)) .execute(conn) .await?; From 4a2f98a1805f9adac3969744d4e55368fed81b69 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Fri, 25 Jul 2025 00:21:51 +0200 Subject: [PATCH 39/39] style: cargo clippy --fix && cargo fmt --- src/objects/member.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/objects/member.rs b/src/objects/member.rs index aaa8347..621097d 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -1,5 +1,6 @@ use diesel::{ - ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, insert_into, delete, + ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, delete, + insert_into, }; use diesel_async::RunQueryDsl; use serde::{Deserialize, Serialize};