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

fix: dont break on user not still being in channel and force disconnecting

Browse Source
This commit is contained in:
Zomatree
2025-10-20 00:07:06 +01:00
parent 6ab264eb36
commit 43118c853c
7 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,7 +244,7 @@ pub async fn ingress(
if disconnect { if disconnect {
log::debug!("Removing user {user_id} from channel {channel_id} {event:?} due to forbidden track."); log::debug!("Removing user {user_id} from channel {channel_id} {event:?} due to forbidden track.");
voice_client.remove_user(node, user_id, channel_id).await?; let _ = voice_client.remove_user(node, user_id, channel_id).await;
delete_voice_state(channel_id, channel.server(), user_id).await?; delete_voice_state(channel_id, channel.server(), user_id).await?;
return Ok(EmptyResponse); return Ok(EmptyResponse);

7
crates/delta/src/routes/bots/delete.rs
View File

@@ -22,10 +22,11 @@ pub async fn delete_bot(
bot.delete(db).await?; bot.delete(db).await?;
for channel_id in get_user_voice_channels(&bot.id).await? { for channel_id in get_user_voice_channels(&bot.id).await? {
let node = get_channel_node(&channel_id).await?.unwrap(); if let Some(node) = get_channel_node(&channel_id).await? {
let channel = Reference::from_unchecked(&channel_id).as_channel(db).await?; let _ = voice_client.remove_user(&node, &bot.id, &channel_id).await;
}
voice_client.remove_user(&node, &bot.id, &channel_id).await?; let channel = Reference::from_unchecked(&channel_id).as_channel(db).await?;
delete_voice_state(&channel_id, channel.server(), &bot.id).await?; delete_voice_state(&channel_id, channel.server(), &bot.id).await?;
} }

5
crates/delta/src/routes/channels/group_remove_member.rs
View File

@@ -48,9 +48,10 @@ pub async fn remove_member(
}; };
if is_in_voice_channel(&user.id, channel.id()).await? { if is_in_voice_channel(&user.id, channel.id()).await? {
let node = get_channel_node(channel.id()).await?.unwrap(); if let Some(node) = get_channel_node(channel.id()).await? {
let _ = voice_client.remove_user(&node, &user.id, channel.id()).await;
}
voice_client.remove_user(&node, &user.id, channel.id()).await?;
delete_voice_state(channel.id(), None, &user.id).await?; delete_voice_state(channel.id(), None, &user.id).await?;
}; };

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

@@ -79,15 +79,15 @@ pub async fn call(
// should only ever loop once but just to cover our backs. // should only ever loop once but just to cover our backs.
for channel_id in get_user_voice_channels(&user.id).await? { for channel_id in get_user_voice_channels(&user.id).await? {
let node = get_channel_node(&channel_id).await?.unwrap(); if let Some(node) = get_channel_node(&channel_id).await? {
// if this errors its just a mismatching state - ignore and proceed to still delete our state
let _ = voice_client.remove_user(&node, &user.id, &channel_id).await;
};
let channel = Reference::from_unchecked(&channel_id) let channel = Reference::from_unchecked(&channel_id)
.as_channel(db) .as_channel(db)
.await?; .await?;
voice_client
.remove_user(&node, &user.id, &channel_id)
.await?;
delete_voice_state(&channel_id, channel.server(), &user.id).await?; delete_voice_state(&channel_id, channel.server(), &user.id).await?;
} }
} else { } else {

6
crates/delta/src/routes/servers/ban_create.rs
View File

@@ -59,9 +59,9 @@ pub async fn ban(
// If the member is in a voice channel while banned kick them from the voice channel // 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? { if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
let node = get_channel_node(&channel_id).await?.unwrap(); if let Some(node) = get_channel_node(&channel_id).await?.unwrap() {
let _ = voice_client.remove_user(&node, &user.id, &channel_id).await;
voice_client.remove_user(&node, &user.id, &channel_id).await?; }
delete_voice_state(&channel_id, Some(&server.id), &user.id).await? delete_voice_state(&channel_id, Some(&server.id), &user.id).await?
} }

6
crates/delta/src/routes/servers/member_remove.rs
View File

@@ -47,9 +47,9 @@ pub async fn kick(
.await?; .await?;
if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? { if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
let node = get_channel_node(&channel_id).await?.unwrap(); if let Some(node) = get_channel_node(&channel_id).await? {
let _ = voice_client.remove_user(&node, &user.id, &channel_id).await;
voice_client.remove_user(&node, &user.id, &channel_id).await?; }
delete_voice_state(&channel_id, Some(&server.id), &user.id).await?; delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
}; };

6
crates/delta/src/routes/servers/server_delete.rs
View File

@@ -39,9 +39,9 @@ pub async fn delete(
} else { } else {
if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? { if let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
if server.channels.iter().any(|c| c == &channel_id) { if server.channels.iter().any(|c| c == &channel_id) {
let node = get_channel_node(&channel_id).await?.unwrap(); if let Some(node) = get_channel_node(&channel_id).await? {
let _ = voice_client.remove_user(&node, &user.id, &channel_id).await;
voice_client.remove_user(&node, &user.id, &channel_id).await?; }
delete_voice_state(&channel_id, Some(&server.id), &user.id).await?; delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
} }