From 8d91ec78a615ea834171880061cd6ab107fa060e Mon Sep 17 00:00:00 2001 From: Radical Date: Mon, 4 Aug 2025 22:55:48 +0200 Subject: [PATCH] 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>,