forked from jmug/stoatchat
fix: store server id in redis and in room metadata to be able to delete voice state in all scenarios (#656)
* fix: store server id in redis values and in room metadata to be able to fully delete voice state in all scenarios * fix: undo logging change
This commit is contained in:
@@ -1,6 +1,9 @@
|
||||
use revolt_database::{
|
||||
util::{permissions::DatabasePermissionQuery, reference::Reference},
|
||||
voice::{get_user_voice_channel_in_server, remove_user_from_voice_channel, VoiceClient},
|
||||
voice::{
|
||||
get_user_voice_channel_in_server, remove_user_from_voice_channel, UserVoiceChannel,
|
||||
VoiceClient,
|
||||
},
|
||||
Database, RemovalIntention, ServerBan, User,
|
||||
};
|
||||
use revolt_models::v0;
|
||||
@@ -58,8 +61,16 @@ pub async fn ban(
|
||||
.await?;
|
||||
|
||||
// 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(&target.id, &server.id).await? {
|
||||
remove_user_from_voice_channel(db, voice_client, &channel_id, &target.id).await?;
|
||||
if let Some(channel_id) = get_user_voice_channel_in_server(target.id, &server.id).await? {
|
||||
remove_user_from_voice_channel(
|
||||
voice_client,
|
||||
&UserVoiceChannel {
|
||||
id: channel_id,
|
||||
server_id: Some(server.id.clone()),
|
||||
},
|
||||
target.id,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user