From 7a565f377203ba8e01574952014a23dfa8d94fa3 Mon Sep 17 00:00:00 2001
From: salmonik <salmonik@tuta.io>
Date: Thu, 30 Jul 2026 15:09:51 +0200
Subject: fix: auto completion timing out before ready + fix preexisting warns

---
 src/events/mod.rs | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'src/events/mod.rs')

diff --git a/src/events/mod.rs b/src/events/mod.rs
index 9a193d0..d166993 100644
--- a/src/events/mod.rs
+++ b/src/events/mod.rs
@@ -92,11 +92,10 @@ pub async fn handle_voice_state_update(
     let member = guild_id
         .and_then(|gid| ctx.cache.guild(gid))
         .and_then(|g| g.members.get(&user_id).cloned());
-    if let Some(ref m) = member {
-        if m.user.bot {
+    if let Some(ref m) = member
+        && m.user.bot {
             return Ok(());
         }
-    }
 
     let member_name = member
         .as_ref()
@@ -269,40 +268,37 @@ pub async fn handle_voice_state_update(
     }
 
     // ── TTS for mute/deafen (deaf takes priority with early return) ──
-    if old.as_ref().map_or(false, |v| v.self_deaf) != new.self_deaf {
+    if old.as_ref().is_some_and(|v| v.self_deaf) != new.self_deaf {
         let phrase = if new.self_deaf {
             lang::fmt_ev_deafened(&display_name)
         } else {
             lang::fmt_ev_undeafened(&display_name)
         };
-        if let Some(gid) = guild_id {
-            if let Some(cid) = tts_channel.or(new_channel) {
+        if let Some(gid) = guild_id
+            && let Some(cid) = tts_channel.or(new_channel) {
                 play_tts_in_channel(ctx, data, gid, cid, &phrase).await;
             }
-        }
         return Ok(());
     }
 
-    if old.as_ref().map_or(false, |v| v.self_mute) != new.self_mute {
+    if old.as_ref().is_some_and(|v| v.self_mute) != new.self_mute {
         let phrase = if new.self_mute {
             lang::fmt_ev_muted(&display_name)
         } else {
             lang::fmt_ev_unmuted(&display_name)
         };
-        if let Some(gid) = guild_id {
-            if let Some(cid) = tts_channel.or(new_channel) {
+        if let Some(gid) = guild_id
+            && let Some(cid) = tts_channel.or(new_channel) {
                 play_tts_in_channel(ctx, data, gid, cid, &phrase).await;
             }
-        }
         return Ok(());
     }
 
     // ── Play join/leave TTS if no mute/deafen change ──
-    if let (Some(text), Some(cid)) = (tts_text, tts_channel) {
-        if let Some(gid) = guild_id {
+    if let (Some(text), Some(cid)) = (tts_text, tts_channel)
+        && let Some(gid) = guild_id {
             play_tts_in_channel(ctx, data, gid, cid, &text).await;
         }
-    }
 
     Ok(())
 }
-- 
cgit v1.2.3