From 96d90215d23487cde36e50646ebf7b6e62172351 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Fri, 20 Oct 2023 18:16:12 +0100
Subject: [PATCH] fix(core/models): validator feature flag not properly
 gatekept

---
 crates/core/models/src/v0/channel_webhooks.rs | 3 ++-
 crates/core/models/src/v0/emojis.rs           | 4 +++-
 crates/core/models/src/v0/messages.rs         | 9 ++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/crates/core/models/src/v0/channel_webhooks.rs b/crates/core/models/src/v0/channel_webhooks.rs
index dc1fd588..77bbd961 100644
--- a/crates/core/models/src/v0/channel_webhooks.rs
+++ b/crates/core/models/src/v0/channel_webhooks.rs
@@ -1,3 +1,4 @@
+#[cfg(feature = "validator")]
 use validator::Validate;
 
 use super::File;
@@ -80,7 +81,7 @@ auto_derived!(
     }
 
     /// Information for the webhook
-    #[derive(Validate)]
+    #[cfg_attr(feature = "validator", derive(Validate))]
     pub struct CreateWebhookBody {
         #[validate(length(min = 1, max = 32))]
         pub name: String,
diff --git a/crates/core/models/src/v0/emojis.rs b/crates/core/models/src/v0/emojis.rs
index 07451bd6..2d7c015e 100644
--- a/crates/core/models/src/v0/emojis.rs
+++ b/crates/core/models/src/v0/emojis.rs
@@ -1,5 +1,7 @@
 use once_cell::sync::Lazy;
 use regex::Regex;
+
+#[cfg(feature = "validator")]
 use validator::Validate;
 
 /// Regex for valid emoji names
@@ -41,7 +43,7 @@ auto_derived!(
     }
 
     /// Create a new emoji
-    #[derive(Validate)]
+    #[cfg_attr(feature = "validator", derive(Validate))]
     pub struct DataCreateEmoji {
         /// Server name
         #[validate(length(min = 1, max = 32), regex = "RE_EMOJI")]
diff --git a/crates/core/models/src/v0/messages.rs b/crates/core/models/src/v0/messages.rs
index 6676147f..435c3bc4 100644
--- a/crates/core/models/src/v0/messages.rs
+++ b/crates/core/models/src/v0/messages.rs
@@ -6,6 +6,8 @@ use std::{
 use once_cell::sync::Lazy;
 use regex::Regex;
 use revolt_config::config;
+
+#[cfg(feature = "validator")]
 use validator::Validate;
 
 use iso8601_timestamp::Timestamp;
@@ -94,7 +96,7 @@ auto_derived!(
     }
 
     /// Name and / or avatar override information
-    #[derive(Validate)]
+    #[cfg_attr(feature = "validator", derive(Validate))]
     pub struct Masquerade {
         // FIXME: missing validation
         /// Replace the display name shown on this message
@@ -164,7 +166,8 @@ auto_derived!(
     }
 
     /// Representation of a text embed before it is sent.
-    #[derive(Default, Validate)]
+    #[derive(Default)]
+    #[cfg_attr(feature = "validator", derive(Validate))]
     pub struct SendableEmbed {
         #[validate(length(min = 1, max = 128))]
         pub icon_url: Option<String>,
@@ -188,7 +191,7 @@ auto_derived!(
     }
 
     /// Message to send
-    #[derive(Validate)]
+    #[cfg_attr(feature = "validator", derive(Validate))]
     pub struct DataMessageSend {
         /// Unique token to prevent duplicate message sending
         ///