jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feat/livekit

Browse Source
This commit is contained in:
Zomatree
2025-08-18 07:44:52 +01:00
parent 96ddeb79d2 ed22b3a5ce
commit c6f121f585
120 changed files with 372 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/daemons/pushd/Cargo.toml
View File

@@ -8,6 +8,7 @@ license = "AGPL-3.0-or-later"
revolt-result = { version = "0.8.8", path = "../../core/result" }
revolt-config = { version = "0.8.8", path = "../../core/config", features = [
"report-macros",
"anyhow"
] }
revolt-database = { version = "0.8.8", path = "../../core/database" }
revolt-models = { version = "0.8.8", path = "../../core/models", features = [

24
crates/daemons/voice-ingress/src/api.rs
View File

@@ -59,7 +59,7 @@ pub async fn ingress(
let channel_id = channel_id.to_internal_error()?;
let user_id = user_id.to_internal_error()?;
let channel = Reference::from_unchecked(channel_id.clone())
let channel = Reference::from_unchecked(&channel_id)
.as_channel(db)
.await?;
@@ -68,30 +68,30 @@ pub async fn ingress(
// Only publish one event when a user is moved from one channel to another.
if let Some(moved_from) = get_user_moved_to_voice(channel_id, user_id).await? {
EventV1::VoiceChannelMove {
user: user_id.clone(),
user: user_id.to_string(),
from: moved_from,
to: channel_id.clone(),
to: channel_id.to_string(),
state: voice_state,
}
.p(channel_id.clone())
.p(channel_id.to_string())
.await;
} else {
EventV1::VoiceChannelJoin {
id: channel_id.clone(),
id: channel_id.to_string(),
state: voice_state,
}
.p(channel_id.clone())
.p(channel_id.to_string())
.await;
};
// First user who joined - send call started system message.
if event.room.as_ref().unwrap().num_participants == 1 {
let user = Reference::from_unchecked(user_id.clone())
let user = Reference::from_unchecked(&user_id)
.as_user(db)
.await?;
let mut call_started_message = SystemMessage::CallStarted {
by: user_id.clone(),
by: user_id.to_string(),
finished_at: None,
}
.into_message(channel.id().to_string());
@@ -120,7 +120,7 @@ pub async fn ingress(
let channel_id = channel_id.to_internal_error()?;
let user_id = user_id.to_internal_error()?;
let channel = Reference::from_unchecked(channel_id.clone())
let channel = Reference::from_unchecked(&channel_id)
.as_channel(db)
.await?;
@@ -147,7 +147,7 @@ pub async fn ingress(
take_channel_call_started_system_message(channel_id).await?
{
// Could have been deleted
if let Ok(mut message) = Reference::from_unchecked(system_message_id)
if let Ok(mut message) = Reference::from_unchecked(&system_message_id)
.as_message(db)
.await
{
@@ -179,11 +179,11 @@ pub async fn ingress(
let user_id = user_id.to_internal_error()?;
let track = event.track.as_ref().to_internal_error()?;
let channel = Reference::from_unchecked(channel_id.clone())
let channel = Reference::from_unchecked(&channel_id)
.as_channel(db)
.await?;
let user = Reference::from_unchecked(user_id.clone())
let user = Reference::from_unchecked(&user_id)
.as_user(db)
.await?;