feat: add ability to leave groups / servers silently

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

@@ -2,13 +2,27 @@ use revolt_quark::{
     models::{channel::PartialChannel, Channel, User},
     perms, Db, EmptyResponse, Error, Permission, Ref, Result,
 };
+use serde::{Deserialize, Serialize};
+use validator::Validate;
+
+/// # Query Parameters
+#[derive(Validate, Serialize, Deserialize, JsonSchema, FromForm)]
+pub struct OptionsChannelDelete {
+    /// Whether to not send a leave message
+    leave_silently: Option<bool>,
+}
 
 /// # Close Channel
 ///
 /// Deletes a server channel, leaves a group or closes a group.
 #[openapi(tag = "Channel Information")]
-#[delete("/<target>")]
-pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+#[delete("/<target>?<options..>")]
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    options: OptionsChannelDelete,
+) -> Result<EmptyResponse> {
     let mut channel = target.as_channel(db).await?;
     let mut perms = perms(&user).channel(&channel);
     perms.throw_permission(db, Permission::ViewChannel).await?;
@@ -27,7 +41,12 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
             .await
             .map(|_| EmptyResponse),
         Channel::Group { .. } => channel
-            .remove_user_from_group(db, &user.id, None)
+            .remove_user_from_group(
+                db,
+                &user.id,
+                None,
+                options.leave_silently.unwrap_or_default(),
+            )
             .await
             .map(|_| EmptyResponse),
         Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {

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

@@ -29,6 +29,8 @@ pub struct DataEditChannel {
     icon: Option<String>,
     /// Whether this channel is age-restricted
     nsfw: Option<bool>,
+    /// Whether this channel is archived
+    archived: Option<bool>,
     #[validate(length(min = 1))]
     remove: Option<Vec<FieldsChannel>>,
 }
@@ -83,6 +85,7 @@ pub async fn req(
             }
 
             // Transfer ownership
+            partial.owner = Some(new_owner.to_string());
             let old_owner = std::mem::replace(owner, new_owner.to_string());
 
             // Notify clients

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

@@ -33,7 +33,7 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
             }
 
             channel
-                .remove_user_from_group(db, &member.id, Some(&user.id))
+                .remove_user_from_group(db, &member.id, Some(&user.id), false)
                 .await
                 .map(|_| EmptyResponse)
         }

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

@@ -55,7 +55,7 @@ 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() > 100 {
+            if emojis.len() > 99 {
                 return Err(Error::TooManyEmoji);
             }
         }

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

@@ -34,7 +34,7 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
     }
 
     server
-        .remove_member(db, member, RemovalIntention::Kick)
+        .remove_member(db, member, RemovalIntention::Kick, false)
         .await
         .map(|_| EmptyResponse)
 }

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

@@ -2,13 +2,27 @@ use revolt_quark::{
     models::{server_member::RemovalIntention, User},
     Db, EmptyResponse, Ref, Result,
 };
+use serde::{Deserialize, Serialize};
+use validator::Validate;
+
+/// # Query Parameters
+#[derive(Validate, Serialize, Deserialize, JsonSchema, FromForm)]
+pub struct OptionsServerDelete {
+    /// Whether to not send a leave message
+    leave_silently: Option<bool>,
+}
 
 /// # Delete / Leave Server
 ///
 /// Deletes a server if owner otherwise leaves.
 #[openapi(tag = "Server Information")]
-#[delete("/<target>")]
-pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
+#[delete("/<target>?<options..>")]
+pub async fn req(
+    db: &Db,
+    user: User,
+    target: Ref,
+    options: OptionsServerDelete,
+) -> Result<EmptyResponse> {
     let server = target.as_server(db).await?;
     let member = db.fetch_member(&target.id, &user.id).await?;
 
@@ -16,7 +30,12 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
         server.delete(db).await
     } else {
         server
-            .remove_member(db, member, RemovalIntention::Leave)
+            .remove_member(
+                db,
+                member,
+                RemovalIntention::Leave,
+                options.leave_silently.unwrap_or_default(),
+            )
             .await
     }
     .map(|_| EmptyResponse)

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

