Merge remote-tracking branch 'revoltchat/master' into webhooks

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

@@ -1,5 +1,6 @@
 use revolt_quark::models::emoji::EmojiParent;
 use revolt_quark::models::{Emoji, File, User};
+use revolt_quark::variables::delta::MAX_EMOJI_COUNT;
 use revolt_quark::{perms, Db, Error, Permission, Result};
 use serde::Deserialize;
 use validator::Validate;
@@ -55,8 +56,8 @@ pub async fn create_emoji(
             // Check that there are no more than 100 emoji
             // ! FIXME: hardcoded upper limit
             let emojis = db.fetch_emoji_by_parent_id(&server.id).await?;
-            if emojis.len() > 99 {
-                return Err(Error::TooManyEmoji);
+            if emojis.len() > *MAX_EMOJI_COUNT {
+                return Err(Error::TooManyEmoji { max: *MAX_EMOJI_COUNT });
             }
         }
         EmojiParent::Detached => return Err(Error::InvalidOperation),

crates/delta/src/routes/servers/channel_create.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use revolt_quark::{
     models::{server::PartialServer, Channel, User},
-    perms, Db, Error, Permission, Ref, Result,
+    perms, Db, Error, Permission, Ref, Result, variables::delta::MAX_CHANNEL_COUNT,
 };
 
 use rocket::serde::json::Json;
@@ -58,6 +58,10 @@ pub async fn req(
         .throw_permission(db, Permission::ManageChannel)
         .await?;
 
+    if server.channels.len() > *MAX_CHANNEL_COUNT {
+        return Err(Error::TooManyChannels { max: *MAX_CHANNEL_COUNT })
+    };
+
     let id = Ulid::new().to_string();
     let mut channels = server.channels.clone();
     channels.push(id.clone());

crates/delta/src/routes/servers/roles_create.rs

@@ -1,6 +1,6 @@
 use revolt_quark::{
     models::{server::Role, User},
-    perms, Db, Error, Permission, Ref, Result,
+    perms, Db, Error, Permission, Ref, Result, variables::delta::MAX_ROLE_COUNT,
 };
 
 use rocket::serde::json::Json;
@@ -50,6 +50,10 @@ pub async fn req(
         .throw_permission(db, Permission::ManageRole)
         .await?;
 
+    if server.roles.len() > *MAX_ROLE_COUNT {
+        return Err(Error::TooManyRoles { max: *MAX_ROLE_COUNT })
+    };
+
     let member_rank = permissions.get_member_rank();
     let rank = if let Some(given_rank) = data.rank {
         if given_rank <= member_rank.unwrap_or(i64::MIN) {