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

fix: bots in multiple voice channel logic (#544)

Browse Source
This commit is contained in:
Angelo Kontaxis
2026-02-13 00:11:15 +00:00
committed by GitHub
parent 95c7dbc793
commit 94cb916231
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crates/core/database/src/voice/mod.rs
View File

@@ -22,23 +22,25 @@ async fn get_connection() -> Result<Conn> {
pub async fn raise_if_in_voice(user: &User, channel_id: &str) -> Result<()> { pub async fn raise_if_in_voice(user: &User, channel_id: &str) -> Result<()> {
let mut conn = get_connection().await?; let mut conn = get_connection().await?;
if user.bot.is_some() if user.bot.is_some() {
// bots can be in as many voice channels as it wants so we just check if its already connected to the one its trying to connect to // bots can be in as many voice channels as it wants so we just check if its already connected to the one its trying to connect to
&& conn.sismember(format!("vc:{}", &user.id), channel_id) if conn
.sismember(format!("vc:{}", &user.id), channel_id)
.await .await
.to_internal_error()? .to_internal_error()?
{ {
Err(create_error!(AlreadyConnected)) return Err(create_error!(AlreadyConnected));
};
} else if conn } else if conn
.scard::<_, u32>(format!("vc:{}", &user.id)) // check if the current vc set is empty .scard::<_, u32>(format!("vc:{}", &user.id)) // check if the current vc set is empty
.await .await
.to_internal_error()? .to_internal_error()?
> 0 > 0
{ {
Err(create_error!(AlreadyConnected)) return Err(create_error!(AlreadyConnected));
} else { };
Ok(())
} Ok(())
} }
pub async fn set_channel_node(channel: &str, node: &str) -> Result<()> { pub async fn set_channel_node(channel: &str, node: &str) -> Result<()> {