style: move structs to objects and split into several files for readability

This commit is contained in:
Radical 2025-06-02 00:28:48 +02:00
parent 08cb70ce18
commit 7021c80f02
32 changed files with 1591 additions and 1474 deletions

View file

@ -4,7 +4,7 @@ use actix_web::{HttpResponse, get, post, web};
use chrono::{Duration, Utc};
use serde::Deserialize;
use crate::{Data, error::Error, structs::PasswordResetToken};
use crate::{Data, error::Error, objects::PasswordResetToken};
#[derive(Deserialize)]
struct Query {

View file

@ -8,7 +8,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{EmailToken, Me},
objects::{EmailToken, Me},
utils::get_auth_header,
};

View file

@ -4,7 +4,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{Channel, Member},
objects::{Channel, Member},
utils::{get_auth_header, global_checks},
};
use ::uuid::Uuid;

View file

@ -7,12 +7,12 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{Channel, Member},
objects::{Channel, Member},
utils::{get_auth_header, global_checks},
};
use actix_web::{delete, get, patch, web, HttpRequest, HttpResponse};
use uuid::Uuid;
use actix_web::{HttpRequest, HttpResponse, delete, get, patch, web};
use serde::Deserialize;
use uuid::Uuid;
#[get("/{uuid}")]
pub async fn get(
@ -88,7 +88,7 @@ struct NewInfo {
/// "is_above": "398f6d7b-752c-4348-9771-fe6024adbfb1"
/// });
/// ```
///
///
/// ### Response Example
/// ```
/// json!({
@ -132,13 +132,16 @@ pub async fn patch(
}
if let Some(new_description) = &new_info.description {
channel.set_description(&data, new_description.to_string()).await?;
channel
.set_description(&data, new_description.to_string())
.await?;
}
if let Some(new_is_above) = &new_info.is_above {
channel.set_description(&data, new_is_above.to_string()).await?;
channel
.set_description(&data, new_is_above.to_string())
.await?;
}
Ok(HttpResponse::Ok().json(channel))
}

View file

@ -10,7 +10,7 @@ use uuid::Uuid;
use crate::{
Data,
api::v1::auth::check_access_token,
structs::{Channel, Member},
objects::{Channel, Member},
utils::{get_ws_protocol_header, global_checks},
};

View file

@ -9,7 +9,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{Guild, StartAmountQuery},
objects::{Guild, StartAmountQuery},
utils::{get_auth_header, global_checks},
};

View file

@ -2,7 +2,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{Channel, Member},
objects::{Channel, Member},
utils::{get_auth_header, global_checks, order_by_is_above},
};
use ::uuid::Uuid;

View file

@ -8,7 +8,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{Guild, Member},
objects::{Guild, Member},
utils::{get_auth_header, global_checks},
};

View file

@ -6,7 +6,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{Guild, Member},
objects::{Guild, Member},
utils::{get_auth_header, global_checks},
};

View file

@ -2,7 +2,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::Member,
objects::Member,
utils::{get_auth_header, global_checks},
};
use ::uuid::Uuid;

View file

@ -13,7 +13,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{Guild, Member},
objects::{Guild, Member},
utils::{get_auth_header, global_checks},
};

View file

@ -6,7 +6,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{Member, Role},
objects::{Member, Role},
utils::{get_auth_header, global_checks, order_by_is_above},
};

View file

@ -2,7 +2,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{Member, Role},
objects::{Member, Role},
utils::{get_auth_header, global_checks},
};
use ::uuid::Uuid;

View file

@ -4,7 +4,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{Guild, Invite, Member},
objects::{Guild, Invite, Member},
utils::{get_auth_header, global_checks},
};

View file

@ -6,7 +6,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::Me,
objects::Me,
utils::{get_auth_header, global_checks},
};

View file

@ -6,7 +6,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::Me,
objects::Me,
utils::{get_auth_header, global_checks},
};
@ -65,10 +65,7 @@ pub async fn update(
let uuid = check_access_token(auth_header, &mut conn).await?;
if form.avatar.is_some()
|| form.json.username.is_some()
|| form.json.display_name.is_some()
{
if form.avatar.is_some() || form.json.username.is_some() || form.json.display_name.is_some() {
global_checks(&data, uuid).await?;
}
@ -79,12 +76,8 @@ pub async fn update(
let byte_slice: &[u8] = &bytes;
me.set_avatar(
&data,
data.config.bunny.cdn_url.clone(),
byte_slice.into(),
)
.await?;
me.set_avatar(&data, data.config.bunny.cdn_url.clone(), byte_slice.into())
.await?;
}
if let Some(username) = &form.json.username {

View file

@ -6,7 +6,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::{StartAmountQuery, User},
objects::{StartAmountQuery, User},
utils::{get_auth_header, global_checks},
};

View file

@ -7,7 +7,7 @@ use crate::{
Data,
api::v1::auth::check_access_token,
error::Error,
structs::User,
objects::User,
utils::{get_auth_header, global_checks},
};