fix: include voice states in servercreate event

feat: call started system message in dms

crates/delta/Cargo.toml

@@ -80,7 +80,6 @@ revolt-models = { path = "../core/models", features = [
 revolt-presence = { path = "../core/presence" }
 revolt-result = { path = "../core/result", features = ["rocket", "okapi"] }
 revolt-permissions = { path = "../core/permissions", features = ["schemas"] }
-revolt-voice = { path = "../core/voice" }
 
 # voice
 livekit-api = "0.4.1"

crates/delta/src/main.rs

@@ -24,7 +24,7 @@ use amqprs::{
 use async_std::channel::unbounded;
 use authifier::AuthifierEvent;
 use rocket::data::ToByteUnit;
-use livekit_api::services::room::RoomClient;
+use revolt_database::voice::VoiceClient;
 
 pub async fn web() -> Rocket<Build> {
     // Get settings
@@ -84,7 +84,7 @@ pub async fn web() -> Rocket<Build> {
     .into();
 
     // Voice handler
-    let voice_client = revolt_voice::VoiceClient::new(config.api.livekit.url.clone(), config.api.livekit.key.clone(), config.api.livekit.secret.clone());
+    let voice_client = VoiceClient::new(config.api.livekit.url.clone(), config.api.livekit.key.clone(), config.api.livekit.secret.clone());
     // Configure Rabbit
     let connection = Connection::open(&OpenConnectionArguments::new(
         &config.rabbit.host,

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

@@ -1,8 +1,7 @@
 use revolt_models::v0;
-use revolt_database::{util::{permissions::perms, reference::Reference}, Database, User};
+use revolt_database::{util::{permissions::perms, reference::Reference}, voice::{raise_if_in_voice, VoiceClient}, Channel, Database, SystemMessage, User, AMQP};
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::Result;
-use revolt_voice::{VoiceClient, raise_if_in_voice};
 
 use rocket::{serde::json::Json, State};
 
@@ -11,10 +10,10 @@ use rocket::{serde::json::Json, State};
 /// Asks the voice server for a token to join the call.
 #[openapi(tag = "Voice")]
 #[post("/<target>/join_call")]
-pub async fn call(db: &State<Database>, voice: &State<VoiceClient>, user: User, target: Reference) -> Result<Json<v0::CreateVoiceUserResponse>> {
+pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceClient>, user: User, target: Reference) -> Result<Json<v0::CreateVoiceUserResponse>> {
     let channel = target.as_channel(db).await?;
 
-    raise_if_in_voice(&user, &channel.id()).await?;
+    raise_if_in_voice(&user, channel.id()).await?;
 
     let mut permissions = perms(db, &user).channel(&channel);
 
@@ -24,7 +23,28 @@ pub async fn call(db: &State<Database>, voice: &State<VoiceClient>, user: User,
     let token = voice.create_token(&user, current_permissions, &channel)?;
     let room = voice.create_room(&channel).await?;
 
-    log::debug!("created room {}", room.name);
+    log::debug!("Created room {}", room.name);
+
+    match &channel {
+        Channel::DirectMessage { .. } | Channel::Group { .. } => {
+            SystemMessage::CallStarted {
+                by: user.id.clone()
+            }
+            .into_message(channel.id().to_string())
+            .send(
+                db,
+                Some(amqp),
+                v0::MessageAuthor::System {
+                    username: &user.username,
+                    avatar: user.avatar.as_ref().map(|file| file.id.as_ref()),
+                },
+                None,
+                None,
+                &channel, false
+            ).await?;
+        }
+        _ => {}
+    };
 
     Ok(Json(v0::CreateVoiceUserResponse { token }))
 }

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

@@ -1,5 +1,6 @@
 use revolt_database::{
     util::{permissions::DatabasePermissionQuery, reference::Reference},
+    voice::{delete_voice_state, get_user_voice_channel_in_server, VoiceClient},
     Database, RemovalIntention, ServerBan, User,
 };
 use revolt_models::v0;
@@ -8,7 +9,6 @@ use revolt_permissions::{
     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 validator::Validate;
 

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

@@ -7,13 +7,13 @@ use redis_kiss::{get_connection, redis::Pipeline, AsyncCommands};
 use revolt_database::{
     events::client::EventV1,
     util::{permissions::DatabasePermissionQuery, reference::Reference},
+    voice::VoiceClient,
     Database, File, PartialMember, User,
 };
 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;
 

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

@@ -1,11 +1,12 @@
 use livekit_protocol::ParticipantPermission;
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, User
+    util::{permissions::DatabasePermissionQuery, reference::Reference},
+    voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state, VoiceClient},
+    Channel, Database, User
 };
 use revolt_models::v0::PartialUserVoiceState;
 use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
-use revolt_voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state, VoiceClient};
 use rocket::State;
 use rocket_empty::EmptyResponse;
 

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

@@ -1,11 +1,12 @@
 use livekit_protocol::ParticipantPermission;
 use revolt_database::{
-    util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, PartialRole, User
+    util::{permissions::DatabasePermissionQuery, reference::Reference},
+    voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state, update_voice_state_tracks, VoiceClient},
+    Channel, Database, PartialRole, User
 };
 use revolt_models::v0::{self, PartialUserVoiceState};
 use revolt_permissions::{calculate_channel_permissions, calculate_server_permissions, ChannelPermission, PermissionQuery};
 use revolt_result::{create_error, Result};
-use revolt_voice::{get_allowed_sources, get_voice_channel_members, get_voice_state, update_voice_state, update_voice_state_tracks, VoiceClient};
 use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use validator::Validate;