@@ -1,3 +1,5 @@
+use std::collections::HashSet;
+
 use revolt_quark::{
     models::{
         server::{Category, FieldsServer, PartialServer, SystemMessageChannels},
@@ -135,29 +137,43 @@ pub async fn req(
         }
     }
 
-    // 2. Apply new icon
+    // 2. Validate changes
+    let mut unknown_channels = HashSet::new();
+    if let Some(system_messages) = &partial.system_messages {
+        unknown_channels = system_messages.clone().into_channel_ids();
+    }
+
+    if let Some(categories) = &partial.categories {
+        let mut channel_ids = HashSet::new();
+        for category in categories {
+            for channel in &category.channels {
+                if channel_ids.contains(channel) {
+                    return Err(Error::InvalidOperation);
+                }
+
+                channel_ids.insert(channel.to_string());
+            }
+        }
+
+        unknown_channels.extend(channel_ids);
+    }
+
+    if !db.check_channels_exist(&unknown_channels).await? {
+        return Err(Error::NotFound);
+    }
+
+    // 3. Apply new icon
     if let Some(icon) = icon {
         partial.icon = Some(File::use_server_icon(db, &icon, &server.id).await?);
         server.icon = partial.icon.clone();
     }
 
-    // 3. Apply new banner
+    // 4. Apply new banner
     if let Some(banner) = banner {
         partial.banner = Some(File::use_banner(db, &banner, &server.id).await?);
         server.banner = partial.banner.clone();
     }
 
-    // 4. Validate changes
-    if let Some(system_messages) = &partial.system_messages {
-        let channels = system_messages.clone().into_channel_ids();
-        if !db
-            .check_channels_exist(&channels.into_iter().collect())
-            .await?
-        {
-            return Err(Error::NotFound);
-        }
-    }
-
     server
         .update(db, partial, remove.unwrap_or_default())
         .await?;

crates/quark/src/impl/generic/channels/channel.rs

@@ -286,6 +286,7 @@ impl Channel {
         db: &Database,
         user: &str,
         by: Option<&str>,
+        silent: bool,
     ) -> Result<()> {
         match &self {
             Channel::Group {
@@ -329,20 +330,22 @@ impl Channel {
                 .p(id.to_string())
                 .await;
 
-                if let Some(by) = by {
-                    SystemMessage::UserRemove {
-                        id: user.to_string(),
-                        by: by.to_string(),
-                    }
-                } else {
-                    SystemMessage::UserLeft {
-                        id: user.to_string(),
+                if !silent {
+                    if let Some(by) = by {
+                        SystemMessage::UserRemove {
+                            id: user.to_string(),
+                            by: by.to_string(),
+                        }
+                    } else {
+                        SystemMessage::UserLeft {
+                            id: user.to_string(),
+                        }
                     }
+                    .into_message(id.to_string())
+                    .create(db, self, None)
+                    .await
+                    .ok();
                 }
-                .into_message(id.to_string())
-                .create(db, self, None)
-                .await
-                .ok();
 
                 Ok(())
             }

crates/quark/src/impl/generic/servers/server.rs

@@ -1,3 +1,5 @@
+use std::collections::HashSet;
+
 use iso8601_timestamp::Timestamp;
 use ulid::Ulid;
 
@@ -254,6 +256,7 @@ impl Server {
         db: &Database,
         member: Member,
         intention: RemovalIntention,
+        silent: bool,
     ) -> Result<()> {
         db.delete_member(&member.id).await?;
 
@@ -264,20 +267,22 @@ impl Server {
         .p(member.id.server)
         .await;
 
-        if let Some(id) = self.system_messages.as_ref().and_then(|x| match intention {
-            RemovalIntention::Leave => x.user_left.as_ref(),
-            RemovalIntention::Kick => x.user_kicked.as_ref(),
-            RemovalIntention::Ban => x.user_banned.as_ref(),
-        }) {
-            match intention {
-                RemovalIntention::Leave => SystemMessage::UserLeft { id: member.id.user },
-                RemovalIntention::Kick => SystemMessage::UserKicked { id: member.id.user },
-                RemovalIntention::Ban => SystemMessage::UserBanned { id: member.id.user },
+        if !silent {
+            if let Some(id) = self.system_messages.as_ref().and_then(|x| match intention {
+                RemovalIntention::Leave => x.user_left.as_ref(),
+                RemovalIntention::Kick => x.user_kicked.as_ref(),
+                RemovalIntention::Ban => x.user_banned.as_ref(),
+            }) {
+                match intention {
+                    RemovalIntention::Leave => SystemMessage::UserLeft { id: member.id.user },
+                    RemovalIntention::Kick => SystemMessage::UserKicked { id: member.id.user },
+                    RemovalIntention::Ban => SystemMessage::UserBanned { id: member.id.user },
+                }
+                .into_message(id.to_string())
+                .create_no_web_push(db, id, false)
+                .await
+                .ok();
             }
-            .into_message(id.to_string())
-            .create_no_web_push(db, id, false)
-            .await
-            .ok();
         }
 
         Ok(())
@@ -302,7 +307,7 @@ impl Server {
         member: Member,
         reason: Option<String>,
     ) -> Result<ServerBan> {
-        self.remove_member(db, member.clone(), RemovalIntention::Ban)
+        self.remove_member(db, member.clone(), RemovalIntention::Ban, false)
             .await?;
 
         self.ban_user(db, member.id, reason).await
@@ -310,23 +315,23 @@ impl Server {
 }
 
 impl SystemMessageChannels {
-    pub fn into_channel_ids(self) -> Vec<String> {
-        let mut ids = vec![];
+    pub fn into_channel_ids(self) -> HashSet<String> {
+        let mut ids = HashSet::new();
 
         if let Some(id) = self.user_joined {
-            ids.push(id);
+            ids.insert(id);
         }
 
         if let Some(id) = self.user_left {
-            ids.push(id);
+            ids.insert(id);
         }
 
         if let Some(id) = self.user_kicked {
-            ids.push(id);
+            ids.insert(id);
         }
 
         if let Some(id) = self.user_banned {
-            ids.push(id);
+            ids.insert(id);
         }
 
         ids