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

style: updated to use the new ban object

Browse source
This commit is contained in:
BAaboe 2025-07-24 02:13:53 +02:00
parent c2b5f6568f
commit ba2442e786
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/objects/member.rs
View file

@ -6,11 +6,7 @@ use serde::{Deserialize, Serialize};
use uuid::Uuid; use uuid::Uuid;
use crate::{ use crate::{
AppState, Conn, error::Error, objects::{GuildBan, Me, Permissions, Role}, schema::{guild_bans, guild_members}, AppState, Conn
error::Error,
objects::{Me, Permissions, Role},
schema::guild_bans,
schema::guild_members,
}; };
use super::{User, load_or_empty}; use super::{User, load_or_empty};
@ -169,15 +165,10 @@ impl Member {
) -> Result<Self, Error> { ) -> Result<Self, Error> {
let mut conn = app_state.pool.get().await?; let mut conn = app_state.pool.get().await?;
use guild_bans::dsl; let banned = GuildBan::fetch_one(&mut conn, guild_uuid, user_uuid).await;
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 { match banned {
Ok(_) => Err(Error::Forbidden("User banned".to_string())), 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()), Err(e) => Err(e.into()),
}?; }?;