From 8a58774359c2a5f1ac9d1f862b42f1f800175842 Mon Sep 17 00:00:00 2001 From: Radical Date: Sun, 20 Jul 2025 20:25:15 +0200 Subject: [PATCH 01/48] 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/48] 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 fa52412b433bd5c48027c5bb65dbeb735c0de730 Mon Sep 17 00:00:00 2001 From: Radical Date: Mon, 21 Jul 2025 04:15:04 +0200 Subject: [PATCH 03/48] feat: make database access more uniform and stop locking as many pool connections --- src/api/v1/auth/register.rs | 2 +- src/api/v1/auth/reset_password.rs | 22 ++- src/api/v1/auth/verify_email.rs | 8 +- src/api/v1/channels/uuid/messages.rs | 15 +- src/api/v1/channels/uuid/mod.rs | 46 +++--- src/api/v1/channels/uuid/socket.rs | 7 +- src/api/v1/guilds/mod.rs | 6 +- src/api/v1/guilds/uuid/channels.rs | 29 ++-- src/api/v1/guilds/uuid/invites/mod.rs | 10 +- src/api/v1/guilds/uuid/members.rs | 6 +- src/api/v1/guilds/uuid/mod.rs | 19 +-- src/api/v1/guilds/uuid/roles/mod.rs | 21 +-- src/api/v1/guilds/uuid/roles/uuid.rs | 15 +- src/api/v1/invites/id.rs | 6 +- src/api/v1/me/friends/mod.rs | 12 +- src/api/v1/me/friends/uuid.rs | 4 +- src/api/v1/me/guilds.rs | 4 +- src/api/v1/me/mod.rs | 23 +-- src/api/v1/users/mod.rs | 6 +- src/api/v1/users/uuid.rs | 9 +- src/objects/channel.rs | 209 ++++++++++++++++---------- src/objects/email_token.rs | 21 +-- src/objects/guild.rs | 35 ++--- src/objects/me.rs | 127 +++++++++------- src/objects/member.rs | 45 +++--- src/objects/message.rs | 10 +- src/objects/password_reset_token.rs | 72 ++++----- src/objects/role.rs | 19 ++- src/objects/user.rs | 27 ++-- src/utils.rs | 54 ++++--- 30 files changed, 516 insertions(+), 373 deletions(-) diff --git a/src/api/v1/auth/register.rs b/src/api/v1/auth/register.rs index 807fab8..545e5aa 100644 --- a/src/api/v1/auth/register.rs +++ b/src/api/v1/auth/register.rs @@ -159,7 +159,7 @@ pub async fn post( .await?; if let Some(initial_guild) = app_state.config.instance.initial_guild { - Member::new(&app_state, uuid, initial_guild).await?; + Member::new(&mut conn, &app_state.cache_pool, uuid, initial_guild).await?; } let mut response = ( diff --git a/src/api/v1/auth/reset_password.rs b/src/api/v1/auth/reset_password.rs index bac465c..35c4b41 100644 --- a/src/api/v1/auth/reset_password.rs +++ b/src/api/v1/auth/reset_password.rs @@ -38,11 +38,17 @@ pub async fn get( State(app_state): State>, query: Query, ) -> Result { - if let Ok(password_reset_token) = - PasswordResetToken::get_with_identifier(&app_state, query.identifier.clone()).await + let mut conn = app_state.pool.get().await?; + + if let Ok(password_reset_token) = PasswordResetToken::get_with_identifier( + &mut conn, + &app_state.cache_pool, + query.identifier.clone(), + ) + .await { if Utc::now().signed_duration_since(password_reset_token.created_at) > Duration::hours(1) { - password_reset_token.delete(&app_state).await?; + password_reset_token.delete(&app_state.cache_pool).await?; } else { return Err(Error::TooManyRequests( "Please allow 1 hour before sending a new email".to_string(), @@ -50,7 +56,7 @@ pub async fn get( } } - PasswordResetToken::new(&app_state, query.identifier.clone()).await?; + PasswordResetToken::new(&mut conn, &app_state, query.identifier.clone()).await?; Ok(StatusCode::OK) } @@ -87,10 +93,14 @@ pub async fn post( reset_password: Json, ) -> Result { let password_reset_token = - PasswordResetToken::get(&app_state, reset_password.token.clone()).await?; + PasswordResetToken::get(&app_state.cache_pool, reset_password.token.clone()).await?; password_reset_token - .set_password(&app_state, reset_password.password.clone()) + .set_password( + &mut app_state.pool.get().await?, + &app_state, + reset_password.password.clone(), + ) .await?; Ok(StatusCode::OK) diff --git a/src/api/v1/auth/verify_email.rs b/src/api/v1/auth/verify_email.rs index 0801768..1cb8aef 100644 --- a/src/api/v1/auth/verify_email.rs +++ b/src/api/v1/auth/verify_email.rs @@ -55,7 +55,7 @@ pub async fn get( return Ok(StatusCode::NO_CONTENT); } - let email_token = EmailToken::get(&app_state, me.uuid).await?; + let email_token = EmailToken::get(&app_state.cache_pool, me.uuid).await?; if query.token != email_token.token { return Ok(StatusCode::UNAUTHORIZED); @@ -63,7 +63,7 @@ pub async fn get( me.verify_email(&mut conn).await?; - email_token.delete(&app_state).await?; + email_token.delete(&app_state.cache_pool).await?; Ok(StatusCode::OK) } @@ -91,9 +91,9 @@ pub async fn post( return Ok(StatusCode::NO_CONTENT); } - if let Ok(email_token) = EmailToken::get(&app_state, me.uuid).await { + if let Ok(email_token) = EmailToken::get(&app_state.cache_pool, me.uuid).await { if Utc::now().signed_duration_since(email_token.created_at) > Duration::hours(1) { - email_token.delete(&app_state).await?; + email_token.delete(&app_state.cache_pool).await?; } else { return Err(Error::TooManyRequests( "Please allow 1 hour before sending a new email".to_string(), diff --git a/src/api/v1/channels/uuid/messages.rs b/src/api/v1/channels/uuid/messages.rs index b8f0ad6..1f9010d 100644 --- a/src/api/v1/channels/uuid/messages.rs +++ b/src/api/v1/channels/uuid/messages.rs @@ -60,14 +60,21 @@ pub async fn get( Query(message_request): Query, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; + let mut conn = app_state.pool.get().await?; - let channel = Channel::fetch_one(&app_state, channel_uuid).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; - Member::check_membership(&mut app_state.pool.get().await?, uuid, channel.guild_uuid).await?; + let channel = Channel::fetch_one(&mut conn, &app_state.cache_pool, channel_uuid).await?; + + Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?; let messages = channel - .fetch_messages(&app_state, message_request.amount, message_request.offset) + .fetch_messages( + &mut conn, + &app_state.cache_pool, + message_request.amount, + message_request.offset, + ) .await?; Ok((StatusCode::OK, Json(messages))) diff --git a/src/api/v1/channels/uuid/mod.rs b/src/api/v1/channels/uuid/mod.rs index 373742e..f5566b3 100644 --- a/src/api/v1/channels/uuid/mod.rs +++ b/src/api/v1/channels/uuid/mod.rs @@ -27,11 +27,13 @@ pub async fn get( Path(channel_uuid): Path, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; + let mut conn = app_state.pool.get().await?; - let channel = Channel::fetch_one(&app_state, channel_uuid).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; - Member::check_membership(&mut app_state.pool.get().await?, uuid, channel.guild_uuid).await?; + let channel = Channel::fetch_one(&mut conn, &app_state.cache_pool, channel_uuid).await?; + + Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?; Ok((StatusCode::OK, Json(channel))) } @@ -41,19 +43,19 @@ pub async fn delete( Path(channel_uuid): Path, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; + let mut conn = app_state.pool.get().await?; - let channel = Channel::fetch_one(&app_state, channel_uuid).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; - let member = - Member::check_membership(&mut app_state.pool.get().await?, uuid, channel.guild_uuid) - .await?; + let channel = Channel::fetch_one(&mut conn, &app_state.cache_pool, channel_uuid).await?; + + let member = Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?; member - .check_permission(&app_state, Permissions::ManageChannel) + .check_permission(&mut conn, &app_state.cache_pool, Permissions::ManageChannel) .await?; - channel.delete(&app_state).await?; + channel.delete(&mut conn, &app_state.cache_pool).await?; Ok(StatusCode::OK) } @@ -102,31 +104,37 @@ pub async fn patch( Extension(CurrentUser(uuid)): Extension>, Json(new_info): Json, ) -> Result { - global_checks(&app_state, uuid).await?; + let mut conn = app_state.pool.get().await?; - let mut channel = Channel::fetch_one(&app_state, channel_uuid).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; - let member = - Member::check_membership(&mut app_state.pool.get().await?, uuid, channel.guild_uuid) - .await?; + let mut channel = Channel::fetch_one(&mut conn, &app_state.cache_pool, channel_uuid).await?; + + let member = Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?; member - .check_permission(&app_state, Permissions::ManageChannel) + .check_permission(&mut conn, &app_state.cache_pool, Permissions::ManageChannel) .await?; if let Some(new_name) = &new_info.name { - channel.set_name(&app_state, new_name.to_string()).await?; + channel + .set_name(&mut conn, &app_state.cache_pool, new_name.to_string()) + .await?; } if let Some(new_description) = &new_info.description { channel - .set_description(&app_state, new_description.to_string()) + .set_description( + &mut conn, + &app_state.cache_pool, + new_description.to_string(), + ) .await?; } if let Some(new_is_above) = &new_info.is_above { channel - .set_description(&app_state, new_is_above.to_string()) + .set_description(&mut conn, &app_state.cache_pool, new_is_above.to_string()) .await?; } diff --git a/src/api/v1/channels/uuid/socket.rs b/src/api/v1/channels/uuid/socket.rs index dd020e3..ac04301 100644 --- a/src/api/v1/channels/uuid/socket.rs +++ b/src/api/v1/channels/uuid/socket.rs @@ -71,9 +71,9 @@ pub async fn ws( // Authorize client using auth header let uuid = check_access_token(auth_header, &mut conn).await?; - global_checks(&app_state, uuid).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; - let channel = Channel::fetch_one(&app_state, channel_uuid).await?; + let channel = Channel::fetch_one(&mut conn, &app_state.cache_pool, channel_uuid).await?; Member::check_membership(&mut conn, uuid, channel.guild_uuid).await?; @@ -103,7 +103,8 @@ pub async fn ws( let message = channel .new_message( - &app_state, + &mut conn, + &app_state.cache_pool, uuid, message_body.message, message_body.reply_to, diff --git a/src/api/v1/guilds/mod.rs b/src/api/v1/guilds/mod.rs index 8118522..5b9f089 100644 --- a/src/api/v1/guilds/mod.rs +++ b/src/api/v1/guilds/mod.rs @@ -128,9 +128,11 @@ pub async fn get_guilds( let start = request_query.start.unwrap_or(0); let amount = request_query.amount.unwrap_or(10); - global_checks(&app_state, uuid).await?; + let mut conn = app_state.pool.get().await?; - let guilds = Guild::fetch_amount(&app_state.pool, start, amount).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + + let guilds = Guild::fetch_amount(&mut conn, start, amount).await?; Ok((StatusCode::OK, Json(guilds))) } diff --git a/src/api/v1/guilds/uuid/channels.rs b/src/api/v1/guilds/uuid/channels.rs index 82368b9..1cd7f78 100644 --- a/src/api/v1/guilds/uuid/channels.rs +++ b/src/api/v1/guilds/uuid/channels.rs @@ -14,7 +14,7 @@ use crate::{ api::v1::auth::CurrentUser, error::Error, objects::{Channel, Member, Permissions}, - utils::{global_checks, order_by_is_above}, + utils::{CacheFns, global_checks, order_by_is_above}, }; #[derive(Deserialize)] @@ -28,23 +28,26 @@ pub async fn get( Path(guild_uuid): Path, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; + let mut conn = app_state.pool.get().await?; - Member::check_membership(&mut app_state.pool.get().await?, uuid, guild_uuid).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + + Member::check_membership(&mut conn, uuid, guild_uuid).await?; if let Ok(cache_hit) = app_state - .get_cache_key(format!("{guild_uuid}_channels")) + .cache_pool + .get_cache_key::>(format!("{guild_uuid}_channels")) .await - && let Ok(channels) = serde_json::from_str::>(&cache_hit) { - return Ok((StatusCode::OK, Json(channels)).into_response()); + return Ok((StatusCode::OK, Json(cache_hit)).into_response()); } - let channels = Channel::fetch_all(&app_state.pool, guild_uuid).await?; + let channels = Channel::fetch_all(&mut conn, guild_uuid).await?; let channels_ordered = order_by_is_above(channels).await?; app_state + .cache_pool .set_cache_key( format!("{guild_uuid}_channels"), channels_ordered.clone(), @@ -61,17 +64,19 @@ pub async fn create( Extension(CurrentUser(uuid)): Extension>, Json(channel_info): Json, ) -> Result { - global_checks(&app_state, uuid).await?; + let mut conn = app_state.pool.get().await?; - let member = - Member::check_membership(&mut app_state.pool.get().await?, uuid, guild_uuid).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + + let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?; member - .check_permission(&app_state, Permissions::ManageChannel) + .check_permission(&mut conn, &app_state.cache_pool, Permissions::ManageChannel) .await?; let channel = Channel::new( - &app_state, + &mut conn, + &app_state.cache_pool, guild_uuid, channel_info.name.clone(), channel_info.description.clone(), diff --git a/src/api/v1/guilds/uuid/invites/mod.rs b/src/api/v1/guilds/uuid/invites/mod.rs index 649fc16..fa06f44 100644 --- a/src/api/v1/guilds/uuid/invites/mod.rs +++ b/src/api/v1/guilds/uuid/invites/mod.rs @@ -27,10 +27,10 @@ pub async fn get( Path(guild_uuid): Path, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + Member::check_membership(&mut conn, uuid, guild_uuid).await?; let guild = Guild::fetch_one(&mut conn, guild_uuid).await?; @@ -46,14 +46,14 @@ pub async fn create( Extension(CurrentUser(uuid)): Extension>, Json(invite_request): Json, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?; member - .check_permission(&app_state, Permissions::CreateInvite) + .check_permission(&mut conn, &app_state.cache_pool, Permissions::CreateInvite) .await?; let guild = Guild::fetch_one(&mut conn, guild_uuid).await?; diff --git a/src/api/v1/guilds/uuid/members.rs b/src/api/v1/guilds/uuid/members.rs index 3ae10f7..56710af 100644 --- a/src/api/v1/guilds/uuid/members.rs +++ b/src/api/v1/guilds/uuid/members.rs @@ -21,15 +21,15 @@ pub async fn get( Path(guild_uuid): Path, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + Member::check_membership(&mut conn, uuid, guild_uuid).await?; let me = Me::get(&mut conn, uuid).await?; - let members = Member::fetch_all(&app_state, &me, guild_uuid).await?; + let members = Member::fetch_all(&mut conn, &app_state.cache_pool, &me, guild_uuid).await?; Ok((StatusCode::OK, Json(members))) } diff --git a/src/api/v1/guilds/uuid/mod.rs b/src/api/v1/guilds/uuid/mod.rs index 52f0b64..d49e56a 100644 --- a/src/api/v1/guilds/uuid/mod.rs +++ b/src/api/v1/guilds/uuid/mod.rs @@ -82,10 +82,10 @@ pub async fn get_guild( Path(guild_uuid): Path, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + Member::check_membership(&mut conn, uuid, guild_uuid).await?; let guild = Guild::fetch_one(&mut conn, guild_uuid).await?; @@ -102,14 +102,14 @@ pub async fn edit( Extension(CurrentUser(uuid)): Extension>, mut multipart: Multipart, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?; member - .check_permission(&app_state, Permissions::ManageGuild) + .check_permission(&mut conn, &app_state.cache_pool, Permissions::ManageGuild) .await?; let mut guild = Guild::fetch_one(&mut conn, guild_uuid).await?; @@ -127,14 +127,7 @@ pub async fn edit( } if let Some(icon) = icon { - guild - .set_icon( - &app_state.bunny_storage, - &mut conn, - app_state.config.bunny.cdn_url.clone(), - icon, - ) - .await?; + guild.set_icon(&mut conn, &app_state, icon).await?; } Ok(StatusCode::OK) diff --git a/src/api/v1/guilds/uuid/roles/mod.rs b/src/api/v1/guilds/uuid/roles/mod.rs index 0e496a0..d3660ce 100644 --- a/src/api/v1/guilds/uuid/roles/mod.rs +++ b/src/api/v1/guilds/uuid/roles/mod.rs @@ -14,7 +14,7 @@ use crate::{ api::v1::auth::CurrentUser, error::Error, objects::{Member, Permissions, Role}, - utils::{global_checks, order_by_is_above}, + utils::{CacheFns, global_checks, order_by_is_above}, }; pub mod uuid; @@ -29,16 +29,18 @@ pub async fn get( Path(guild_uuid): Path, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + Member::check_membership(&mut conn, uuid, guild_uuid).await?; - if let Ok(cache_hit) = app_state.get_cache_key(format!("{guild_uuid}_roles")).await - && let Ok(roles) = serde_json::from_str::>(&cache_hit) + if let Ok(cache_hit) = app_state + .cache_pool + .get_cache_key::>(format!("{guild_uuid}_roles")) + .await { - return Ok((StatusCode::OK, Json(roles)).into_response()); + return Ok((StatusCode::OK, Json(cache_hit)).into_response()); } let roles = Role::fetch_all(&mut conn, guild_uuid).await?; @@ -46,6 +48,7 @@ pub async fn get( let roles_ordered = order_by_is_above(roles).await?; app_state + .cache_pool .set_cache_key(format!("{guild_uuid}_roles"), roles_ordered.clone(), 1800) .await?; @@ -58,14 +61,14 @@ pub async fn create( Extension(CurrentUser(uuid)): Extension>, Json(role_info): Json, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + let member = Member::check_membership(&mut conn, uuid, guild_uuid).await?; member - .check_permission(&app_state, Permissions::ManageRole) + .check_permission(&mut conn, &app_state.cache_pool, Permissions::ManageRole) .await?; let role = Role::new(&mut conn, guild_uuid, role_info.name.clone()).await?; diff --git a/src/api/v1/guilds/uuid/roles/uuid.rs b/src/api/v1/guilds/uuid/roles/uuid.rs index 732d553..e7890d0 100644 --- a/src/api/v1/guilds/uuid/roles/uuid.rs +++ b/src/api/v1/guilds/uuid/roles/uuid.rs @@ -13,7 +13,7 @@ use crate::{ api::v1::auth::CurrentUser, error::Error, objects::{Member, Role}, - utils::global_checks, + utils::{CacheFns, global_checks}, }; pub async fn get( @@ -21,21 +21,24 @@ pub async fn get( Path((guild_uuid, role_uuid)): Path<(Uuid, Uuid)>, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + Member::check_membership(&mut conn, uuid, guild_uuid).await?; - if let Ok(cache_hit) = app_state.get_cache_key(format!("{role_uuid}")).await - && let Ok(role) = serde_json::from_str::(&cache_hit) + if let Ok(cache_hit) = app_state + .cache_pool + .get_cache_key::(format!("{role_uuid}")) + .await { - return Ok((StatusCode::OK, Json(role)).into_response()); + return Ok((StatusCode::OK, Json(cache_hit)).into_response()); } let role = Role::fetch_one(&mut conn, role_uuid).await?; app_state + .cache_pool .set_cache_key(format!("{role_uuid}"), role.clone(), 60) .await?; diff --git a/src/api/v1/invites/id.rs b/src/api/v1/invites/id.rs index 72ceea4..99f177f 100644 --- a/src/api/v1/invites/id.rs +++ b/src/api/v1/invites/id.rs @@ -34,15 +34,15 @@ pub async fn join( Path(invite_id): Path, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + let invite = Invite::fetch_one(&mut conn, invite_id).await?; let guild = Guild::fetch_one(&mut conn, invite.guild_uuid).await?; - Member::new(&app_state, uuid, guild.uuid).await?; + Member::new(&mut conn, &app_state.cache_pool, uuid, guild.uuid).await?; Ok((StatusCode::OK, Json(guild))) } diff --git a/src/api/v1/me/friends/mod.rs b/src/api/v1/me/friends/mod.rs index a56f8d4..904a1f5 100644 --- a/src/api/v1/me/friends/mod.rs +++ b/src/api/v1/me/friends/mod.rs @@ -19,11 +19,13 @@ pub async fn get( State(app_state): State>, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; + let mut conn = app_state.pool.get().await?; - let me = Me::get(&mut app_state.pool.get().await?, uuid).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; - let friends = me.get_friends(&app_state).await?; + let me = Me::get(&mut conn, uuid).await?; + + let friends = me.get_friends(&mut conn, &app_state.cache_pool).await?; Ok((StatusCode::OK, Json(friends))) } @@ -57,10 +59,10 @@ pub async fn post( Extension(CurrentUser(uuid)): Extension>, Json(user_request): Json, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + let me = Me::get(&mut conn, uuid).await?; let target_uuid = user_uuid_from_username(&mut conn, &user_request.username).await?; diff --git a/src/api/v1/me/friends/uuid.rs b/src/api/v1/me/friends/uuid.rs index 5367435..35f0742 100644 --- a/src/api/v1/me/friends/uuid.rs +++ b/src/api/v1/me/friends/uuid.rs @@ -17,10 +17,10 @@ pub async fn delete( Path(friend_uuid): Path, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + let me = Me::get(&mut conn, uuid).await?; me.remove_friend(&mut conn, friend_uuid).await?; diff --git a/src/api/v1/me/guilds.rs b/src/api/v1/me/guilds.rs index 88dfad9..42d5c21 100644 --- a/src/api/v1/me/guilds.rs +++ b/src/api/v1/me/guilds.rs @@ -58,10 +58,10 @@ pub async fn get( State(app_state): State>, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; - let mut conn = app_state.pool.get().await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + let me = Me::get(&mut conn, uuid).await?; let memberships = me.fetch_memberships(&mut conn).await?; diff --git a/src/api/v1/me/mod.rs b/src/api/v1/me/mod.rs index e167d14..86d3d9e 100644 --- a/src/api/v1/me/mod.rs +++ b/src/api/v1/me/mod.rs @@ -73,36 +73,41 @@ pub async fn update( let json = json_raw.unwrap_or_default(); + let mut conn = app_state.pool.get().await?; + if avatar.is_some() || json.username.is_some() || json.display_name.is_some() { - global_checks(&app_state, uuid).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; } - let mut me = Me::get(&mut app_state.pool.get().await?, uuid).await?; + let mut me = Me::get(&mut conn, uuid).await?; if let Some(avatar) = avatar { - me.set_avatar(&app_state, app_state.config.bunny.cdn_url.clone(), avatar) - .await?; + me.set_avatar(&mut conn, &app_state, avatar).await?; } if let Some(username) = &json.username { - me.set_username(&app_state, username.clone()).await?; + me.set_username(&mut conn, &app_state.cache_pool, username.clone()) + .await?; } if let Some(display_name) = &json.display_name { - me.set_display_name(&app_state, display_name.clone()) + me.set_display_name(&mut conn, &app_state.cache_pool, display_name.clone()) .await?; } if let Some(email) = &json.email { - me.set_email(&app_state, email.clone()).await?; + me.set_email(&mut conn, &app_state.cache_pool, email.clone()) + .await?; } if let Some(pronouns) = &json.pronouns { - me.set_pronouns(&app_state, pronouns.clone()).await?; + me.set_pronouns(&mut conn, &app_state.cache_pool, pronouns.clone()) + .await?; } if let Some(about) = &json.about { - me.set_about(&app_state, about.clone()).await?; + me.set_about(&mut conn, &app_state.cache_pool, about.clone()) + .await?; } Ok(StatusCode::OK) diff --git a/src/api/v1/users/mod.rs b/src/api/v1/users/mod.rs index a4b93ce..999e13f 100644 --- a/src/api/v1/users/mod.rs +++ b/src/api/v1/users/mod.rs @@ -70,9 +70,11 @@ pub async fn users( return Ok(StatusCode::BAD_REQUEST.into_response()); } - global_checks(&app_state, uuid).await?; + let mut conn = app_state.pool.get().await?; - let users = User::fetch_amount(&mut app_state.pool.get().await?, start, amount).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; + + let users = User::fetch_amount(&mut conn, start, amount).await?; Ok((StatusCode::OK, Json(users)).into_response()) } diff --git a/src/api/v1/users/uuid.rs b/src/api/v1/users/uuid.rs index cee6df0..e015c3c 100644 --- a/src/api/v1/users/uuid.rs +++ b/src/api/v1/users/uuid.rs @@ -39,11 +39,14 @@ pub async fn get( Path(user_uuid): Path, Extension(CurrentUser(uuid)): Extension>, ) -> Result { - global_checks(&app_state, uuid).await?; + let mut conn = app_state.pool.get().await?; - let me = Me::get(&mut app_state.pool.get().await?, uuid).await?; + global_checks(&mut conn, &app_state.config, uuid).await?; - let user = User::fetch_one_with_friendship(&app_state, &me, user_uuid).await?; + let me = Me::get(&mut conn, uuid).await?; + + let user = + User::fetch_one_with_friendship(&mut conn, &app_state.cache_pool, &me, user_uuid).await?; Ok((StatusCode::OK, Json(user))) } diff --git a/src/objects/channel.rs b/src/objects/channel.rs index cacb153..03a2cf6 100644 --- a/src/objects/channel.rs +++ b/src/objects/channel.rs @@ -2,15 +2,15 @@ use diesel::{ ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, delete, insert_into, update, }; -use diesel_async::{RunQueryDsl, pooled_connection::AsyncDieselConnectionManager}; +use diesel_async::RunQueryDsl; use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::{ - AppState, Conn, + Conn, error::Error, schema::{channel_permissions, channels, messages}, - utils::{CHANNEL_REGEX, order_by_is_above}, + utils::{CHANNEL_REGEX, CacheFns, order_by_is_above}, }; use super::{HasIsAbove, HasUuid, Message, load_or_empty, message::MessageBuilder}; @@ -79,49 +79,44 @@ impl HasIsAbove for Channel { } impl Channel { - pub async fn fetch_all( - pool: &deadpool::managed::Pool< - AsyncDieselConnectionManager, - Conn, - >, - guild_uuid: Uuid, - ) -> Result, Error> { - let mut conn = pool.get().await?; - + pub async fn fetch_all(conn: &mut Conn, guild_uuid: Uuid) -> Result, Error> { use channels::dsl; let channel_builders: Vec = load_or_empty( dsl::channels .filter(dsl::guild_uuid.eq(guild_uuid)) .select(ChannelBuilder::as_select()) - .load(&mut conn) + .load(conn) .await, )?; - let channel_futures = channel_builders.iter().map(async move |c| { - let mut conn = pool.get().await?; - c.clone().build(&mut conn).await - }); + let mut channels = vec![]; - futures_util::future::try_join_all(channel_futures).await - } - - pub async fn fetch_one(app_state: &AppState, channel_uuid: Uuid) -> Result { - if let Ok(cache_hit) = app_state.get_cache_key(channel_uuid.to_string()).await { - return Ok(serde_json::from_str(&cache_hit)?); + for builder in channel_builders { + channels.push(builder.build(conn).await?); } - let mut conn = app_state.pool.get().await?; + Ok(channels) + } + + pub async fn fetch_one( + conn: &mut Conn, + cache_pool: &redis::Client, + channel_uuid: Uuid, + ) -> Result { + if let Ok(cache_hit) = cache_pool.get_cache_key(channel_uuid.to_string()).await { + return Ok(cache_hit); + } use channels::dsl; let channel_builder: ChannelBuilder = dsl::channels .filter(dsl::uuid.eq(channel_uuid)) .select(ChannelBuilder::as_select()) - .get_result(&mut conn) + .get_result(conn) .await?; - let channel = channel_builder.build(&mut conn).await?; + let channel = channel_builder.build(conn).await?; - app_state + cache_pool .set_cache_key(channel_uuid.to_string(), channel.clone(), 60) .await?; @@ -129,7 +124,8 @@ impl Channel { } pub async fn new( - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, guild_uuid: Uuid, name: String, description: Option, @@ -138,11 +134,9 @@ impl Channel { return Err(Error::BadRequest("Channel name is invalid".to_string())); } - let mut conn = app_state.pool.get().await?; - let channel_uuid = Uuid::now_v7(); - let channels = Self::fetch_all(&app_state.pool, guild_uuid).await?; + let channels = Self::fetch_all(conn, guild_uuid).await?; let channels_ordered = order_by_is_above(channels).await?; @@ -158,7 +152,7 @@ impl Channel { insert_into(channels::table) .values(new_channel.clone()) - .execute(&mut conn) + .execute(conn) .await?; if let Some(old_last_channel) = last_channel { @@ -166,7 +160,7 @@ impl Channel { update(channels::table) .filter(dsl::uuid.eq(old_last_channel.uuid)) .set(dsl::is_above.eq(new_channel.uuid)) - .execute(&mut conn) + .execute(conn) .await?; } @@ -180,16 +174,16 @@ impl Channel { permissions: vec![], }; - app_state + cache_pool .set_cache_key(channel_uuid.to_string(), channel.clone(), 1800) .await?; - if app_state - .get_cache_key(format!("{guild_uuid}_channels")) + if cache_pool + .get_cache_key::>(format!("{guild_uuid}_channels")) .await .is_ok() { - app_state + cache_pool .del_cache_key(format!("{guild_uuid}_channels")) .await?; } @@ -197,14 +191,12 @@ impl Channel { Ok(channel) } - pub async fn delete(self, app_state: &AppState) -> Result<(), Error> { - let mut conn = app_state.pool.get().await?; - + pub async fn delete(self, conn: &mut Conn, cache_pool: &redis::Client) -> Result<(), Error> { use channels::dsl; match update(channels::table) .filter(dsl::is_above.eq(self.uuid)) .set(dsl::is_above.eq(None::)) - .execute(&mut conn) + .execute(conn) .await { Ok(r) => Ok(r), @@ -214,13 +206,13 @@ impl Channel { delete(channels::table) .filter(dsl::uuid.eq(self.uuid)) - .execute(&mut conn) + .execute(conn) .await?; match update(channels::table) .filter(dsl::is_above.eq(self.uuid)) .set(dsl::is_above.eq(self.is_above)) - .execute(&mut conn) + .execute(conn) .await { Ok(r) => Ok(r), @@ -228,16 +220,20 @@ impl Channel { Err(e) => Err(e), }?; - if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { - app_state.del_cache_key(self.uuid.to_string()).await?; - } - - if app_state - .get_cache_key(format!("{}_channels", self.guild_uuid)) + if cache_pool + .get_cache_key::(self.uuid.to_string()) .await .is_ok() { - app_state + cache_pool.del_cache_key(self.uuid.to_string()).await?; + } + + if cache_pool + .get_cache_key::>(format!("{}_channels", self.guild_uuid)) + .await + .is_ok() + { + cache_pool .del_cache_key(format!("{}_channels", self.guild_uuid)) .await?; } @@ -247,32 +243,36 @@ impl Channel { pub async fn fetch_messages( &self, - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, amount: i64, offset: i64, ) -> Result, Error> { - let mut conn = app_state.pool.get().await?; - use messages::dsl; - let messages: Vec = load_or_empty( + let message_builders: Vec = load_or_empty( dsl::messages .filter(dsl::channel_uuid.eq(self.uuid)) .select(MessageBuilder::as_select()) .order(dsl::uuid.desc()) .limit(amount) .offset(offset) - .load(&mut conn) + .load(conn) .await, )?; - let message_futures = messages.iter().map(async move |b| b.build(app_state).await); + let mut messages = vec![]; - futures_util::future::try_join_all(message_futures).await + for builder in message_builders { + messages.push(builder.build(conn, cache_pool).await?); + } + + Ok(messages) } pub async fn new_message( &self, - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, user_uuid: Uuid, message: String, reply_to: Option, @@ -287,66 +287,101 @@ impl Channel { reply_to, }; - let mut conn = app_state.pool.get().await?; - insert_into(messages::table) .values(message.clone()) - .execute(&mut conn) + .execute(conn) .await?; - message.build(app_state).await + message.build(conn, cache_pool).await } - pub async fn set_name(&mut self, app_state: &AppState, new_name: String) -> Result<(), Error> { + pub async fn set_name( + &mut self, + conn: &mut Conn, + cache_pool: &redis::Client, + new_name: String, + ) -> Result<(), Error> { if !CHANNEL_REGEX.is_match(&new_name) { return Err(Error::BadRequest("Channel name is invalid".to_string())); } - let mut conn = app_state.pool.get().await?; - use channels::dsl; update(channels::table) .filter(dsl::uuid.eq(self.uuid)) .set(dsl::name.eq(&new_name)) - .execute(&mut conn) + .execute(conn) .await?; self.name = new_name; + if cache_pool + .get_cache_key::(self.uuid.to_string()) + .await + .is_ok() + { + cache_pool.del_cache_key(self.uuid.to_string()).await?; + } + + if cache_pool + .get_cache_key::>(format!("{}_channels", self.guild_uuid)) + .await + .is_ok() + { + cache_pool + .del_cache_key(format!("{}_channels", self.guild_uuid)) + .await?; + } + Ok(()) } pub async fn set_description( &mut self, - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, new_description: String, ) -> Result<(), Error> { - let mut conn = app_state.pool.get().await?; - use channels::dsl; update(channels::table) .filter(dsl::uuid.eq(self.uuid)) .set(dsl::description.eq(&new_description)) - .execute(&mut conn) + .execute(conn) .await?; self.description = Some(new_description); + if cache_pool + .get_cache_key::(self.uuid.to_string()) + .await + .is_ok() + { + cache_pool.del_cache_key(self.uuid.to_string()).await?; + } + + if cache_pool + .get_cache_key::>(format!("{}_channels", self.guild_uuid)) + .await + .is_ok() + { + cache_pool + .del_cache_key(format!("{}_channels", self.guild_uuid)) + .await?; + } + Ok(()) } pub async fn move_channel( &mut self, - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, new_is_above: Uuid, ) -> Result<(), Error> { - let mut conn = app_state.pool.get().await?; - use channels::dsl; let old_above_uuid: Option = match dsl::channels .filter(dsl::is_above.eq(self.uuid)) .select(dsl::uuid) - .get_result(&mut conn) + .get_result(conn) .await { Ok(r) => Ok(Some(r)), @@ -358,14 +393,14 @@ impl Channel { update(channels::table) .filter(dsl::uuid.eq(uuid)) .set(dsl::is_above.eq(None::)) - .execute(&mut conn) + .execute(conn) .await?; } match update(channels::table) .filter(dsl::is_above.eq(new_is_above)) .set(dsl::is_above.eq(self.uuid)) - .execute(&mut conn) + .execute(conn) .await { Ok(r) => Ok(r), @@ -376,19 +411,37 @@ impl Channel { update(channels::table) .filter(dsl::uuid.eq(self.uuid)) .set(dsl::is_above.eq(new_is_above)) - .execute(&mut conn) + .execute(conn) .await?; if let Some(uuid) = old_above_uuid { update(channels::table) .filter(dsl::uuid.eq(uuid)) .set(dsl::is_above.eq(self.is_above)) - .execute(&mut conn) + .execute(conn) .await?; } self.is_above = Some(new_is_above); + if cache_pool + .get_cache_key::(self.uuid.to_string()) + .await + .is_ok() + { + cache_pool.del_cache_key(self.uuid.to_string()).await?; + } + + if cache_pool + .get_cache_key::>(format!("{}_channels", self.guild_uuid)) + .await + .is_ok() + { + cache_pool + .del_cache_key(format!("{}_channels", self.guild_uuid)) + .await?; + } + Ok(()) } } diff --git a/src/objects/email_token.rs b/src/objects/email_token.rs index 64d2fdb..c826620 100644 --- a/src/objects/email_token.rs +++ b/src/objects/email_token.rs @@ -3,7 +3,11 @@ use lettre::message::MultiPart; use serde::{Deserialize, Serialize}; use uuid::Uuid; -use crate::{AppState, error::Error, utils::generate_token}; +use crate::{ + AppState, + error::Error, + utils::{CacheFns, generate_token}, +}; use super::Me; @@ -15,12 +19,10 @@ pub struct EmailToken { } impl EmailToken { - pub async fn get(app_state: &AppState, user_uuid: Uuid) -> Result { - let email_token = serde_json::from_str( - &app_state - .get_cache_key(format!("{user_uuid}_email_verify")) - .await?, - )?; + pub async fn get(cache_pool: &redis::Client, user_uuid: Uuid) -> Result { + let email_token = cache_pool + .get_cache_key(format!("{user_uuid}_email_verify")) + .await?; Ok(email_token) } @@ -37,6 +39,7 @@ impl EmailToken { }; app_state + .cache_pool .set_cache_key(format!("{}_email_verify", me.uuid), email_token, 86400) .await?; @@ -59,8 +62,8 @@ impl EmailToken { Ok(()) } - pub async fn delete(&self, app_state: &AppState) -> Result<(), Error> { - app_state + pub async fn delete(&self, cache_pool: &redis::Client) -> Result<(), Error> { + cache_pool .del_cache_key(format!("{}_email_verify", self.user_uuid)) .await?; diff --git a/src/objects/guild.rs b/src/objects/guild.rs index 9514e49..9640e28 100644 --- a/src/objects/guild.rs +++ b/src/objects/guild.rs @@ -3,14 +3,14 @@ use diesel::{ ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, insert_into, update, }; -use diesel_async::{RunQueryDsl, pooled_connection::AsyncDieselConnectionManager}; +use diesel_async::RunQueryDsl; use serde::Serialize; use tokio::task; use url::Url; use uuid::Uuid; use crate::{ - Conn, + AppState, Conn, error::Error, schema::{guild_members, guilds, invites}, utils::image_check, @@ -68,16 +68,11 @@ impl Guild { } pub async fn fetch_amount( - pool: &deadpool::managed::Pool< - AsyncDieselConnectionManager, - Conn, - >, + conn: &mut Conn, offset: i64, amount: i64, ) -> Result, Error> { // Fetch guild data from database - let mut conn = pool.get().await?; - use guilds::dsl; let guild_builders: Vec = load_or_empty( dsl::guilds @@ -85,18 +80,17 @@ impl Guild { .order_by(dsl::uuid) .offset(offset) .limit(amount) - .load(&mut conn) + .load(conn) .await, )?; - // Process each guild concurrently - let guild_futures = guild_builders.iter().map(async move |g| { - let mut conn = pool.get().await?; - g.clone().build(&mut conn).await - }); + let mut guilds = vec![]; - // Execute all futures concurrently and collect results - futures_util::future::try_join_all(guild_futures).await + for builder in guild_builders { + guilds.push(builder.build(conn).await?); + } + + Ok(guilds) } pub async fn new(conn: &mut Conn, name: String, owner_uuid: Uuid) -> Result { @@ -188,9 +182,8 @@ impl Guild { // FIXME: Horrible security pub async fn set_icon( &mut self, - bunny_storage: &bunny_api_tokio::EdgeStorageClient, conn: &mut Conn, - cdn_url: Url, + app_state: &AppState, icon: Bytes, ) -> Result<(), Error> { let icon_clone = icon.clone(); @@ -199,14 +192,14 @@ impl Guild { if let Some(icon) = &self.icon { let relative_url = icon.path().trim_start_matches('/'); - bunny_storage.delete(relative_url).await?; + app_state.bunny_storage.delete(relative_url).await?; } let path = format!("icons/{}/{}.{}", self.uuid, Uuid::now_v7(), image_type); - bunny_storage.upload(path.clone(), icon).await?; + app_state.bunny_storage.upload(path.clone(), icon).await?; - let icon_url = cdn_url.join(&path)?; + let icon_url = app_state.config.bunny.cdn_url.join(&path)?; use guilds::dsl; update(guilds::table) diff --git a/src/objects/me.rs b/src/objects/me.rs index a0b399d..d03e08b 100644 --- a/src/objects/me.rs +++ b/src/objects/me.rs @@ -14,7 +14,7 @@ use crate::{ error::Error, objects::{Friend, FriendRequest, User}, schema::{friend_requests, friends, guild_members, guilds, users}, - utils::{EMAIL_REGEX, USERNAME_REGEX, image_check}, + utils::{CacheFns, EMAIL_REGEX, USERNAME_REGEX, image_check}, }; use super::{Guild, guild::GuildBuilder, load_or_empty, member::MemberBuilder}; @@ -75,15 +75,13 @@ impl Me { pub async fn set_avatar( &mut self, + conn: &mut Conn, app_state: &AppState, - cdn_url: Url, avatar: Bytes, ) -> Result<(), Error> { let avatar_clone = avatar.clone(); let image_type = task::spawn_blocking(move || image_check(avatar_clone)).await??; - let mut conn = app_state.pool.get().await?; - if let Some(avatar) = &self.avatar { let avatar_url: Url = avatar.parse()?; @@ -96,17 +94,25 @@ impl Me { app_state.bunny_storage.upload(path.clone(), avatar).await?; - let avatar_url = cdn_url.join(&path)?; + let avatar_url = app_state.config.bunny.cdn_url.join(&path)?; use users::dsl; update(users::table) .filter(dsl::uuid.eq(self.uuid)) .set(dsl::avatar.eq(avatar_url.as_str())) - .execute(&mut conn) + .execute(conn) .await?; - if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { - app_state.del_cache_key(self.uuid.to_string()).await? + if app_state + .cache_pool + .get_cache_key::(self.uuid.to_string()) + .await + .is_ok() + { + app_state + .cache_pool + .del_cache_key(self.uuid.to_string()) + .await? } self.avatar = Some(avatar_url.to_string()); @@ -127,7 +133,8 @@ impl Me { pub async fn set_username( &mut self, - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, new_username: String, ) -> Result<(), Error> { if !USERNAME_REGEX.is_match(&new_username) @@ -137,17 +144,19 @@ impl Me { return Err(Error::BadRequest("Invalid username".to_string())); } - let mut conn = app_state.pool.get().await?; - use users::dsl; update(users::table) .filter(dsl::uuid.eq(self.uuid)) .set(dsl::username.eq(new_username.as_str())) - .execute(&mut conn) + .execute(conn) .await?; - if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { - app_state.del_cache_key(self.uuid.to_string()).await? + if cache_pool + .get_cache_key::(self.uuid.to_string()) + .await + .is_ok() + { + cache_pool.del_cache_key(self.uuid.to_string()).await? } self.username = new_username; @@ -157,11 +166,10 @@ impl Me { pub async fn set_display_name( &mut self, - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, new_display_name: String, ) -> Result<(), Error> { - let mut conn = app_state.pool.get().await?; - let new_display_name_option = if new_display_name.is_empty() { None } else { @@ -172,11 +180,15 @@ impl Me { update(users::table) .filter(dsl::uuid.eq(self.uuid)) .set(dsl::display_name.eq(&new_display_name_option)) - .execute(&mut conn) + .execute(conn) .await?; - if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { - app_state.del_cache_key(self.uuid.to_string()).await? + if cache_pool + .get_cache_key::(self.uuid.to_string()) + .await + .is_ok() + { + cache_pool.del_cache_key(self.uuid.to_string()).await? } self.display_name = new_display_name_option; @@ -186,15 +198,14 @@ impl Me { pub async fn set_email( &mut self, - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, new_email: String, ) -> Result<(), Error> { if !EMAIL_REGEX.is_match(&new_email) { return Err(Error::BadRequest("Invalid username".to_string())); } - let mut conn = app_state.pool.get().await?; - use users::dsl; update(users::table) .filter(dsl::uuid.eq(self.uuid)) @@ -202,11 +213,15 @@ impl Me { dsl::email.eq(new_email.as_str()), dsl::email_verified.eq(false), )) - .execute(&mut conn) + .execute(conn) .await?; - if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { - app_state.del_cache_key(self.uuid.to_string()).await? + if cache_pool + .get_cache_key::(self.uuid.to_string()) + .await + .is_ok() + { + cache_pool.del_cache_key(self.uuid.to_string()).await? } self.email = new_email; @@ -216,20 +231,23 @@ impl Me { pub async fn set_pronouns( &mut self, - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, new_pronouns: String, ) -> Result<(), Error> { - let mut conn = app_state.pool.get().await?; - use users::dsl; update(users::table) .filter(dsl::uuid.eq(self.uuid)) .set((dsl::pronouns.eq(new_pronouns.as_str()),)) - .execute(&mut conn) + .execute(conn) .await?; - if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { - app_state.del_cache_key(self.uuid.to_string()).await? + if cache_pool + .get_cache_key::(self.uuid.to_string()) + .await + .is_ok() + { + cache_pool.del_cache_key(self.uuid.to_string()).await? } Ok(()) @@ -237,20 +255,23 @@ impl Me { pub async fn set_about( &mut self, - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, new_about: String, ) -> Result<(), Error> { - let mut conn = app_state.pool.get().await?; - use users::dsl; update(users::table) .filter(dsl::uuid.eq(self.uuid)) .set((dsl::about.eq(new_about.as_str()),)) - .execute(&mut conn) + .execute(conn) .await?; - if app_state.get_cache_key(self.uuid.to_string()).await.is_ok() { - app_state.del_cache_key(self.uuid.to_string()).await? + if cache_pool + .get_cache_key::(self.uuid.to_string()) + .await + .is_ok() + { + cache_pool.del_cache_key(self.uuid.to_string()).await? } Ok(()) @@ -366,16 +387,18 @@ impl Me { Ok(()) } - pub async fn get_friends(&self, app_state: &AppState) -> Result, Error> { + pub async fn get_friends( + &self, + conn: &mut Conn, + cache_pool: &redis::Client, + ) -> Result, Error> { use friends::dsl; - let mut conn = app_state.pool.get().await?; - let friends1 = load_or_empty( dsl::friends .filter(dsl::uuid1.eq(self.uuid)) .select(Friend::as_select()) - .load(&mut conn) + .load(conn) .await, )?; @@ -383,21 +406,21 @@ impl Me { dsl::friends .filter(dsl::uuid2.eq(self.uuid)) .select(Friend::as_select()) - .load(&mut conn) + .load(conn) .await, )?; - let friend_futures = friends1.iter().map(async move |friend| { - User::fetch_one_with_friendship(app_state, self, friend.uuid2).await - }); + let mut friends = vec![]; - let mut friends = futures_util::future::try_join_all(friend_futures).await?; + for friend in friends1 { + friends + .push(User::fetch_one_with_friendship(conn, cache_pool, self, friend.uuid2).await?); + } - let friend_futures = friends2.iter().map(async move |friend| { - User::fetch_one_with_friendship(app_state, self, friend.uuid1).await - }); - - friends.append(&mut futures_util::future::try_join_all(friend_futures).await?); + for friend in friends2 { + friends + .push(User::fetch_one_with_friendship(conn, cache_pool, self, friend.uuid1).await?); + } Ok(friends) } diff --git a/src/objects/member.rs b/src/objects/member.rs index 50b76b0..b7befdc 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::{ - AppState, Conn, + Conn, error::Error, objects::{Me, Permissions, Role}, schema::guild_members, @@ -26,13 +26,18 @@ pub struct MemberBuilder { } impl MemberBuilder { - pub async fn build(&self, app_state: &AppState, me: Option<&Me>) -> Result { + pub async fn build( + &self, + conn: &mut Conn, + cache_pool: &redis::Client, + me: Option<&Me>, + ) -> Result { let user; if let Some(me) = me { - user = User::fetch_one_with_friendship(app_state, me, self.user_uuid).await?; + user = User::fetch_one_with_friendship(conn, cache_pool, me, self.user_uuid).await?; } else { - user = User::fetch_one(app_state, self.user_uuid).await?; + user = User::fetch_one(conn, cache_pool, self.user_uuid).await?; } Ok(Member { @@ -47,11 +52,12 @@ impl MemberBuilder { pub async fn check_permission( &self, - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, permission: Permissions, ) -> Result<(), Error> { if !self.is_owner { - let roles = Role::fetch_from_member(app_state, self.uuid).await?; + let roles = Role::fetch_from_member(conn, cache_pool, self.uuid).await?; let allowed = roles.iter().any(|r| r.permissions & permission as i64 != 0); if !allowed { return Err(Error::Forbidden("Not allowed".to_string())); @@ -101,56 +107,53 @@ impl Member { } pub async fn fetch_one( - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, me: &Me, user_uuid: Uuid, guild_uuid: Uuid, ) -> Result { - let mut conn = app_state.pool.get().await?; - use guild_members::dsl; let member: MemberBuilder = dsl::guild_members .filter(dsl::user_uuid.eq(user_uuid)) .filter(dsl::guild_uuid.eq(guild_uuid)) .select(MemberBuilder::as_select()) - .get_result(&mut conn) + .get_result(conn) .await?; - member.build(app_state, Some(me)).await + member.build(conn, cache_pool, Some(me)).await } pub async fn fetch_all( - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, me: &Me, guild_uuid: Uuid, ) -> Result, Error> { - let mut conn = app_state.pool.get().await?; - use guild_members::dsl; let member_builders: Vec = load_or_empty( dsl::guild_members .filter(dsl::guild_uuid.eq(guild_uuid)) .select(MemberBuilder::as_select()) - .load(&mut conn) + .load(conn) .await, )?; let mut members = vec![]; for builder in member_builders { - members.push(builder.build(app_state, Some(me)).await?); + members.push(builder.build(conn, cache_pool, Some(me)).await?); } Ok(members) } pub async fn new( - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, user_uuid: Uuid, guild_uuid: Uuid, ) -> Result { - let mut conn = app_state.pool.get().await?; - let member_uuid = Uuid::now_v7(); let member = MemberBuilder { @@ -163,9 +166,9 @@ impl Member { insert_into(guild_members::table) .values(&member) - .execute(&mut conn) + .execute(conn) .await?; - member.build(app_state, None).await + member.build(conn, cache_pool, None).await } } diff --git a/src/objects/message.rs b/src/objects/message.rs index caff969..a5224e0 100644 --- a/src/objects/message.rs +++ b/src/objects/message.rs @@ -2,7 +2,7 @@ use diesel::{Insertable, Queryable, Selectable}; use serde::Serialize; use uuid::Uuid; -use crate::{AppState, error::Error, schema::messages}; +use crate::{Conn, error::Error, schema::messages}; use super::User; @@ -18,8 +18,12 @@ pub struct MessageBuilder { } impl MessageBuilder { - pub async fn build(&self, app_state: &AppState) -> Result { - let user = User::fetch_one(app_state, self.user_uuid).await?; + pub async fn build( + &self, + conn: &mut Conn, + cache_pool: &redis::Client, + ) -> Result { + let user = User::fetch_one(conn, cache_pool, self.user_uuid).await?; Ok(Message { uuid: self.uuid, diff --git a/src/objects/password_reset_token.rs b/src/objects/password_reset_token.rs index 04ff43c..ca5c62f 100644 --- a/src/objects/password_reset_token.rs +++ b/src/objects/password_reset_token.rs @@ -10,10 +10,10 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::{ - AppState, + AppState, Conn, error::Error, schema::users, - utils::{PASSWORD_REGEX, generate_token, global_checks, user_uuid_from_identifier}, + utils::{CacheFns, PASSWORD_REGEX, generate_token, global_checks, user_uuid_from_identifier}, }; #[derive(Serialize, Deserialize)] @@ -24,50 +24,49 @@ pub struct PasswordResetToken { } impl PasswordResetToken { - pub async fn get(app_state: &AppState, token: String) -> Result { - let user_uuid: Uuid = - serde_json::from_str(&app_state.get_cache_key(token.to_string()).await?)?; - let password_reset_token = serde_json::from_str( - &app_state - .get_cache_key(format!("{user_uuid}_password_reset")) - .await?, - )?; + pub async fn get( + cache_pool: &redis::Client, + token: String, + ) -> Result { + let user_uuid: Uuid = cache_pool.get_cache_key(token.to_string()).await?; + let password_reset_token = cache_pool + .get_cache_key(format!("{user_uuid}_password_reset")) + .await?; Ok(password_reset_token) } pub async fn get_with_identifier( - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, identifier: String, ) -> Result { - let mut conn = app_state.pool.get().await?; + let user_uuid = user_uuid_from_identifier(conn, &identifier).await?; - let user_uuid = user_uuid_from_identifier(&mut conn, &identifier).await?; - - let password_reset_token = serde_json::from_str( - &app_state - .get_cache_key(format!("{user_uuid}_password_reset")) - .await?, - )?; + let password_reset_token = cache_pool + .get_cache_key(format!("{user_uuid}_password_reset")) + .await?; Ok(password_reset_token) } #[allow(clippy::new_ret_no_self)] - pub async fn new(app_state: &AppState, identifier: String) -> Result<(), Error> { + pub async fn new( + conn: &mut Conn, + app_state: &AppState, + identifier: String, + ) -> Result<(), Error> { let token = generate_token::<32>()?; - let mut conn = app_state.pool.get().await?; + let user_uuid = user_uuid_from_identifier(conn, &identifier).await?; - let user_uuid = user_uuid_from_identifier(&mut conn, &identifier).await?; - - global_checks(app_state, user_uuid).await?; + global_checks(conn, &app_state.config, user_uuid).await?; use users::dsl as udsl; let (username, email_address): (String, String) = udsl::users .filter(udsl::uuid.eq(user_uuid)) .select((udsl::username, udsl::email)) - .get_result(&mut conn) + .get_result(conn) .await?; let password_reset_token = PasswordResetToken { @@ -77,6 +76,7 @@ impl PasswordResetToken { }; app_state + .cache_pool .set_cache_key( format!("{user_uuid}_password_reset"), password_reset_token, @@ -84,6 +84,7 @@ impl PasswordResetToken { ) .await?; app_state + .cache_pool .set_cache_key(token.clone(), user_uuid, 86400) .await?; @@ -106,7 +107,12 @@ impl PasswordResetToken { Ok(()) } - pub async fn set_password(&self, app_state: &AppState, password: String) -> Result<(), Error> { + pub async fn set_password( + &self, + conn: &mut Conn, + app_state: &AppState, + password: String, + ) -> Result<(), Error> { if !PASSWORD_REGEX.is_match(&password) { return Err(Error::BadRequest( "Please provide a valid password".to_string(), @@ -120,19 +126,17 @@ impl PasswordResetToken { .hash_password(password.as_bytes(), &salt) .map_err(|e| Error::PasswordHashError(e.to_string()))?; - let mut conn = app_state.pool.get().await?; - use users::dsl; update(users::table) .filter(dsl::uuid.eq(self.user_uuid)) .set(dsl::password.eq(hashed_password.to_string())) - .execute(&mut conn) + .execute(conn) .await?; let (username, email_address): (String, String) = dsl::users .filter(dsl::uuid.eq(self.user_uuid)) .select((dsl::username, dsl::email)) - .get_result(&mut conn) + .get_result(conn) .await?; let login_page = app_state.config.web.frontend_url.join("login")?; @@ -149,14 +153,14 @@ impl PasswordResetToken { app_state.mail_client.send_mail(email).await?; - self.delete(app_state).await + self.delete(&app_state.cache_pool).await } - pub async fn delete(&self, app_state: &AppState) -> Result<(), Error> { - app_state + pub async fn delete(&self, cache_pool: &redis::Client) -> Result<(), Error> { + cache_pool .del_cache_key(format!("{}_password_reset", &self.user_uuid)) .await?; - app_state.del_cache_key(self.token.to_string()).await?; + cache_pool.del_cache_key(self.token.to_string()).await?; Ok(()) } diff --git a/src/objects/role.rs b/src/objects/role.rs index ea70686..01e4738 100644 --- a/src/objects/role.rs +++ b/src/objects/role.rs @@ -7,10 +7,10 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::{ - AppState, Conn, + Conn, error::Error, schema::{role_members, roles}, - utils::order_by_is_above, + utils::{CacheFns, order_by_is_above}, }; use super::{HasIsAbove, HasUuid, load_or_empty}; @@ -75,34 +75,33 @@ impl Role { } pub async fn fetch_from_member( - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, member_uuid: Uuid, ) -> Result, Error> { - if let Ok(roles) = app_state + if let Ok(roles) = cache_pool .get_cache_key(format!("{member_uuid}_roles")) .await { - return Ok(serde_json::from_str(&roles)?); + return Ok(roles); } - let mut conn = app_state.pool.get().await?; - use role_members::dsl; let role_memberships: Vec = load_or_empty( dsl::role_members .filter(dsl::member_uuid.eq(member_uuid)) .select(RoleMember::as_select()) - .load(&mut conn) + .load(conn) .await, )?; let mut roles = vec![]; for membership in role_memberships { - roles.push(membership.fetch_role(&mut conn).await?); + roles.push(membership.fetch_role(conn).await?); } - app_state + cache_pool .set_cache_key(format!("{member_uuid}_roles"), roles.clone(), 300) .await?; diff --git a/src/objects/user.rs b/src/objects/user.rs index c1f164d..a686c39 100644 --- a/src/objects/user.rs +++ b/src/objects/user.rs @@ -4,7 +4,7 @@ use diesel_async::RunQueryDsl; use serde::{Deserialize, Serialize}; use uuid::Uuid; -use crate::{AppState, Conn, error::Error, objects::Me, schema::users}; +use crate::{Conn, error::Error, objects::Me, schema::users, utils::CacheFns}; use super::load_or_empty; @@ -46,23 +46,25 @@ pub struct User { } impl User { - pub async fn fetch_one(app_state: &AppState, user_uuid: Uuid) -> Result { - let mut conn = app_state.pool.get().await?; - - if let Ok(cache_hit) = app_state.get_cache_key(user_uuid.to_string()).await { - return Ok(serde_json::from_str(&cache_hit)?); + pub async fn fetch_one( + conn: &mut Conn, + cache_pool: &redis::Client, + user_uuid: Uuid, + ) -> Result { + if let Ok(cache_hit) = cache_pool.get_cache_key(user_uuid.to_string()).await { + return Ok(cache_hit); } use users::dsl; let user_builder: UserBuilder = dsl::users .filter(dsl::uuid.eq(user_uuid)) .select(UserBuilder::as_select()) - .get_result(&mut conn) + .get_result(conn) .await?; let user = user_builder.build(); - app_state + cache_pool .set_cache_key(user_uuid.to_string(), user.clone(), 1800) .await?; @@ -70,15 +72,14 @@ impl User { } pub async fn fetch_one_with_friendship( - app_state: &AppState, + conn: &mut Conn, + cache_pool: &redis::Client, me: &Me, user_uuid: Uuid, ) -> Result { - let mut conn = app_state.pool.get().await?; + let mut user = Self::fetch_one(conn, cache_pool, user_uuid).await?; - let mut user = Self::fetch_one(app_state, user_uuid).await?; - - if let Some(friend) = me.friends_with(&mut conn, user_uuid).await? { + if let Some(friend) = me.friends_with(conn, user_uuid).await? { user.friends_since = Some(friend.accepted_at); } diff --git a/src/utils.rs b/src/utils.rs index e1df906..7ef880e 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -8,14 +8,13 @@ use diesel::{ExpressionMethods, QueryDsl}; use diesel_async::RunQueryDsl; use getrandom::fill; use hex::encode; -use redis::RedisError; use regex::Regex; -use serde::Serialize; +use serde::{Serialize, de::DeserializeOwned}; use time::Duration; use uuid::Uuid; use crate::{ - AppState, Conn, + Conn, config::Config, error::Error, objects::{HasIsAbove, HasUuid}, @@ -115,15 +114,13 @@ pub async fn user_uuid_from_username(conn: &mut Conn, username: &String) -> Resu } } -pub async fn global_checks(app_state: &AppState, user_uuid: Uuid) -> Result<(), Error> { - if app_state.config.instance.require_email_verification { - let mut conn = app_state.pool.get().await?; - +pub async fn global_checks(conn: &mut Conn, config: &Config, user_uuid: Uuid) -> Result<(), Error> { + if config.instance.require_email_verification { use users::dsl; let email_verified: bool = dsl::users .filter(dsl::uuid.eq(user_uuid)) .select(dsl::email_verified) - .get_result(&mut conn) + .get_result(conn) .await?; if !email_verified { @@ -161,14 +158,28 @@ where Ok(ordered) } -impl AppState { - pub async fn set_cache_key( +#[allow(async_fn_in_trait)] +pub trait CacheFns { + async fn set_cache_key( + &self, + key: String, + value: impl Serialize, + expire: u32, + ) -> Result<(), Error>; + async fn get_cache_key(&self, key: String) -> Result + where + T: DeserializeOwned; + async fn del_cache_key(&self, key: String) -> Result<(), Error>; +} + +impl CacheFns for redis::Client { + async fn set_cache_key( &self, key: String, value: impl Serialize, expire: u32, ) -> Result<(), Error> { - let mut conn = self.cache_pool.get_multiplexed_tokio_connection().await?; + let mut conn = self.get_multiplexed_tokio_connection().await?; let key_encoded = encode(key); @@ -187,26 +198,31 @@ impl AppState { Ok(()) } - pub async fn get_cache_key(&self, key: String) -> Result { - let mut conn = self.cache_pool.get_multiplexed_tokio_connection().await?; + async fn get_cache_key(&self, key: String) -> Result + where + T: DeserializeOwned, + { + let mut conn = self.get_multiplexed_tokio_connection().await?; let key_encoded = encode(key); - redis::cmd("GET") + let res: String = redis::cmd("GET") .arg(key_encoded) .query_async(&mut conn) - .await + .await?; + + Ok(serde_json::from_str(&res)?) } - pub async fn del_cache_key(&self, key: String) -> Result<(), RedisError> { - let mut conn = self.cache_pool.get_multiplexed_tokio_connection().await?; + async fn del_cache_key(&self, key: String) -> Result<(), Error> { + let mut conn = self.get_multiplexed_tokio_connection().await?; let key_encoded = encode(key); - redis::cmd("DEL") + Ok(redis::cmd("DEL") .arg(key_encoded) .query_async(&mut conn) - .await + .await?) } } From 82f4388dab3182de9d97d4babdafcffd0db099f8 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Tue, 22 Jul 2025 17:29:55 +0200 Subject: [PATCH 04/48] 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 05/48] 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 06/48] 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 07/48] 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 08/48] 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 09/48] 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 10/48] 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 11/48] 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 12/48] 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 13/48] 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 14/48] 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 15/48] 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 16/48] 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 17/48] 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 18/48] 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 19/48] 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 20/48] 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 21/48] 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 22/48] 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 23/48] 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 24/48] 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 25/48] 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 26/48] 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 27/48] 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 28/48] 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 29/48] 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 30/48] 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 31/48] 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 32/48] 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 33/48] 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 34/48] 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 35/48] 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 36/48] 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 37/48] 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 38/48] 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 39/48] 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 40/48] 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}; From 3816af56e34484d75b7bd5b3e8dc6354ec643355 Mon Sep 17 00:00:00 2001 From: Radical Date: Thu, 31 Jul 2025 16:01:10 +0200 Subject: [PATCH 41/48] feat: return role with member --- .../down.sql | 5 ++ .../2025-07-31-133510_roles_uuid_index/up.sql | 5 ++ src/api/v1/members/uuid/ban.rs | 3 +- src/api/v1/members/uuid/mod.rs | 8 ++- src/objects/member.rs | 26 ++++++++-- src/objects/role.rs | 49 +++++++------------ src/schema.rs | 4 +- 7 files changed, 59 insertions(+), 41 deletions(-) create mode 100644 migrations/2025-07-31-133510_roles_uuid_index/down.sql create mode 100644 migrations/2025-07-31-133510_roles_uuid_index/up.sql diff --git a/migrations/2025-07-31-133510_roles_uuid_index/down.sql b/migrations/2025-07-31-133510_roles_uuid_index/down.sql new file mode 100644 index 0000000..efe3f3f --- /dev/null +++ b/migrations/2025-07-31-133510_roles_uuid_index/down.sql @@ -0,0 +1,5 @@ +-- This file should undo anything in `up.sql` +DROP INDEX roles_guuid_uuid; +ALTER TABLE roles DROP CONSTRAINT roles_pkey; +CREATE UNIQUE INDEX roles_pkey ON roles (uuid, guild_uuid); +ALTER TABLE roles ADD PRIMARY KEY USING INDEX roles_pkey; diff --git a/migrations/2025-07-31-133510_roles_uuid_index/up.sql b/migrations/2025-07-31-133510_roles_uuid_index/up.sql new file mode 100644 index 0000000..792e7fd --- /dev/null +++ b/migrations/2025-07-31-133510_roles_uuid_index/up.sql @@ -0,0 +1,5 @@ +-- Your SQL goes here +ALTER TABLE roles DROP CONSTRAINT roles_pkey; +CREATE UNIQUE INDEX roles_pkey ON roles (uuid); +ALTER TABLE roles ADD PRIMARY KEY USING INDEX roles_pkey; +CREATE UNIQUE INDEX roles_guuid_uuid ON roles (uuid, guild_uuid); \ No newline at end of file diff --git a/src/api/v1/members/uuid/ban.rs b/src/api/v1/members/uuid/ban.rs index b959efa..888dca6 100644 --- a/src/api/v1/members/uuid/ban.rs +++ b/src/api/v1/members/uuid/ban.rs @@ -33,7 +33,8 @@ pub async fn post( global_checks(&mut conn, &app_state.config, uuid).await?; - let member = Member::fetch_one_with_member(&mut conn, &app_state.cache_pool, None, member_uuid).await?; + let member = + Member::fetch_one_with_member(&mut conn, &app_state.cache_pool, None, member_uuid).await?; let caller = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs index 2bdd1ba..0832192 100644 --- a/src/api/v1/members/uuid/mod.rs +++ b/src/api/v1/members/uuid/mod.rs @@ -31,7 +31,9 @@ pub async fn get( let me = Me::get(&mut conn, uuid).await?; - let member = Member::fetch_one_with_member(&mut conn, &app_state.cache_pool, Some(&me), member_uuid).await?; + let member = + Member::fetch_one_with_member(&mut conn, &app_state.cache_pool, Some(&me), member_uuid) + .await?; Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; Ok((StatusCode::OK, Json(member))) @@ -48,7 +50,9 @@ pub async fn delete( let me = Me::get(&mut conn, uuid).await?; - let member = Member::fetch_one_with_member(&mut conn, &app_state.cache_pool, Some(&me), member_uuid).await?; + let member = + Member::fetch_one_with_member(&mut conn, &app_state.cache_pool, 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 3eb8c4d..a25bf66 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -1,6 +1,6 @@ use diesel::{ - ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, delete, - insert_into, + ExpressionMethods, Identifiable, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, + delete, insert_into, }; use diesel_async::RunQueryDsl; use serde::{Deserialize, Serialize}; @@ -15,8 +15,9 @@ use crate::{ use super::{User, load_or_empty}; -#[derive(Serialize, Queryable, Selectable, Insertable)] +#[derive(Serialize, Queryable, Identifiable, Selectable, Insertable)] #[diesel(table_name = guild_members)] +#[diesel(primary_key(uuid))] #[diesel(check_for_backend(diesel::pg::Pg))] pub struct MemberBuilder { pub uuid: Uuid, @@ -41,6 +42,8 @@ impl MemberBuilder { user = User::fetch_one(conn, cache_pool, self.user_uuid).await?; } + let roles = Role::fetch_from_member(conn, cache_pool, self).await?; + Ok(Member { uuid: self.uuid, nickname: self.nickname.clone(), @@ -48,6 +51,7 @@ impl MemberBuilder { guild_uuid: self.guild_uuid, is_owner: self.is_owner, user, + roles, }) } @@ -58,7 +62,7 @@ impl MemberBuilder { permission: Permissions, ) -> Result<(), Error> { if !self.is_owner { - let roles = Role::fetch_from_member(conn, cache_pool, self.uuid).await?; + let roles = Role::fetch_from_member(conn, cache_pool, self).await?; let allowed = roles.iter().any(|r| r.permissions & permission as i64 != 0); if !allowed { return Err(Error::Forbidden("Not allowed".to_string())); @@ -73,10 +77,12 @@ impl MemberBuilder { pub struct Member { pub uuid: Uuid, pub nickname: Option, + #[serde(skip)] pub user_uuid: Uuid, pub guild_uuid: Uuid, pub is_owner: bool, user: User, + roles: Vec, } impl Member { @@ -199,7 +205,7 @@ impl Member { pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> { if self.is_owner { - return Err(Error::Forbidden("Can not kick owner".to_string())) + return Err(Error::Forbidden("Can not kick owner".to_string())); } delete(guild_members::table) .filter(guild_members::uuid.eq(self.uuid)) @@ -228,4 +234,14 @@ impl Member { Ok(()) } + + pub fn to_builder(&self) -> MemberBuilder { + MemberBuilder { + uuid: self.uuid, + nickname: self.nickname.clone(), + user_uuid: self.user_uuid, + guild_uuid: self.guild_uuid, + is_owner: self.is_owner, + } + } } diff --git a/src/objects/role.rs b/src/objects/role.rs index 46f54f6..cc71fb2 100644 --- a/src/objects/role.rs +++ b/src/objects/role.rs @@ -1,6 +1,7 @@ +use diesel::query_dsl::BelongingToDsl; use diesel::{ - ExpressionMethods, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, insert_into, - update, + Associations, ExpressionMethods, Identifiable, Insertable, QueryDsl, Queryable, Selectable, + SelectableHelper, insert_into, update, }; use diesel_async::RunQueryDsl; use serde::{Deserialize, Serialize}; @@ -13,10 +14,11 @@ use crate::{ utils::{CacheFns, order_by_is_above}, }; -use super::{HasIsAbove, HasUuid, load_or_empty}; +use super::{HasIsAbove, HasUuid, load_or_empty, member::MemberBuilder}; -#[derive(Deserialize, Serialize, Clone, Queryable, Selectable, Insertable)] +#[derive(Deserialize, Serialize, Clone, Identifiable, Queryable, Selectable, Insertable)] #[diesel(table_name = roles)] +#[diesel(primary_key(uuid))] #[diesel(check_for_backend(diesel::pg::Pg))] pub struct Role { uuid: Uuid, @@ -27,27 +29,17 @@ pub struct Role { pub permissions: i64, } -#[derive(Serialize, Clone, Queryable, Selectable, Insertable)] +#[derive(Serialize, Clone, Identifiable, Queryable, Selectable, Insertable, Associations)] #[diesel(table_name = role_members)] +#[diesel(belongs_to(MemberBuilder, foreign_key = member_uuid))] +#[diesel(belongs_to(Role, foreign_key = role_uuid))] +#[diesel(primary_key(role_uuid, member_uuid))] #[diesel(check_for_backend(diesel::pg::Pg))] pub struct RoleMember { role_uuid: Uuid, member_uuid: Uuid, } -impl RoleMember { - async fn fetch_role(&self, conn: &mut Conn) -> Result { - use roles::dsl; - let role: Role = dsl::roles - .filter(dsl::uuid.eq(self.role_uuid)) - .select(Role::as_select()) - .get_result(conn) - .await?; - - Ok(role) - } -} - impl HasUuid for Role { fn uuid(&self) -> &Uuid { self.uuid.as_ref() @@ -77,32 +69,25 @@ impl Role { pub async fn fetch_from_member( conn: &mut Conn, cache_pool: &redis::Client, - member_uuid: Uuid, + member: &MemberBuilder, ) -> Result, Error> { if let Ok(roles) = cache_pool - .get_cache_key(format!("{member_uuid}_roles")) + .get_cache_key(format!("{}_roles", member.uuid)) .await { return Ok(roles); } - use role_members::dsl; - let role_memberships: Vec = load_or_empty( - dsl::role_members - .filter(dsl::member_uuid.eq(member_uuid)) - .select(RoleMember::as_select()) + let roles: Vec = load_or_empty( + RoleMember::belonging_to(member) + .inner_join(roles::table) + .select(Role::as_select()) .load(conn) .await, )?; - let mut roles = vec![]; - - for membership in role_memberships { - roles.push(membership.fetch_role(conn).await?); - } - cache_pool - .set_cache_key(format!("{member_uuid}_roles"), roles.clone(), 300) + .set_cache_key(format!("{}_roles", member.uuid), roles.clone(), 300) .await?; Ok(roles) diff --git a/src/schema.rs b/src/schema.rs index 422c3a3..413f3f1 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -126,7 +126,7 @@ diesel::table! { } diesel::table! { - roles (uuid, guild_uuid) { + roles (uuid) { uuid -> Uuid, guild_uuid -> Uuid, #[max_length = 50] @@ -163,6 +163,7 @@ diesel::table! { diesel::joinable!(access_tokens -> refresh_tokens (refresh_token)); diesel::joinable!(access_tokens -> users (uuid)); diesel::joinable!(channel_permissions -> channels (channel_uuid)); +diesel::joinable!(channel_permissions -> roles (role_uuid)); diesel::joinable!(channels -> guilds (guild_uuid)); diesel::joinable!(guild_bans -> guilds (guild_uuid)); diesel::joinable!(guild_bans -> users (user_uuid)); @@ -175,6 +176,7 @@ diesel::joinable!(messages -> channels (channel_uuid)); diesel::joinable!(messages -> users (user_uuid)); diesel::joinable!(refresh_tokens -> users (uuid)); diesel::joinable!(role_members -> guild_members (member_uuid)); +diesel::joinable!(role_members -> roles (role_uuid)); diesel::joinable!(roles -> guilds (guild_uuid)); diesel::allow_tables_to_appear_in_same_query!( From 314b9ee011f5f6bbc5f715664fc16d2fa12a98a0 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Mon, 4 Aug 2025 20:07:46 +0200 Subject: [PATCH 42/48] feat: added online_status column to users table --- migrations/2025-08-04-180235_add_status_to_user/down.sql | 2 ++ migrations/2025-08-04-180235_add_status_to_user/up.sql | 2 ++ src/schema.rs | 1 + 3 files changed, 5 insertions(+) create mode 100644 migrations/2025-08-04-180235_add_status_to_user/down.sql create mode 100644 migrations/2025-08-04-180235_add_status_to_user/up.sql diff --git a/migrations/2025-08-04-180235_add_status_to_user/down.sql b/migrations/2025-08-04-180235_add_status_to_user/down.sql new file mode 100644 index 0000000..163f7f1 --- /dev/null +++ b/migrations/2025-08-04-180235_add_status_to_user/down.sql @@ -0,0 +1,2 @@ +-- This file should undo anything in `up.sql` +ALTER TABLE users DROP COLUMN online_status; diff --git a/migrations/2025-08-04-180235_add_status_to_user/up.sql b/migrations/2025-08-04-180235_add_status_to_user/up.sql new file mode 100644 index 0000000..ac16d77 --- /dev/null +++ b/migrations/2025-08-04-180235_add_status_to_user/up.sql @@ -0,0 +1,2 @@ +-- Your SQL goes here +ALTER TABLE users ADD COLUMN online_status INT2 NOT NULL DEFAULT 0; diff --git a/src/schema.rs b/src/schema.rs index 413f3f1..88f6155 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -157,6 +157,7 @@ diesel::table! { pronouns -> Nullable, #[max_length = 200] about -> Nullable, + online_status -> Int2, } } From 027649a0608fce91f9f995c1fd9398b93897fd1f Mon Sep 17 00:00:00 2001 From: BAaboe Date: Mon, 4 Aug 2025 20:46:49 +0200 Subject: [PATCH 43/48] feat: added online status --- src/api/v1/me/mod.rs | 6 ++++++ src/objects/me.rs | 32 +++++++++++++++++++++++++++++++- src/objects/user.rs | 3 +++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/api/v1/me/mod.rs b/src/api/v1/me/mod.rs index 86d3d9e..9d75d26 100644 --- a/src/api/v1/me/mod.rs +++ b/src/api/v1/me/mod.rs @@ -49,6 +49,7 @@ struct NewInfo { email: Option, pronouns: Option, about: Option, + online_status: Option, } pub async fn update( @@ -110,5 +111,10 @@ pub async fn update( .await?; } + if let Some(online_status) = &json.online_status { + me.set_online_status(&mut conn, &app_state.cache_pool, *online_status) + .await?; + } + Ok(StatusCode::OK) } diff --git a/src/objects/me.rs b/src/objects/me.rs index d03e08b..e76802c 100644 --- a/src/objects/me.rs +++ b/src/objects/me.rs @@ -1,4 +1,4 @@ -use axum::body::Bytes; +use axum::{body::Bytes, http::StatusCode}; use diesel::{ ExpressionMethods, QueryDsl, Queryable, Selectable, SelectableHelper, delete, insert_into, update, @@ -29,6 +29,7 @@ pub struct Me { avatar: Option, pronouns: Option, about: Option, + online_status: i16, pub email: String, pub email_verified: bool, } @@ -277,6 +278,35 @@ impl Me { Ok(()) } + pub async fn set_online_status( + &mut self, + conn: &mut Conn, + cache_pool: &redis::Client, + new_status: i16, + ) -> Result<(), Error> { + if new_status > 4 && new_status < 0 { + return Err(Error::BadRequest("Invalid status code".to_string())); + } + self.online_status = new_status; + + use users::dsl; + update(users::table) + .filter(dsl::uuid.eq(self.uuid)) + .set(dsl::online_status.eq(new_status)) + .execute(conn) + .await?; + + if cache_pool + .get_cache_key::(self.uuid.to_string()) + .await + .is_ok() + { + cache_pool.del_cache_key(self.uuid.to_string()).await? + } + + Ok(()) + } + pub async fn friends_with( &self, conn: &mut Conn, diff --git a/src/objects/user.rs b/src/objects/user.rs index a686c39..e9f638a 100644 --- a/src/objects/user.rs +++ b/src/objects/user.rs @@ -18,6 +18,7 @@ pub struct UserBuilder { avatar: Option, pronouns: Option, about: Option, + online_status: i16, } impl UserBuilder { @@ -29,6 +30,7 @@ impl UserBuilder { avatar: self.avatar, pronouns: self.pronouns, about: self.about, + online_status: self.online_status, friends_since: None, } } @@ -42,6 +44,7 @@ pub struct User { avatar: Option, pronouns: Option, about: Option, + online_status: i16, friends_since: Option>, } From 53451e67c7fe83648cac8170be2f4aafe6306809 Mon Sep 17 00:00:00 2001 From: BAaboe Date: Mon, 4 Aug 2025 20:52:19 +0200 Subject: [PATCH 44/48] fix: 4 is always bigger than 0 --- src/objects/me.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/objects/me.rs b/src/objects/me.rs index e76802c..0c54570 100644 --- a/src/objects/me.rs +++ b/src/objects/me.rs @@ -1,4 +1,4 @@ -use axum::{body::Bytes, http::StatusCode}; +use axum::body::Bytes; use diesel::{ ExpressionMethods, QueryDsl, Queryable, Selectable, SelectableHelper, delete, insert_into, update, @@ -284,7 +284,7 @@ impl Me { cache_pool: &redis::Client, new_status: i16, ) -> Result<(), Error> { - if new_status > 4 && new_status < 0 { + if new_status > 4 || new_status < 0 { return Err(Error::BadRequest("Invalid status code".to_string())); } self.online_status = new_status; From e9cc2a3f0e06e973ff7163b93e286538daea7116 Mon Sep 17 00:00:00 2001 From: Radical Date: Mon, 4 Aug 2025 22:55:22 +0200 Subject: [PATCH 45/48] feat: faster member fetching and pagination --- src/api/v1/guilds/uuid/members.rs | 14 ++- src/objects/member.rs | 190 ++++++++++++++++++++++++++---- src/objects/mod.rs | 16 ++- src/objects/user.rs | 6 +- 4 files changed, 193 insertions(+), 33 deletions(-) diff --git a/src/api/v1/guilds/uuid/members.rs b/src/api/v1/guilds/uuid/members.rs index 56710af..0e1d2bc 100644 --- a/src/api/v1/guilds/uuid/members.rs +++ b/src/api/v1/guilds/uuid/members.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use ::uuid::Uuid; use axum::{ Extension, Json, - extract::{Path, State}, + extract::{Path, Query, State}, http::StatusCode, response::IntoResponse, }; @@ -12,13 +12,14 @@ use crate::{ AppState, api::v1::auth::CurrentUser, error::Error, - objects::{Me, Member}, + objects::{Me, Member, PaginationRequest}, utils::global_checks, }; pub async fn get( State(app_state): State>, Path(guild_uuid): Path, + Query(pagination): Query, Extension(CurrentUser(uuid)): Extension>, ) -> Result { let mut conn = app_state.pool.get().await?; @@ -29,7 +30,14 @@ pub async fn get( let me = Me::get(&mut conn, uuid).await?; - let members = Member::fetch_all(&mut conn, &app_state.cache_pool, &me, guild_uuid).await?; + let members = Member::fetch_page( + &mut conn, + &app_state.cache_pool, + &me, + guild_uuid, + pagination, + ) + .await?; Ok((StatusCode::OK, Json(members))) } diff --git a/src/objects/member.rs b/src/objects/member.rs index a25bf66..59929cd 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -1,6 +1,7 @@ use diesel::{ - ExpressionMethods, Identifiable, Insertable, QueryDsl, Queryable, Selectable, SelectableHelper, - delete, insert_into, + Associations, BoolExpressionMethods, ExpressionMethods, Identifiable, Insertable, JoinOnDsl, + QueryDsl, Queryable, Selectable, SelectableHelper, define_sql_function, delete, insert_into, + sql_types::{Nullable, VarChar}, }; use diesel_async::RunQueryDsl; use serde::{Deserialize, Serialize}; @@ -9,14 +10,21 @@ use uuid::Uuid; use crate::{ Conn, error::Error, - objects::{GuildBan, Me, Permissions, Role}, - schema::{guild_bans, guild_members}, + objects::PaginationRequest, + schema::{friends, guild_bans, guild_members, users}, }; -use super::{User, load_or_empty}; +use super::{ + Friend, Guild, GuildBan, Me, Pagination, Permissions, Role, User, load_or_empty, + user::UserBuilder, +}; -#[derive(Serialize, Queryable, Identifiable, Selectable, Insertable)] +define_sql_function! { fn coalesce(x: Nullable, y: Nullable, z: VarChar) -> Text; } + +#[derive(Serialize, Queryable, Identifiable, Selectable, Insertable, Associations)] #[diesel(table_name = guild_members)] +#[diesel(belongs_to(UserBuilder, foreign_key = user_uuid))] +#[diesel(belongs_to(Guild, foreign_key = guild_uuid))] #[diesel(primary_key(uuid))] #[diesel(check_for_backend(diesel::pg::Pg))] pub struct MemberBuilder { @@ -55,6 +63,32 @@ impl MemberBuilder { }) } + async fn build_with_parts( + &self, + conn: &mut Conn, + cache_pool: &redis::Client, + user_builder: UserBuilder, + friend: Option, + ) -> Result { + let mut user = user_builder.build(); + + if let Some(friend) = friend { + user.friends_since = Some(friend.accepted_at); + } + + let roles = Role::fetch_from_member(conn, cache_pool, self).await?; + + Ok(Member { + uuid: self.uuid, + nickname: self.nickname.clone(), + user_uuid: self.user_uuid, + guild_uuid: self.guild_uuid, + is_owner: self.is_owner, + user, + roles, + }) + } + pub async fn check_permission( &self, conn: &mut Conn, @@ -120,15 +154,35 @@ impl Member { user_uuid: Uuid, guild_uuid: Uuid, ) -> Result { + use friends::dsl as fdsl; use guild_members::dsl; - let member: MemberBuilder = dsl::guild_members - .filter(dsl::user_uuid.eq(user_uuid)) - .filter(dsl::guild_uuid.eq(guild_uuid)) - .select(MemberBuilder::as_select()) - .get_result(conn) - .await?; + let (member, user, friend): (MemberBuilder, UserBuilder, Option) = + dsl::guild_members + .filter(dsl::guild_uuid.eq(guild_uuid)) + .filter(dsl::user_uuid.eq(user_uuid)) + .inner_join(users::table) + .left_join( + fdsl::friends.on(fdsl::uuid1 + .eq(me.uuid) + .and(fdsl::uuid2.eq(users::uuid)) + .or(fdsl::uuid2.eq(me.uuid).and(fdsl::uuid1.eq(users::uuid)))), + ) + .order_by(coalesce( + dsl::nickname, + users::display_name, + users::username, + )) + .select(( + MemberBuilder::as_select(), + UserBuilder::as_select(), + Option::::as_select(), + )) + .get_result(conn) + .await?; - member.build(conn, cache_pool, Some(me)).await + member + .build_with_parts(conn, cache_pool, user, friend) + .await } pub async fn fetch_one_with_member( @@ -137,35 +191,119 @@ impl Member { me: Option<&Me>, uuid: Uuid, ) -> Result { + let member: MemberBuilder; + let user: UserBuilder; + let friend: Option; + use friends::dsl as fdsl; use guild_members::dsl; - let member: MemberBuilder = dsl::guild_members - .filter(dsl::uuid.eq(uuid)) - .select(MemberBuilder::as_select()) - .get_result(conn) - .await?; + if let Some(me) = me { + (member, user, friend) = dsl::guild_members + .filter(dsl::uuid.eq(uuid)) + .inner_join(users::table) + .left_join( + fdsl::friends.on(fdsl::uuid1 + .eq(me.uuid) + .and(fdsl::uuid2.eq(users::uuid)) + .or(fdsl::uuid2.eq(me.uuid).and(fdsl::uuid1.eq(users::uuid)))), + ) + .order_by(coalesce( + dsl::nickname, + users::display_name, + users::username, + )) + .select(( + MemberBuilder::as_select(), + UserBuilder::as_select(), + Option::::as_select(), + )) + .get_result(conn) + .await?; + } else { + (member, user) = dsl::guild_members + .filter(dsl::uuid.eq(uuid)) + .inner_join(users::table) + .order_by(coalesce( + dsl::nickname, + users::display_name, + users::username, + )) + .select((MemberBuilder::as_select(), UserBuilder::as_select())) + .get_result(conn) + .await?; - member.build(conn, cache_pool, me).await + friend = None; + } + + member + .build_with_parts(conn, cache_pool, user, friend) + .await } - pub async fn fetch_all( + pub async fn fetch_page( conn: &mut Conn, cache_pool: &redis::Client, me: &Me, guild_uuid: Uuid, - ) -> Result, Error> { + pagination: PaginationRequest, + ) -> Result, Error> { + let per_page = pagination.per_page.unwrap_or(50); + let page_multiplier: i64 = ((pagination.page - 1) * per_page).into(); + + if !(10..=100).contains(&per_page) { + return Err(Error::BadRequest( + "Invalid amount per page requested".to_string(), + )); + } + + use friends::dsl as fdsl; use guild_members::dsl; - let member_builders: Vec = load_or_empty( + let member_builders: Vec<(MemberBuilder, UserBuilder, Option)> = load_or_empty( dsl::guild_members .filter(dsl::guild_uuid.eq(guild_uuid)) - .select(MemberBuilder::as_select()) + .inner_join(users::table) + .left_join( + fdsl::friends.on(fdsl::uuid1 + .eq(me.uuid) + .and(fdsl::uuid2.eq(users::uuid)) + .or(fdsl::uuid2.eq(me.uuid).and(fdsl::uuid1.eq(users::uuid)))), + ) + .limit(per_page.into()) + .offset(page_multiplier) + .order_by(coalesce( + dsl::nickname, + users::display_name, + users::username, + )) + .select(( + MemberBuilder::as_select(), + UserBuilder::as_select(), + Option::::as_select(), + )) .load(conn) .await, )?; - let mut members = vec![]; + let member_count: i64 = dsl::guild_members + .filter(dsl::guild_uuid.eq(guild_uuid)) + .count() + .get_result(conn) + .await?; - for builder in member_builders { - members.push(builder.build(conn, cache_pool, Some(me)).await?); + let pages = member_count as f32 / per_page as f32; + + let mut members = Pagination:: { + objects: Vec::with_capacity(member_builders.len()), + amount: member_builders.len() as i32, + pages: pages.ceil() as i32, + page: pagination.page, + }; + + for (member, user, friend) in member_builders { + members.objects.push( + member + .build_with_parts(conn, cache_pool, user, friend) + .await?, + ); } Ok(members) diff --git a/src/objects/mod.rs b/src/objects/mod.rs index 3bcce9c..5a013ca 100644 --- a/src/objects/mod.rs +++ b/src/objects/mod.rs @@ -4,7 +4,7 @@ use lettre::{ transport::smtp::authentication::Credentials, }; use log::debug; -use serde::Deserialize; +use serde::{Deserialize, Serialize}; use uuid::Uuid; mod bans; @@ -76,6 +76,20 @@ impl Cookies for Request { } */ +#[derive(Serialize)] +pub struct Pagination { + objects: Vec, + amount: i32, + pages: i32, + page: i32, +} + +#[derive(Deserialize)] +pub struct PaginationRequest { + pub page: i32, + pub per_page: Option, +} + fn load_or_empty( query_result: Result, diesel::result::Error>, ) -> Result, diesel::result::Error> { diff --git a/src/objects/user.rs b/src/objects/user.rs index a686c39..596a785 100644 --- a/src/objects/user.rs +++ b/src/objects/user.rs @@ -21,7 +21,7 @@ pub struct UserBuilder { } impl UserBuilder { - fn build(self) -> User { + pub fn build(self) -> User { User { uuid: self.uuid, username: self.username, @@ -36,13 +36,13 @@ impl UserBuilder { #[derive(Deserialize, Serialize, Clone)] pub struct User { - uuid: Uuid, + pub uuid: Uuid, username: String, display_name: Option, avatar: Option, pronouns: Option, about: Option, - friends_since: Option>, + pub friends_since: Option>, } impl User { From 8d91ec78a615ea834171880061cd6ab107fa060e Mon Sep 17 00:00:00 2001 From: Radical Date: Mon, 4 Aug 2025 22:55:48 +0200 Subject: [PATCH 46/48] refactor: rename fetch_one_with_member Renamed to fetch_one_with_uuid --- src/api/v1/members/uuid/ban.rs | 2 +- src/api/v1/members/uuid/mod.rs | 4 ++-- src/objects/member.rs | 2 +- 3 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 888dca6..e828e69 100644 --- a/src/api/v1/members/uuid/ban.rs +++ b/src/api/v1/members/uuid/ban.rs @@ -34,7 +34,7 @@ pub async fn post( global_checks(&mut conn, &app_state.config, uuid).await?; let member = - Member::fetch_one_with_member(&mut conn, &app_state.cache_pool, None, member_uuid).await?; + Member::fetch_one_with_uuid(&mut conn, &app_state.cache_pool, None, member_uuid).await?; let caller = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; diff --git a/src/api/v1/members/uuid/mod.rs b/src/api/v1/members/uuid/mod.rs index 0832192..5bfd129 100644 --- a/src/api/v1/members/uuid/mod.rs +++ b/src/api/v1/members/uuid/mod.rs @@ -32,7 +32,7 @@ pub async fn get( let me = Me::get(&mut conn, uuid).await?; let member = - Member::fetch_one_with_member(&mut conn, &app_state.cache_pool, Some(&me), member_uuid) + Member::fetch_one_with_uuid(&mut conn, &app_state.cache_pool, Some(&me), member_uuid) .await?; Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; @@ -51,7 +51,7 @@ pub async fn delete( let me = Me::get(&mut conn, uuid).await?; let member = - Member::fetch_one_with_member(&mut conn, &app_state.cache_pool, Some(&me), member_uuid) + Member::fetch_one_with_uuid(&mut conn, &app_state.cache_pool, 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 59929cd..0bba11b 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -185,7 +185,7 @@ impl Member { .await } - pub async fn fetch_one_with_member( + pub async fn fetch_one_with_uuid( conn: &mut Conn, cache_pool: &redis::Client, me: Option<&Me>, From 642dbe5270cb72e418e77f9d784c6490daa41556 Mon Sep 17 00:00:00 2001 From: Radical Date: Tue, 5 Aug 2025 00:02:21 +0200 Subject: [PATCH 47/48] fix: remove order_by on single fetches --- src/objects/member.rs | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/objects/member.rs b/src/objects/member.rs index 0bba11b..20109cf 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -167,11 +167,6 @@ impl Member { .and(fdsl::uuid2.eq(users::uuid)) .or(fdsl::uuid2.eq(me.uuid).and(fdsl::uuid1.eq(users::uuid)))), ) - .order_by(coalesce( - dsl::nickname, - users::display_name, - users::username, - )) .select(( MemberBuilder::as_select(), UserBuilder::as_select(), @@ -206,11 +201,6 @@ impl Member { .and(fdsl::uuid2.eq(users::uuid)) .or(fdsl::uuid2.eq(me.uuid).and(fdsl::uuid1.eq(users::uuid)))), ) - .order_by(coalesce( - dsl::nickname, - users::display_name, - users::username, - )) .select(( MemberBuilder::as_select(), UserBuilder::as_select(), @@ -222,11 +212,6 @@ impl Member { (member, user) = dsl::guild_members .filter(dsl::uuid.eq(uuid)) .inner_join(users::table) - .order_by(coalesce( - dsl::nickname, - users::display_name, - users::username, - )) .select((MemberBuilder::as_select(), UserBuilder::as_select())) .get_result(conn) .await?; From ac1678bfa8d98d757627f8b097684ee16aa8c07b Mon Sep 17 00:00:00 2001 From: Radical Date: Tue, 5 Aug 2025 00:02:30 +0200 Subject: [PATCH 48/48] fix: use dedicated function for member count --- src/objects/member.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/objects/member.rs b/src/objects/member.rs index 20109cf..1247ea2 100644 --- a/src/objects/member.rs +++ b/src/objects/member.rs @@ -268,13 +268,7 @@ impl Member { .await, )?; - let member_count: i64 = dsl::guild_members - .filter(dsl::guild_uuid.eq(guild_uuid)) - .count() - .get_result(conn) - .await?; - - let pages = member_count as f32 / per_page as f32; + let pages = Member::count(conn, guild_uuid).await? as f32 / per_page as f32; let mut members = Pagination:: { objects: Vec::with_capacity(member_builders.len()),