Merge remote-tracking branch 'origin/main' into chore/utoipa

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

@@ -1,4 +1,11 @@
-use revolt_database::{util::reference::Reference, Database, RemovalIntention, User};
+use revolt_database::{
+    util::reference::Reference,
+    voice::{
+        delete_voice_channel, get_user_voice_channel_in_server, remove_user_from_voice_channel,
+        VoiceClient,
+    },
+    Database, RemovalIntention, User,
+};
 use revolt_models::v0;
 use revolt_result::Result;
 use rocket::State;
@@ -19,6 +26,7 @@ use rocket_empty::EmptyResponse;
 #[delete("/<target>?<options..>")]
 pub async fn delete(
     db: &State<Database>,
+    voice_client: &State<VoiceClient>,
     user: User,
     target: Reference<'_>,
     options: v0::OptionsServerDelete,
@@ -27,8 +35,16 @@ pub async fn delete(
     let member = db.fetch_member(target.id, &user.id).await?;
 
     if server.owner == user.id {
+        for channel_id in &server.channels {
+            delete_voice_channel(voice_client, channel_id, Some(&server.id)).await?;
+        }
+
         server.delete(db).await
     } else {
+        if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
+            remove_user_from_voice_channel(db, voice_client, &channel_id, &user.id).await?;
+        };
+
         member
             .remove(
                 db,