refactor: remove quark/web

crates/delta/src/routes/channels/message_send.rs

@@ -1,8 +1,8 @@
+use revolt_database::util::idempotency::IdempotencyKey;
 use revolt_quark::{
     models::{message::DataMessageSend, Message, User},
     perms,
     types::push::MessageAuthor,
-    web::idempotency::IdempotencyKey,
     Db, Error, Permission, Ref, Result,
 };
 

crates/delta/src/routes/customisation/emoji_create.rs

@@ -1,3 +1,5 @@
+use once_cell::sync::Lazy;
+use regex::Regex;
 use revolt_quark::models::emoji::EmojiParent;
 use revolt_quark::models::{Emoji, File, User};
 use revolt_quark::variables::delta::MAX_EMOJI_COUNT;
@@ -5,10 +7,13 @@ use revolt_quark::{perms, Db, Error, Permission, Result};
 use serde::Deserialize;
 use validator::Validate;
 
-use crate::util::regex::RE_EMOJI;
-
 use rocket::serde::json::Json;
 
+/// Regex for valid emoji names
+///
+/// Alphanumeric and underscores
+pub static RE_EMOJI: Lazy<Regex> = Lazy::new(|| Regex::new(r"^[a-z0-9_]+$").unwrap());
+
 /// # Emoji Data
 #[derive(Validate, Deserialize, JsonSchema)]
 pub struct DataCreateEmoji {
@@ -57,7 +62,9 @@ pub async fn create_emoji(
             // ! FIXME: hardcoded upper limit
             let emojis = db.fetch_emoji_by_parent_id(&server.id).await?;
             if emojis.len() > *MAX_EMOJI_COUNT {
-                return Err(Error::TooManyEmoji { max: *MAX_EMOJI_COUNT });
+                return Err(Error::TooManyEmoji {
+                    max: *MAX_EMOJI_COUNT,
+                });
             }
         }
         EmojiParent::Detached => return Err(Error::InvalidOperation),

crates/delta/src/routes/onboard/complete.rs

@@ -1,4 +1,5 @@
-use crate::util::regex::RE_USERNAME;
+use once_cell::sync::Lazy;
+use regex::Regex;
 use revolt_database::{Database, User};
 use revolt_models::v0;
 use revolt_quark::authifier::models::Session;
@@ -8,6 +9,12 @@ use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
+/// Regex for valid usernames
+///
+/// Block zero width space
+/// Block lookalike characters
+pub static RE_USERNAME: Lazy<Regex> = Lazy::new(|| Regex::new(r"^(\p{L}|[\d_.-])+$").unwrap());
+
 /// # New User Data
 #[derive(Validate, Serialize, Deserialize, JsonSchema)]
 pub struct DataOnboard {

crates/delta/src/routes/users/change_username.rs

@@ -1,9 +1,16 @@
-use crate::util::regex::RE_USERNAME;
+use once_cell::sync::Lazy;
+use regex::Regex;
 use revolt_quark::{authifier::models::Account, models::User, Database, Error, Result};
 use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
+/// Regex for valid usernames
+///
+/// Block zero width space
+/// Block lookalike characters
+pub static RE_USERNAME: Lazy<Regex> = Lazy::new(|| Regex::new(r"^(\p{L}|[\d_.-])+$").unwrap());
+
 /// # Username Information
 #[derive(Validate, Serialize, Deserialize, JsonSchema)]
 pub struct DataChangeUsername {

crates/delta/src/routes/users/edit_user.rs

@@ -1,3 +1,5 @@
+use once_cell::sync::Lazy;
+use regex::Regex;
 use revolt_quark::models::user::{FieldsUser, PartialUser, User};
 use revolt_quark::models::File;
 use revolt_quark::{Database, Error, Ref, Result};
@@ -8,7 +10,11 @@ use rocket::State;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-use crate::util::regex::RE_DISPLAY_NAME;
+/// Regex for valid display names
+///
+/// Block zero width space
+/// Block newline and carriage return
+pub static RE_DISPLAY_NAME: Lazy<Regex> = Lazy::new(|| Regex::new(r"^[^\u200B\n\r]+$").unwrap());
 
 /// # Profile Data
 #[derive(Validate, Serialize, Deserialize, Debug, JsonSchema)]

crates/delta/src/routes/webhooks/webhook_execute.rs

@@ -1,8 +1,10 @@
-use revolt_database::{util::reference::Reference, Database};
+use revolt_database::{
+    util::{idempotency::IdempotencyKey, reference::Reference},
+    Database,
+};
 use revolt_quark::{
     models::message::{DataMessageSend, Message},
     types::push::MessageAuthor,
-    web::idempotency::IdempotencyKey,
     Db, Error, Result,
 };
 use rocket::{serde::json::Json, State};