refactor: Remove VoiceChannel

crates/bonfire/src/events/impl.rs

@@ -18,6 +18,7 @@ use super::state::{Cache, State};
 impl Cache {
     /// Check whether the current user can view a channel
     pub async fn can_view_channel(&self, db: &Database, channel: &Channel) -> bool {
+        #[allow(deprecated)]
         match &channel {
             Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
                 let member = self.members.get(server);
@@ -284,6 +285,7 @@ impl State {
 
             let id = &id.to_string();
             for (channel_id, channel) in &self.cache.channels {
+                #[allow(deprecated)]
                 match channel {
                     Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
                         if server == id {

crates/core/database/src/models/admin_migrations/ops/mongodb/scripts.rs

@@ -21,7 +21,7 @@ struct MigrationInfo {
     revision: i32,
 }
 
-pub const LATEST_REVISION: i32 = 31;
+pub const LATEST_REVISION: i32 = 33;
 
 pub async fn migrate_database(db: &MongoDb) {
     let migrations = db.col::<Document>("migrations");
@@ -1185,6 +1185,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .await;
 
         for webhook in webhooks {
+            #[allow(deprecated)]
             match db.fetch_channel(&webhook.channel_id).await {
                 Ok(channel) => {
                     let creator_id = match channel {
@@ -1246,6 +1247,24 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
             .expect("Failed to update members");
     }
 
+    if revision <= 33 {
+        info!("Running migration [revision 33 / 29-04-2025]: Convert all `VoiceChannel`'s into `TextChannel` ");
+
+        db.col::<Document>("channels")
+            .update_many(
+                doc! { "channel_type": "VoiceChannel" },
+                doc! {
+                    "$set": {
+                        "channel_type": "TextChannel",
+                        "voice": {}
+                    }
+                },
+                None
+            )
+            .await
+            .expect("Failed to update voice channels");
+    };
+
     // Reminder to update LATEST_REVISION when adding new migrations.
     LATEST_REVISION.max(revision)
 }

crates/core/database/src/models/channel_invites/model.rs

@@ -69,7 +69,7 @@ impl Invite {
                 creator: creator.id.clone(),
                 channel: id.clone(),
             }),
-            Channel::TextChannel { id, server, .. } | Channel::VoiceChannel { id, server, .. } => {
+            Channel::TextChannel { id, server, .. } => {
                 Ok(Invite::Server {
                     code,
                     creator: creator.id.clone(),

crates/core/database/src/models/channels/model.rs

@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use std::{borrow::Cow, collections::HashMap};
 
 use revolt_config::config;
@@ -108,7 +109,7 @@ auto_derived!(
             #[serde(skip_serializing_if = "Option::is_none")]
             voice: Option<VoiceInformation>
         },
-        /// Voice channel belonging to a server
+        #[deprecated = "Use TextChannel { voice } instead"]
         VoiceChannel {
             /// Unique Id
             #[serde(rename = "_id")]
@@ -165,6 +166,8 @@ auto_derived!(
         pub default_permissions: Option<OverrideField>,
         #[serde(skip_serializing_if = "Option::is_none")]
         pub last_message_id: Option<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub voice: Option<VoiceInformation>
     }
 
     /// Optional fields on channel object
@@ -225,15 +228,17 @@ impl Channel {
                 nsfw: data.nsfw.unwrap_or(false),
                 voice: data.voice
             },
-            v0::LegacyServerChannelType::Voice => Channel::VoiceChannel {
+            v0::LegacyServerChannelType::Voice => Channel::TextChannel {
                 id: id.clone(),
                 server: server.id.to_owned(),
                 name: data.name,
                 description: data.description,
                 icon: None,
+                last_message_id: None,
                 default_permissions: None,
                 role_permissions: HashMap::new(),
                 nsfw: data.nsfw.unwrap_or(false),
+                voice: Some(data.voice.unwrap_or_default())
             },
         };
 
@@ -464,12 +469,6 @@ impl Channel {
                 server,
                 role_permissions,
                 ..
-            }
-            | Channel::VoiceChannel {
-                id,
-                server,
-                role_permissions,
-                ..
             } => {
                 db.set_channel_role_permission(id, role_id, permissions)
                     .await?;
@@ -516,7 +515,7 @@ impl Channel {
             clear: remove.into_iter().map(|v| v.into()).collect(),
         }
         .p(match self {
-            Self::TextChannel { server, .. } | Self::VoiceChannel { server, .. } => server.clone(),
+            Self::TextChannel { server, .. } => server.clone(),
             _ => id,
         })
         .await;
@@ -529,16 +528,14 @@ impl Channel {
         match field {
             FieldsChannel::Description => match self {
                 Self::Group { description, .. }
-                | Self::TextChannel { description, .. }
+                | Self::TextChannel { description, .. } => {
-                | Self::VoiceChannel { description, .. } => {
                     description.take();
                 }
                 _ => {}
             },
             FieldsChannel::Icon => match self {
                 Self::Group { icon, .. }
-                | Self::TextChannel { icon, .. }
+                | Self::TextChannel { icon, .. } => {
-                | Self::VoiceChannel { icon, .. } => {
                     icon.take();
                 }
                 _ => {}
@@ -547,10 +544,6 @@ impl Channel {
                 Self::TextChannel {
                     default_permissions,
                     ..
-                }
-                | Self::VoiceChannel {
-                    default_permissions,
-                    ..
                 } => {
                     default_permissions.take();
                 }
@@ -567,6 +560,7 @@ impl Channel {
     }
 
     /// Apply partial channel to channel
+    #[allow(deprecated)]
     pub fn apply_options(&mut self, partial: PartialChannel) {
         match self {
             Self::SavedMessages { .. } => {}
@@ -615,15 +609,7 @@ impl Channel {
                 nsfw,
                 default_permissions,
                 role_permissions,
-                ..
+                voice,
-            }
-            | Self::VoiceChannel {
-                name,
-                description,
-                icon,
-                nsfw,
-                default_permissions,
-                role_permissions,
                 ..
             } => {
                 if let Some(v) = partial.name {
@@ -649,7 +635,12 @@ impl Channel {
                 if let Some(v) = partial.default_permissions {
                     default_permissions.replace(v);
                 }
-            }
+
+                if let Some(v) = partial.voice {
+                    voice.replace(v);
+                }
+            },
+            Self::VoiceChannel { .. } => {}
         }
     }
 

crates/core/database/src/models/channels/ops/mongodb.rs

@@ -190,7 +190,7 @@ impl AbstractChannels for MongoDb {
     async fn delete_channel(&self, channel: &Channel) -> Result<()> {
         let id = channel.id().to_string();
         let server_id = match channel {
-            Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
+            Channel::TextChannel { server, .. } => {
                 Some(server)
             }
             _ => None,

crates/core/database/src/models/channels/ops/reference.rs

@@ -94,9 +94,6 @@ impl AbstractChannels for ReferenceDb {
             match &mut channel {
                 Channel::TextChannel {
                     role_permissions, ..
-                }
-                | Channel::VoiceChannel {
-                    role_permissions, ..
                 } => {
                     if role_permissions.get(role_id).is_some() {
                         role_permissions.remove(role_id);

crates/core/database/src/models/messages/model.rs

@@ -342,6 +342,7 @@ impl Message {
 
         // Validate the mentions go to users in the channel/server
         if !mentions.is_empty() {
+            #[allow(deprecated)]
             match channel {
                 Channel::DirectMessage { ref recipients, .. }
                 | Channel::Group { ref recipients, .. } => {

crates/core/database/src/util/bridge/v0.rs

@@ -143,6 +143,7 @@ impl From<crate::FieldsWebhook> for FieldsWebhook {
 }
 
 impl From<crate::Channel> for Channel {
+    #[allow(deprecated)]
     fn from(value: crate::Channel) -> Self {
         match value {
             crate::Channel::SavedMessages { id, user } => Channel::SavedMessages { id, user },
@@ -225,6 +226,7 @@ impl From<crate::Channel> for Channel {
 }
 
 impl From<Channel> for crate::Channel {
+    #[allow(deprecated)]
     fn from(value: Channel) -> crate::Channel {
         match value {
             Channel::SavedMessages { id, user } => crate::Channel::SavedMessages { id, user },
@@ -319,6 +321,7 @@ impl From<crate::PartialChannel> for PartialChannel {
             role_permissions: value.role_permissions,
             default_permissions: value.default_permissions,
             last_message_id: value.last_message_id,
+            voice: value.voice
         }
     }
 }
@@ -336,6 +339,7 @@ impl From<PartialChannel> for crate::PartialChannel {
             role_permissions: value.role_permissions,
             default_permissions: value.default_permissions,
             last_message_id: value.last_message_id,
+            voice: value.voice
         }
     }
 }

crates/core/database/src/util/bulk_permissions.rs

@@ -121,10 +121,6 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
                 Channel::TextChannel {
                     default_permissions,
                     ..
-                }
-                | Channel::VoiceChannel {
-                    default_permissions,
-                    ..
                 } => default_permissions.unwrap_or_default().into(),
                 _ => Default::default(),
             }
@@ -133,7 +129,7 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
         }
     }
 
-    #[allow(dead_code)]
+    #[allow(dead_code, deprecated)]
     fn get_channel_type(&mut self) -> ChannelType {
         if let Some(channel) = &self.channel {
             match channel {
@@ -156,9 +152,6 @@ impl<'z> BulkDatabasePermissionQuery<'z> {
             match channel {
                 Channel::TextChannel {
                     role_permissions, ..
-                }
-                | Channel::VoiceChannel {
-                    role_permissions, ..
                 } => role_permissions,
                 _ => panic!("Not supported for non-server channels"),
             }
@@ -185,12 +178,6 @@ async fn calculate_members_permissions<'a>(
             role_permissions,
             default_permissions,
             ..
-        }
-        | Channel::VoiceChannel {
-            id,
-            role_permissions,
-            default_permissions,
-            ..
         } => (id, role_permissions, default_permissions),
         _ => panic!("Calculation of member permissions must be done on a server channel"),
     };

crates/core/database/src/util/permissions.rs

@@ -204,6 +204,7 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
     // * For calculating channel permission
 
     /// Get the type of the channel
+    #[allow(deprecated)]
     async fn get_channel_type(&mut self) -> ChannelType {
         if let Some(channel) = &self.channel {
             match channel {
@@ -241,14 +242,6 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
                 | Cow::Owned(Channel::TextChannel {
                     default_permissions,
                     ..
-                })
-                | Cow::Borrowed(Channel::VoiceChannel {
-                    default_permissions,
-                    ..
-                })
-                | Cow::Owned(Channel::VoiceChannel {
-                    default_permissions,
-                    ..
                 }) => default_permissions.unwrap_or_default().into(),
                 _ => Default::default(),
             }
@@ -266,12 +259,6 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
                 })
                 | Cow::Owned(Channel::TextChannel {
                     role_permissions, ..
-                })
-                | Cow::Borrowed(Channel::VoiceChannel {
-                    role_permissions, ..
-                })
-                | Cow::Owned(Channel::VoiceChannel {
-                    role_permissions, ..
                 }) => {
                     if let Some(server) = &self.server {
                         let member_roles = self
@@ -361,6 +348,7 @@ impl PermissionQuery for DatabasePermissionQuery<'_> {
     /// (this will only ever be called for server channels, use unimplemented!() for other code paths)
     async fn set_server_from_channel(&mut self) {
         if let Some(channel) = &self.channel {
+            #[allow(deprecated)]
             match channel {
                 Cow::Borrowed(Channel::TextChannel { server, .. })
                 | Cow::Owned(Channel::TextChannel { server, .. })

crates/core/database/src/voice/mod.rs

@@ -284,10 +284,7 @@ pub async fn get_voice_state(
 pub async fn get_channel_voice_state(channel: &Channel) -> Result<Option<v0::ChannelVoiceState>> {
     let members = get_voice_channel_members(channel.id()).await?;
 
-    let server = match channel {
+    let server = channel.server();
-        Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => Some(server.as_str()),
-        _ => None
-    };
 
     if let Some(members) = members {
         let mut participants = Vec::with_capacity(members.len());

crates/core/database/src/voice/voice_client.rs

@@ -89,7 +89,7 @@ impl VoiceClient {
         let room = self.get_node(node)?;
 
         let voice = match channel {
-            Channel::DirectMessage { .. } | Channel::VoiceChannel { .. } => Some(Cow::Owned(v0::VoiceInformation::default())),
+            Channel::DirectMessage { .. } => Some(Cow::Owned(v0::VoiceInformation::default())),
             Channel::TextChannel { voice: Some(voice), .. } => Some(Cow::Borrowed(voice)),
             _ => None
         }

crates/core/models/src/v0/channels.rs

@@ -1,3 +1,4 @@
+#![allow(deprecated)]
 use super::{File, UserVoiceState};
 
 use revolt_permissions::{Override, OverrideField};
@@ -112,7 +113,7 @@ auto_derived!(
             #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
             voice: Option<VoiceInformation>
         },
-        /// DEPRECATED (use TextChannel { voice }): Voice channel belonging to a server
+        #[deprecated = "Use TextChannel { voice } instead"]
         VoiceChannel {
             /// Unique Id
             #[cfg_attr(feature = "serde", serde(rename = "_id"))]
@@ -183,6 +184,8 @@ auto_derived!(
         pub default_permissions: Option<OverrideField>,
         #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
         pub last_message_id: Option<String>,
+        #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
+        pub voice: Option<VoiceInformation>,
     }
 
     /// Optional fields on channel object
@@ -218,6 +221,9 @@ auto_derived!(
         /// Whether this channel is archived
         pub archived: Option<bool>,
 
+        /// Voice Information for voice channels
+        pub voice: Option<VoiceInformation>,
+
         /// Fields to remove from channel
         #[cfg_attr(feature = "serde", serde(default))]
         pub remove: Option<Vec<FieldsChannel>>,

crates/daemons/pushd/src/consumers/outbound/apn.rs

@@ -62,6 +62,7 @@ impl ApnsOutboundConsumer {
         // in a dm it should just be "Sendername".
         // not sure how feasible all those are given the PushNotification object as it currently stands.
 
+        #[allow(deprecated)]
         match &notification.channel {
             Channel::DirectMessage { .. } => notification.author.clone(),
             Channel::Group { name, .. } => format!("{}, #{}", notification.author, name),

crates/daemons/pushd/src/consumers/outbound/fcm.rs

@@ -26,6 +26,7 @@ impl FcmOutboundConsumer {
         // in a dm it should just be "Sendername".
         // not sure how feasible all those are given the PushNotification object as it currently stands.
 
+        #[allow(deprecated)]
         match &notification.channel {
             Channel::DirectMessage { .. } => notification.author.clone(),
             Channel::Group { name, .. } => format!("{}, #{}", notification.author, name),

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

@@ -26,6 +26,7 @@ pub async fn delete(
 
     permissions.throw_if_lacking_channel_permission(ChannelPermission::ViewChannel)?;
 
+    #[allow(deprecated)]
     match &channel {
         Channel::SavedMessages { .. } => Err(create_error!(NoEffect))?,
         Channel::DirectMessage { .. } => channel

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

@@ -95,22 +95,6 @@ pub async fn edit(
             icon,
             nsfw,
             ..
-        }
-        | Channel::TextChannel {
-            id,
-            name,
-            description,
-            icon,
-            nsfw,
-            ..
-        }
-        | Channel::VoiceChannel {
-            id,
-            name,
-            description,
-            icon,
-            nsfw,
-            ..
         } => {
             if let Some(fields) = &data.remove {
                 if fields.contains(&v0::FieldsChannel::Icon) {
@@ -153,77 +137,129 @@ pub async fn edit(
             }
 
             // Send out mutation system messages.
-            if let Channel::Group { .. } = &channel {
+            if let Some(name) = &partial.name {
-                if let Some(name) = &partial.name {
+                SystemMessage::ChannelRenamed {
-                    SystemMessage::ChannelRenamed {
+                    name: name.to_string(),
-                        name: name.to_string(),
+                    by: user.id.clone(),
-                        by: user.id.clone(),
+                }
+                .into_message(channel.id().to_string())
+                .send(
+                    db,
+                    Some(amqp),
+                    user.as_author_for_system(),
+                    None,
+                    None,
+                    &channel,
+                    false,
+                )
+                .await
+                .ok();
+            }
+
+            if partial.description.is_some() {
+                SystemMessage::ChannelDescriptionChanged {
+                    by: user.id.clone(),
+                }
+                .into_message(channel.id().to_string())
+                .send(
+                    db,
+                    Some(amqp),
+                    user.as_author_for_system(),
+                    None,
+                    None,
+                    &channel,
+                    false,
+                )
+                .await
+                .ok();
+            }
+
+            if partial.icon.is_some() {
+                SystemMessage::ChannelIconChanged {
+                    by: user.id.clone(),
+                }
+                .into_message(channel.id().to_string())
+                .send(
+                    db,
+                    Some(amqp),
+                    user.as_author_for_system(),
+                    None,
+                    None,
+                    &channel,
+                    false,
+                )
+                .await
+                .ok();
+            }
+        }
+        Channel::TextChannel {
+            id,
+            name,
+            description,
+            icon,
+            nsfw,
+            voice,
+            ..
+        } => {
+            if let Some(fields) = &data.remove {
+                if fields.contains(&v0::FieldsChannel::Icon) {
+                    if let Some(icon) = &icon {
+                        db.mark_attachment_as_deleted(&icon.id).await?;
                     }
-                    .into_message(channel.id().to_string())
-                    .send(
-                        db,
-                        Some(amqp),
-                        user.as_author_for_system(),
-                        None,
-                        None,
-                        &channel,
-                        false,
-                    )
-                    .await
-                    .ok();
                 }
 
-                if partial.description.is_some() {
+                for field in fields {
-                    SystemMessage::ChannelDescriptionChanged {
+                    match field {
-                        by: user.id.clone(),
+                        v0::FieldsChannel::Description => {
+                            description.take();
+                        }
+                        v0::FieldsChannel::Icon => {
+                            icon.take();
+                        }
+                        _ => {}
                     }
-                    .into_message(channel.id().to_string())
-                    .send(
-                        db,
-                        Some(amqp),
-                        user.as_author_for_system(),
-                        None,
-                        None,
-                        &channel,
-                        false,
-                    )
-                    .await
-                    .ok();
-                }
-
-                if partial.icon.is_some() {
-                    SystemMessage::ChannelIconChanged {
-                        by: user.id.clone(),
-                    }
-                    .into_message(channel.id().to_string())
-                    .send(
-                        db,
-                        Some(amqp),
-                        user.as_author_for_system(),
-                        None,
-                        None,
-                        &channel,
-                        false,
-                    )
-                    .await
-                    .ok();
                 }
             }
 
-            channel
+            if let Some(icon_id) = data.icon {
-                .update(
+                partial.icon = Some(File::use_channel_icon(db, &icon_id, id, &user.id).await?);
-                    db,
+                *icon = partial.icon.clone();
-                    partial,
+            }
-                    data.remove
+
-                        .unwrap_or_default()
+            if let Some(new_name) = data.name {
-                        .into_iter()
+                *name = new_name.clone();
-                        .map(|f| f.into())
+                partial.name = Some(new_name);
-                        .collect(),
+            }
-                )
+
-                .await?;
+            if let Some(new_description) = data.description {
+                partial.description = Some(new_description);
+                *description = partial.description.clone();
+            }
+
+            if let Some(new_nsfw) = data.nsfw {
+                *nsfw = new_nsfw;
+                partial.nsfw = Some(new_nsfw);
+            }
+
+            if let Some(new_voice) = data.voice {
+                *voice = Some(new_voice.clone());
+                partial.voice = Some(new_voice);
+            }
         }
         _ => return Err(create_error!(InvalidOperation)),
     };
 
+    channel
+        .update(
+            db,
+            partial,
+            data.remove
+                .unwrap_or_default()
+                .into_iter()
+                .map(|f| f.into())
+                .collect(),
+        )
+        .await?;
+
     Ok(Json(channel.into()))
 }

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

@@ -65,6 +65,7 @@ pub async fn query(
         },
         &user,
         include_users,
+        #[allow(deprecated)]
         match channel {
             Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
                 Some(server)

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

@@ -69,6 +69,7 @@ pub async fn search(
         },
         &user,
         include_users,
+        #[allow(deprecated)]
         match channel {
             Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => {
                 Some(server)

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

@@ -192,6 +192,7 @@ mod test {
                 d: ChannelPermission::ViewChannel as i64,
             }),
             last_message_id: None,
+            voice: None,
         };
         locked_channel
             .update(&harness.db, partial, vec![])

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

@@ -48,10 +48,6 @@ pub async fn set_default_permissions(
         Channel::TextChannel {
             default_permissions,
             ..
-        }
-        | Channel::VoiceChannel {
-            default_permissions,
-            ..
         } => {
             if let DataDefaultChannelPermissions::Field { permissions: field } = data {
                 permissions

crates/delta/src/routes/invites/invite_fetch.rs

@@ -23,13 +23,6 @@ pub async fn fetch(db: &State<Database>, target: Reference) -> Result<Json<v0::I
                     name,
                     description,
                     ..
-                }
-                | Channel::VoiceChannel {
-                    id,
-                    server,
-                    name,
-                    description,
-                    ..
                 } => {
                     let server = db.fetch_server(&server).await?;