gorb/backend
5
0
Fork 1
Code Issues 14 Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: let you pass None to fetch_one_with_member for me

Browse source
This commit is contained in:
BAaboe 2025-07-22 23:18:21 +02:00
parent ade45780fa
commit f175c19325
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/v1/members/uuid/mod.rs
View file

@ -1,5 +1,7 @@
//! `/api/v1/members/{uuid}` Member specific endpoints //! `/api/v1/members/{uuid}` Member specific endpoints
pub mod ban;
use std::sync::Arc; use std::sync::Arc;
use crate::{ use crate::{
@ -29,7 +31,7 @@ pub async fn get(
let me = Me::get(&mut conn, uuid).await?; let me = Me::get(&mut conn, uuid).await?;
let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?; let member = Member::fetch_one_with_member(&app_state, Some(&me), member_uuid).await?;
Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
Ok((StatusCode::OK, Json(member))) Ok((StatusCode::OK, Json(member)))
@ -46,7 +48,7 @@ pub async fn delete(
let me = Me::get(&mut conn, uuid).await?; let me = Me::get(&mut conn, uuid).await?;
let member = Member::fetch_one_with_member(&app_state, &me, member_uuid).await?; let member = Member::fetch_one_with_member(&app_state, Some(&me), member_uuid).await?;
let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;

4
src/objects/member.rs
View file

@ -122,7 +122,7 @@ impl Member {
pub async fn fetch_one_with_member( pub async fn fetch_one_with_member(
app_state: &AppState, app_state: &AppState,
me: &Me, me: Option<&Me>,
uuid: Uuid, uuid: Uuid,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
let mut conn = app_state.pool.get().await?; let mut conn = app_state.pool.get().await?;
@ -134,7 +134,7 @@ impl Member {
.get_result(&mut conn) .get_result(&mut conn)
.await?; .await?;
member.build(app_state, Some(me)).await member.build(app_state, me).await
} }
pub async fn fetch_all( pub async fn fetch_all(