HMC/handmade-revolt-backend
6
0
Fork 0
forked from jmug/stoatchat
Code Pull Requests Actions Packages Releases 2 Activity

fix(core/models): validator feature flag not properly gatekept

Browse Source
This commit is contained in:
Paul Makles
2023-10-20 18:16:12 +01:00
committed by Paul Makles
parent 29dcf714f2
commit 96d90215d2
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/core/models/src/v0/channel_webhooks.rs
View File

@@ -1,3 +1,4 @@
#[cfg(feature = "validator")]
use validator::Validate; use validator::Validate;
use super::File; use super::File;
@@ -80,7 +81,7 @@ auto_derived!(
} }
/// Information for the webhook /// Information for the webhook
#[derive(Validate)] #[cfg_attr(feature = "validator", derive(Validate))]
pub struct CreateWebhookBody { pub struct CreateWebhookBody {
#[validate(length(min = 1, max = 32))] #[validate(length(min = 1, max = 32))]
pub name: String, pub name: String,

4
crates/core/models/src/v0/emojis.rs
View File

@@ -1,5 +1,7 @@
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
#[cfg(feature = "validator")]
use validator::Validate; use validator::Validate;
/// Regex for valid emoji names /// Regex for valid emoji names
@@ -41,7 +43,7 @@ auto_derived!(
} }
/// Create a new emoji /// Create a new emoji
#[derive(Validate)] #[cfg_attr(feature = "validator", derive(Validate))]
pub struct DataCreateEmoji { pub struct DataCreateEmoji {
/// Server name /// Server name
#[validate(length(min = 1, max = 32), regex = "RE_EMOJI")] #[validate(length(min = 1, max = 32), regex = "RE_EMOJI")]

9
crates/core/models/src/v0/messages.rs
View File

@@ -6,6 +6,8 @@ use std::{
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
use revolt_config::config; use revolt_config::config;
#[cfg(feature = "validator")]
use validator::Validate; use validator::Validate;
use iso8601_timestamp::Timestamp; use iso8601_timestamp::Timestamp;
@@ -94,7 +96,7 @@ auto_derived!(
} }
/// Name and / or avatar override information /// Name and / or avatar override information
#[derive(Validate)] #[cfg_attr(feature = "validator", derive(Validate))]
pub struct Masquerade { pub struct Masquerade {
// FIXME: missing validation // FIXME: missing validation
/// Replace the display name shown on this message /// Replace the display name shown on this message
@@ -164,7 +166,8 @@ auto_derived!(
} }
/// Representation of a text embed before it is sent. /// Representation of a text embed before it is sent.
#[derive(Default, Validate)] #[derive(Default)]
#[cfg_attr(feature = "validator", derive(Validate))]
pub struct SendableEmbed { pub struct SendableEmbed {
#[validate(length(min = 1, max = 128))] #[validate(length(min = 1, max = 128))]
pub icon_url: Option<String>, pub icon_url: Option<String>,
@@ -188,7 +191,7 @@ auto_derived!(
} }
/// Message to send /// Message to send
#[derive(Validate)] #[cfg_attr(feature = "validator", derive(Validate))]
pub struct DataMessageSend { pub struct DataMessageSend {
/// Unique token to prevent duplicate message sending /// Unique token to prevent duplicate message sending
/// ///