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

deadpool, diesel and errors! #16

Merged
radical merged 17 commits from deadpool-diesel into main 2025-05-23 11:07:21 +00:00
Conversation 0 Commits 17 Files changed 49 +14 -49
1 changed files with 14 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 49e08af3d9 - Show all commits

63
src/api/v1/invites/id.rs
View file

@ -1,6 +1,7 @@
use actix_web::{Error, HttpRequest, HttpResponse, get, post, web}; use actix_web::{HttpRequest, HttpResponse, get, post, web};
use crate::{ use crate::{
error::Error,
Data, Data,
api::v1::auth::check_access_token, api::v1::auth::check_access_token,
structs::{Guild, Invite, Member}, structs::{Guild, Invite, Member},
@ -15,29 +16,17 @@ pub async fn get(
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
let headers = req.headers(); let headers = req.headers();
let auth_header = get_auth_header(headers); let auth_header = get_auth_header(headers)?;
if let Err(error) = auth_header { let mut conn = data.pool.get().await?;
return Ok(error);
} check_access_token(auth_header, &mut conn).await?;
let invite_id = path.into_inner().0; let invite_id = path.into_inner().0;
let result = Invite::fetch_one(&data.pool, invite_id).await; let invite = Invite::fetch_one(&mut conn, invite_id).await?;
if let Err(error) = result { let guild = Guild::fetch_one(&mut conn, invite.guild_uuid).await?;
return Ok(error);
}
let invite = result.unwrap();
let guild_result = Guild::fetch_one(&data.pool, invite.guild_uuid).await;
if let Err(error) = guild_result {
return Ok(error);
}
let guild = guild_result.unwrap();
Ok(HttpResponse::Ok().json(guild)) Ok(HttpResponse::Ok().json(guild))
} }
@ -50,43 +39,19 @@ pub async fn join(
) -> Result<HttpResponse, Error> { ) -> Result<HttpResponse, Error> {
let headers = req.headers(); let headers = req.headers();
let auth_header = get_auth_header(headers); let auth_header = get_auth_header(headers)?;
if let Err(error) = auth_header {
return Ok(error);
}
let invite_id = path.into_inner().0; let invite_id = path.into_inner().0;
let authorized = check_access_token(auth_header.unwrap(), &data.pool).await; let mut conn = data.pool.get().await?;
if let Err(error) = authorized { let uuid = check_access_token(auth_header, &mut conn).await?;
return Ok(error);
}
let uuid = authorized.unwrap(); let invite = Invite::fetch_one(&mut conn, invite_id).await?;
let result = Invite::fetch_one(&data.pool, invite_id).await; let guild = Guild::fetch_one(&mut conn, invite.guild_uuid).await?;
if let Err(error) = result { Member::new(&mut conn, uuid, guild.uuid).await?;
return Ok(error);
}
let invite = result.unwrap();
let guild_result = Guild::fetch_one(&data.pool, invite.guild_uuid).await;
if let Err(error) = guild_result {
return Ok(error);
}
let guild = guild_result.unwrap();
let member = Member::new(&data.pool, uuid, guild.uuid).await;
if let Err(error) = member {
return Ok(error);
}
Ok(HttpResponse::Ok().json(guild)) Ok(HttpResponse::Ok().json(guild))
} }