Compare commits

...
3 Commits
9 changed files with 27 additions and 25 deletions
@@ -25,7 +25,7 @@ struct MigrationInfo {
revision: i32,
}
pub const LATEST_REVISION: i32 = 48; // MUST BE +1 to last migration
pub const LATEST_REVISION: i32 = 49; // MUST BE +1 to last migration
pub async fn migrate_database(db: &MongoDb) {
let migrations = db.col::<Document>("migrations");
@@ -1246,8 +1246,8 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
.expect("Failed to update voice channels");
};
if revision <= 47 {
info!("Running migration [revision 47 / 29-04-2025]: Add Video to default permissions");
if revision <= 48 {
info!("Running migration [revision 48 / 22-10-2025]: Add Video + Listen to default permissions");
db.col::<Document>("servers")
.update_many(
@@ -1255,7 +1255,7 @@ pub async fn run_migrations(db: &MongoDb, revision: i32) -> i32 {
doc! {
"$bit": {
"default_permissions": {
"or": ChannelPermission::Video as i64
"or": (ChannelPermission::Video + ChannelPermission::Speak + ChannelPermission::Listen) as i64
},
}
}
+1 -1
View File
@@ -35,7 +35,7 @@ pub async fn raise_if_in_voice(user: &User, channel_id: &str) -> Result<()> {
.to_internal_error()?
> 0
{
Err(create_error!(NotConnected))
Err(create_error!(AlreadyConnected))
} else {
Ok(())
}
+1 -1
View File
@@ -244,7 +244,7 @@ pub async fn ingress(
if disconnect {
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?;
return Ok(EmptyResponse);
+4 -3
View File
@@ -22,10 +22,11 @@ pub async fn delete_bot(
bot.delete(db).await?;
for channel_id in get_user_voice_channels(&bot.id).await? {
let node = get_channel_node(&channel_id).await?.unwrap();
let channel = Reference::from_unchecked(&channel_id).as_channel(db).await?;
if let Some(node) = get_channel_node(&channel_id).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?;
}
@@ -48,9 +48,10 @@ pub async fn remove_member(
};
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?;
};
@@ -79,15 +79,15 @@ pub async fn call(
// should only ever loop once but just to cover our backs.
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)
.as_channel(db)
.await?;
voice_client
.remove_user(&node, &user.id, &channel_id)
.await?;
delete_voice_state(&channel_id, channel.server(), &user.id).await?;
}
} else {
@@ -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 let Some(channel_id) = get_user_voice_channel_in_server(&user.id, &server.id).await? {
let node = get_channel_node(&channel_id).await?.unwrap();
voice_client.remove_user(&node, &user.id, &channel_id).await?;
if let Some(node) = get_channel_node(&channel_id).await? {
let _ = voice_client.remove_user(&node, &user.id, &channel_id).await;
}
delete_voice_state(&channel_id, Some(&server.id), &user.id).await?
}
@@ -47,9 +47,9 @@ pub async fn kick(
.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();
voice_client.remove_user(&node, &user.id, &channel_id).await?;
if let Some(node) = get_channel_node(&channel_id).await? {
let _ = voice_client.remove_user(&node, &user.id, &channel_id).await;
}
delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
};
@@ -39,9 +39,9 @@ pub async fn delete(
} else {
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) {
let node = get_channel_node(&channel_id).await?.unwrap();
voice_client.remove_user(&node, &user.id, &channel_id).await?;
if let Some(node) = get_channel_node(&channel_id).await? {
let _ = voice_client.remove_user(&node, &user.id, &channel_id).await;
}
delete_voice_state(&channel_id, Some(&server.id), &user.id).await?;
}