jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

feat: move all json and validate to new utils

Browse Source
This commit is contained in:
Zomatree
2025-07-01 21:42:45 +01:00
parent 3d6f39a0eb
commit cf4fe859bf
83 changed files with 371 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/delta/src/routes/channels/channel_edit.rs
View File

@@ -5,8 +5,8 @@ use revolt_database::{
use revolt_models::v0;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use validator::Validate;
use rocket::State;
use crate::util::json::{Json, Validate};
/// # Edit Channel
///
@@ -18,14 +18,9 @@ pub async fn edit(
amqp: &State<AMQP>,
user: User,
target: Reference<'_>,
data: Json<v0::DataEditChannel>,
data: Validate<Json<v0::DataEditChannel>>,
) -> Result<Json<v0::Channel>> {
let data = data.into_inner();
data.validate().map_err(|error| {
create_error!(FailedValidation {
error: error.to_string()
})
})?;
let data = data.into_inner().into_inner();
let mut channel = target.as_channel(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);

3
crates/delta/src/routes/channels/channel_fetch.rs
View File

@@ -6,7 +6,8 @@ use revolt_database::{
use revolt_models::v0;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::Result;
use rocket::{serde::json::Json, State};
use rocket::State;
use crate::util::json::Json;
/// # Fetch Channel
///

12
crates/delta/src/routes/channels/group_create.rs
View File

@@ -2,9 +2,8 @@ use revolt_database::{Channel, Database, RelationshipStatus, User};
use revolt_models::v0;
use revolt_result::{create_error, Result};
use rocket::serde::json::Json;
use crate::util::json::{Json, Validate};
use rocket::State;
use validator::Validate;
/// # Create Group
///
@@ -14,18 +13,13 @@ use validator::Validate;
pub async fn create_group(
db: &State<Database>,
user: User,
data: Json<v0::DataCreateGroup>,
data: Validate<Json<v0::DataCreateGroup>>,
) -> Result<Json<v0::Channel>> {
if user.bot.is_some() {
return Err(create_error!(IsBot));
}
let data = data.into_inner();
data.validate().map_err(|error| {
create_error!(FailedValidation {
error: error.to_string()
})
})?;
let data = data.into_inner().into_inner();
for target in &data.users {
match user.relationship_with(target) {

3
crates/delta/src/routes/channels/invite_create.rs
View File

@@ -6,7 +6,8 @@ use revolt_models::v0;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use rocket::State;
use crate::util::json::Json;
/// # Create Invite
///

3
crates/delta/src/routes/channels/members_fetch.rs
View File

@@ -5,7 +5,8 @@ use revolt_database::{
use revolt_models::v0;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use rocket::State;
use crate::util::json::Json;
/// # Fetch Group Members
///

13
crates/delta/src/routes/channels/message_bulk_delete.rs
View File

@@ -6,9 +6,9 @@ use revolt_database::{
use revolt_models::v0;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use rocket::State;
use rocket_empty::EmptyResponse;
use validator::Validate;
use crate::util::json::{Json, Validate};
/// # Bulk Delete Messages
///
@@ -23,14 +23,9 @@ pub async fn bulk_delete_messages(
db: &State<Database>,
user: User,
target: Reference<'_>,
options: Json<v0::OptionsBulkDelete>,
options: Validate<Json<v0::OptionsBulkDelete>>,
) -> Result<EmptyResponse> {
let options = options.into_inner();
options.validate().map_err(|error| {
create_error!(FailedValidation {
error: error.to_string()
})
})?;
let options = options.into_inner().into_inner();
for id in &options.ids {
if ulid::Ulid::from_string(id)

13
crates/delta/src/routes/channels/message_edit.rs
View File

@@ -7,8 +7,8 @@ use revolt_database::{
use revolt_models::v0::{self, Embed};
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use validator::Validate;
use rocket::State;
use crate::util::json::{Json, Validate};
/// # Edit Message
///
@@ -20,14 +20,9 @@ pub async fn edit(
user: User,
target: Reference<'_>,
msg: Reference<'_>,
edit: Json<v0::DataEditMessage>,
edit: Validate<Json<v0::DataEditMessage>>,
) -> Result<Json<v0::Message>> {
let edit = edit.into_inner();
edit.validate().map_err(|error| {
create_error!(FailedValidation {
error: error.to_string()
})
})?;
let edit = edit.into_inner().into_inner();
Message::validate_sum(
&edit.content,

3
crates/delta/src/routes/channels/message_fetch.rs
View File

@@ -5,7 +5,8 @@ use revolt_database::{
use revolt_models::v0;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use rocket::State;
use crate::util::json::Json;
/// # Fetch Message
///

14
crates/delta/src/routes/channels/message_query.rs
View File

@@ -5,8 +5,8 @@ use revolt_database::{
use revolt_models::v0::{self, MessageSort};
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use validator::Validate;
use rocket::State;
use crate::util::json::{Json, Validate};
/// # Fetch Messages
///
@@ -17,14 +17,8 @@ pub async fn query(
db: &State<Database>,
user: User,
target: Reference<'_>,
options: v0::OptionsQueryMessages,
options: Validate<v0::OptionsQueryMessages>,
) -> Result<Json<v0::BulkMessageResponse>> {
options.validate().map_err(|error| {
create_error!(FailedValidation {
error: error.to_string()
})
})?;
if let Some(MessageSort::Relevance) = options.sort {
return Err(create_error!(InvalidOperation));
}
@@ -43,7 +37,7 @@ pub async fn query(
sort,
nearby,
include_users,
} = options;
} = options.into_inner();
Message::fetch_with_users(
db,

13
crates/delta/src/routes/channels/message_search.rs
View File

@@ -5,8 +5,8 @@ use revolt_database::{
use revolt_models::v0;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use validator::Validate;
use rocket::State;
use crate::util::json::{Json, Validate};
/// # Search for Messages
///
@@ -17,18 +17,13 @@ pub async fn search(
db: &State<Database>,
user: User,
target: Reference<'_>,
options: Json<v0::DataMessageSearch>,
options: Validate<Json<v0::DataMessageSearch>>,
) -> Result<Json<v0::BulkMessageResponse>> {
if user.bot.is_some() {
return Err(create_error!(IsBot));
}
let options = options.into_inner();
options.validate().map_err(|error| {
create_error!(FailedValidation {
error: error.to_string()
})
})?;
let options = options.into_inner().into_inner();
if options.query.is_some() && options.pinned.is_some() {
return Err(create_error!(InvalidOperation))

5
crates/delta/src/routes/channels/message_send.rs
View File

@@ -7,10 +7,9 @@ use revolt_database::{Interactions, Message, AMQP};
use revolt_models::v0;
use revolt_permissions::PermissionQuery;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use revolt_result::Result;
use crate::util::json::{Json, Validate};
use rocket::State;
// use validator::Validate;
/// # Send Message
///
@@ -25,7 +24,7 @@ pub async fn message_send(
data: Validate<Json<v0::DataMessageSend>>,
idempotency: IdempotencyKey,
) -> Result<Json<v0::Message>> {
let data = data.into_inner();
let data = data.into_inner().into_inner();
// Ensure we have permissions to send a message
let channel = target.as_channel(db).await?;

3
crates/delta/src/routes/channels/permissions_set.rs
View File

@@ -5,7 +5,8 @@ use revolt_database::{
use revolt_models::v0;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission, Override};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use rocket::State;
use crate::util::json::Json;
/// # Set Role Permission
///

3
crates/delta/src/routes/channels/permissions_set_default.rs
View File

@@ -5,7 +5,8 @@ use revolt_database::{
use revolt_models::v0::{self, DataDefaultChannelPermissions};
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use rocket::State;
use crate::util::json::Json;
/// # Set Default Permission
///

3
crates/delta/src/routes/channels/voice_join.rs
View File

@@ -6,7 +6,8 @@ use revolt_database::{
use revolt_models::v0;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use rocket::State;
use crate::util::json::Json;
/// # Join Call
///

13
crates/delta/src/routes/channels/webhook_create.rs
View File

@@ -7,9 +7,9 @@ use revolt_permissions::{
calculate_channel_permissions, ChannelPermission, DEFAULT_WEBHOOK_PERMISSIONS,
};
use revolt_result::{create_error, Result};
use rocket::{serde::json::Json, State};
use rocket::State;
use crate::util::json::{Json, Validate};
use ulid::Ulid;
use validator::Validate;
/// # Creates a webhook
///
@@ -20,14 +20,9 @@ pub async fn create_webhook(
db: &State<Database>,
user: User,
target: Reference<'_>,
data: Json<v0::CreateWebhookBody>,
data: Validate<Json<v0::CreateWebhookBody>>,
) -> Result<Json<v0::Webhook>> {
let data = data.into_inner();
data.validate().map_err(|error| {
create_error!(FailedValidation {
error: error.to_string()
})
})?;
let data = data.into_inner().into_inner();
let channel = target.as_channel(db).await?;

3
crates/delta/src/routes/channels/webhook_fetch_all.rs
View File

@@ -5,7 +5,8 @@ use revolt_database::{
use revolt_models::v0::Webhook;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::Result;
use rocket::{serde::json::Json, State};
use rocket::State;
use crate::util::json::Json;
/// # Gets all webhooks
///