HMC/handmade-revolt-backend
6
0
Fork 0
forked from jmug/stoatchat
Code Pull Requests Actions Packages Releases 2 Activity

fix: respond with the url when joining a voice channel

Browse Source
This commit is contained in:
Zomatree
2025-02-17 02:11:32 +00:00
parent 951128032b
commit 9c2cc8736c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/core/models/src/v0/channels.rs
View File

@@ -309,6 +309,8 @@ auto_derived!(
pub struct CreateVoiceUserResponse { pub struct CreateVoiceUserResponse {
/// Token for authenticating with the voice server /// Token for authenticating with the voice server
pub token: String, pub token: String,
/// Url of the livekit server to connect to
pub url: String
} }
/// Voice state for a channel /// Voice state for a channel

10
crates/delta/src/routes/channels/voice_join.rs
View File

@@ -1,3 +1,4 @@
use revolt_config::config;
use revolt_models::v0; use revolt_models::v0;
use revolt_database::{util::{permissions::perms, reference::Reference}, voice::{raise_if_in_voice, VoiceClient}, Channel, Database, SystemMessage, User, AMQP}; 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_permissions::{calculate_channel_permissions, ChannelPermission};
@@ -11,9 +12,10 @@ use rocket::{serde::json::Json, State};
#[openapi(tag = "Voice")] #[openapi(tag = "Voice")]
#[post("/<target>/join_call", data="<data>")] #[post("/<target>/join_call", data="<data>")]
pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceClient>, user: User, target: Reference, data: Json<v0::DataJoinCall>) -> Result<Json<v0::CreateVoiceUserResponse>> { pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceClient>, user: User, target: Reference, data: Json<v0::DataJoinCall>) -> Result<Json<v0::CreateVoiceUserResponse>> {
if !voice.rooms.contains_key(&data.node) { let config = config().await;
return Err(create_error!(UnknownNode))
} let node_host = config.hosts.livekit.get(&data.node)
.ok_or_else(|| create_error!(UnknownNode))?;
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;
@@ -50,5 +52,5 @@ pub async fn call(db: &State<Database>, amqp: &State<AMQP>, voice: &State<VoiceC
_ => {} _ => {}
}; };
Ok(Json(v0::CreateVoiceUserResponse { token })) Ok(Json(v0::CreateVoiceUserResponse { token, url: node_host.clone() }))
} }