mii/ncb-tts-r2
1
0
Fork 0
mirror of https://github.com/mii443/ncb-tts-r2.git synced 2025-08-22 16:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

check users before restoring instance

Browse Source
This commit is contained in:
mii443
2025-05-26 00:02:00 +09:00
parent d382a045d0
commit c4819bb633
2 changed files with 86 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/events/ready.rs
View File

@ -55,6 +55,57 @@ async fn restore_tts_instances(ctx: &Context) {
let mut failed_count = 0;
for (guild_id, instance) in instances {
// Check if there are users in the voice channel before reconnecting
let should_reconnect = match guild_id.channels(&ctx.http).await {
Ok(channels) => {
if let Some(channel) = channels.get(&instance.voice_channel) {
match channel.members(&ctx.cache) {
Ok(members) => {
let user_count =
members.iter().filter(|member| !member.user.bot).count();
user_count > 0
}
Err(_) => {
// If we can't get members, assume there are no users
tracing::warn!(
"Failed to get members for voice channel {} in guild {}",
instance.voice_channel,
guild_id
);
false
}
}
} else {
// Channel doesn't exist anymore
tracing::warn!(
"Voice channel {} no longer exists in guild {}",
instance.voice_channel,
guild_id
);
false
}
}
Err(_) => {
// If we can't get channels, assume reconnection should not happen
tracing::warn!("Failed to get channels for guild {}", guild_id);
false
}
};
if !should_reconnect {
// Remove instance from database as the channel is empty or doesn't exist
failed_count += 1;
tracing::info!("Skipping reconnection for guild {} - no users in voice channel or channel doesn't exist", guild_id);
if let Err(db_err) = database.remove_tts_instance(guild_id).await {
tracing::error!(
"Failed to remove empty TTS instance from database: {}",
db_err
);
}
continue;
}
// Try to reconnect to voice channel
match instance.reconnect(ctx).await {
Ok(_) => {

35
src/tts/instance.rs
View File

@ -55,6 +55,41 @@ impl TTSInstance {
self.voice_channel,
self.guild
);
// Double-check if there are users in the voice channel after connection
match self.guild.channels(&ctx.http).await {
Ok(channels) => {
if let Some(channel) = channels.get(&self.voice_channel) {
match channel.members(&ctx.cache) {
Ok(members) => {
let user_count =
members.iter().filter(|member| !member.user.bot).count();
if user_count == 0 {
tracing::info!("No users found in voice channel after reconnection, disconnecting from guild {}", self.guild);
// Disconnect if no users are present
let _ = manager.remove(self.guild).await;
return Err(
"No users in voice channel after reconnection".into()
);
}
}
Err(_) => {
tracing::warn!(
"Failed to verify members after reconnection for guild {}",
self.guild
);
}
}
}
}
Err(_) => {
tracing::warn!(
"Failed to get channels after reconnection for guild {}",
self.guild
);
}
}
Ok(())
}
Err(e) => {