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/commands/music.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/commands/music.rs')

diff --git a/src/commands/music.rs b/src/commands/music.rs
index d2861e4..05abb9c 100644
--- a/src/commands/music.rs
+++ b/src/commands/music.rs
@@ -220,11 +220,10 @@ fn redact_url(url: &str) -> &str {
 /// yt-dlp only needs `?v=ID`; extra `&` params can cause failures.
 pub(crate) fn sanitize_yt_url(url: &str) -> String {
     let lower = url.to_lowercase();
-    if lower.contains("youtube.com/") || lower.contains("youtu.be/") {
-        if let Some(pos) = url.find('&') {
+    if (lower.contains("youtube.com/") || lower.contains("youtu.be/"))
+        && let Some(pos) = url.find('&') {
             return url[..pos].to_string();
         }
-    }
     url.to_string()
 }
 
@@ -241,7 +240,7 @@ async fn play_impl(
 ) -> Result<()> {
     ctx.defer().await?;
 
-    let guild_id = ctx.guild_id().ok_or_else(|| lang::err_not_in_guild())?;
+    let guild_id = ctx.guild_id().ok_or_else(lang::err_not_in_guild)?;
 
     let channel_id = ctx
         .serenity_context()
@@ -252,7 +251,7 @@ async fn play_impl(
                 .get(&ctx.author().id)
                 .and_then(|vs| vs.channel_id)
         })
-        .ok_or_else(|| lang::err_not_in_voice())?;
+        .ok_or_else(lang::err_not_in_voice)?;
 
     let src = resolve_source(ctx, melodia, file).await?;
 
@@ -373,7 +372,7 @@ async fn play_impl(
 /// Stop playback and disconnect from voice
 #[poise::command(slash_command)]
 pub async fn stop(ctx: Context<'_>) -> Result<()> {
-    let guild_id = ctx.guild_id().ok_or_else(|| lang::err_not_in_guild())?;
+    let guild_id = ctx.guild_id().ok_or_else(lang::err_not_in_guild)?;
     ctx.data().voice_manager.disconnect(guild_id).await?;
     ctx.data().music_tracks.lock().await.remove(&guild_id.get());
     ctx.send(
@@ -389,7 +388,7 @@ pub async fn stop(ctx: Context<'_>) -> Result<()> {
 #[poise::command(slash_command)]
 pub async fn join(ctx: Context<'_>) -> Result<()> {
     ctx.defer().await?;
-    let guild_id = ctx.guild_id().ok_or_else(|| lang::err_not_in_guild())?;
+    let guild_id = ctx.guild_id().ok_or_else(lang::err_not_in_guild)?;
 
     let channel_id = ctx.serenity_context().cache.guild(guild_id).and_then(|g| {
         g.voice_states
-- 
cgit v1.2.3