feat(livekit): more permission handling

crates/delta/src/routes/root.rs

@@ -105,8 +105,8 @@ pub async fn root() -> Result<Json<RevoltConfig>> {
                 url: config.hosts.january,
             },
             livekit: VoiceFeature {
-                enabled: !config.api.livekit.url.is_empty(),
-                url: config.api.livekit.url.to_string(),
+                enabled: !config.hosts.livekit.is_empty(),
+                url: config.hosts.livekit.to_string(),
             },
         },
         ws: config.hosts.events,

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

@@ -5,11 +5,11 @@ use revolt_database::{
 use revolt_models::v0;
 
 use revolt_permissions::{
-    calculate_channel_permissions, calculate_server_permissions, ChannelPermission,
+    calculate_server_permissions, ChannelPermission,
 };
 use revolt_result::{create_error, Result};
+use revolt_voice::{delete_voice_state, get_user_voice_channel_in_server, VoiceClient};
 use rocket::{serde::json::Json, State};
-use serde::{Deserialize, Serialize};
 use validator::Validate;
 
 /// # Ban User
@@ -19,6 +19,7 @@ use validator::Validate;
 #[put("/<server>/bans/<target>", data = "<data>")]
 pub async fn ban(
     db: &State<Database>,
+    voice: &State<VoiceClient>,
     user: User,
     server: Reference,
     target: Reference,
@@ -57,6 +58,11 @@ pub async fn ban(
         member
             .remove(db, &server, RemovalIntention::Ban, false)
             .await?;
+
+        // If the member is in a voice channel while banned kick them from the voice channel
+        if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
+            delete_voice_state(&channel_id, Some(&server.id), &user.id).await?
+        }
     }
 
     ServerBan::create(db, &server, &target.id, data.reason)

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

@@ -7,10 +7,11 @@ use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 use revolt_database::{
     events::client::EventV1, util::{permissions::DatabasePermissionQuery, reference::Reference}, Database, File, PartialMember, User
 };
-use revolt_models::v0::{self, PartialUserVoiceState};
+use revolt_models::v0::{self, FieldsMember, PartialUserVoiceState};
 
 use revolt_permissions::{calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result, ToRevoltError};
+use revolt_voice::VoiceClient;
 use rocket::{form::validate::Contains, serde::json::Json, State};
 use validator::Validate;
 
@@ -20,7 +21,7 @@ use validator::Validate;
 #[openapi(tag = "Server Members")]
 #[patch("/<server>/members/<target>", data = "<data>")]
 pub async fn edit(
-    room_client: &State<RoomClient>,
+    voice_client: &State<VoiceClient>,
     db: &State<Database>,
     user: User,
     server: Reference,
@@ -37,6 +38,7 @@ pub async fn edit(
     // Fetch server, target member and current permissions
     let mut server = server.as_server(db).await?;
     let mut member = target.as_member(db, &server.id).await?;
+    let target_user = target.as_user(db).await?;
     let mut query = DatabasePermissionQuery::new(db, &user)
         .server(&server)
         .member(&member);
@@ -153,8 +155,8 @@ pub async fn edit(
         roles,
         timeout,
         remove,
-        can_publish,
-        can_receive,
+        mut can_publish,
+        mut can_receive,
         voice_channel
     } = data;
 
@@ -181,6 +183,10 @@ pub async fn edit(
         partial.avatar = Some(File::use_avatar(db, &avatar, &user.id).await?);
     }
 
+    let remove_contains_voice = remove
+        .as_ref()
+        .map(|r| r.contains(FieldsMember::CanPublish) || r.contains(FieldsMember::CanReceive)).unwrap_or_default();
+
     member
         .update(
             db,
@@ -191,7 +197,11 @@ pub async fn edit(
         )
         .await?;
 
-    if can_publish.is_some() || can_receive.is_some() || voice_channel.is_some() {
+    if can_publish.is_some() ||
+       can_receive.is_some() ||
+       voice_channel.is_some() ||
+       remove_contains_voice
+    {
         let mut conn = get_connection().await.to_internal_error()?;
 
         let unique_key = format!("{}-{}", &member.id.user, &member.id.server);
@@ -206,6 +216,22 @@ pub async fn edit(
             let mut pipeline = Pipeline::new();
             let mut new_perms = ParticipantPermission::default();
 
+            if remove_contains_voice {
+                let mut query = DatabasePermissionQuery::new(db, &target_user)
+                    .server(&server)
+                    .member(&member);
+
+                let permissions = calculate_server_permissions(&mut query).await;
+
+                if !permissions.has_channel_permission(ChannelPermission::Speak) {
+                    can_publish = Some(false)
+                }
+
+                if !permissions.has_channel_permission(ChannelPermission::Listen) {
+                    can_receive = Some(false)
+                }
+            }
+
             if let Some(can_publish) = can_publish {
                 pipeline.set(
                     format!("can_publish-{}", unique_key),
@@ -235,18 +261,7 @@ pub async fn edit(
                 .await
                 .to_internal_error()?;
 
-            room_client
-                .update_participant(
-                    &channel,
-                    &member.id.user,
-                    UpdateParticipantOptions {
-                        permission: Some(new_perms),
-                        name: "".to_string(),
-                        metadata: "".to_string(),
-                    },
-                )
-                .await
-                .to_internal_error()?;
+            voice_client.update_permissions(&user, &channel, new_perms).await?;
 
             EventV1::UserVoiceStateUpdate {
                 id: member.id.user.clone(),