1 files changed, 38 insertions, 1 deletions

diff --git a/src/main.rs b/src/main.rs
index 4e308b8..8d11d76 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
@@ -236,6 +236,43 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
                 poise::builtins::register_globally(ctx, &framework.options().commands).await?;
 
+                // Discord keeps global commands that disappear from the
+                // registration payload. Delete leftovers from renamed or
+                // removed commands so the move under `/music` is visible.
+                let expected: HashSet<String> = framework
+                    .options()
+                    .commands
+                    .iter()
+                    .map(|command| {
+                        command
+                            .context_menu_name
+                            .clone()
+                            .unwrap_or_else(|| command.name.clone())
+                    })
+                    .collect();
+                match ctx.http.get_global_commands().await {
+                    Ok(existing) => {
+                        for command in existing {
+                            if !expected.contains(&command.name) {
+                                match ctx.http.delete_global_command(command.id).await {
+                                    Ok(()) => tracing::info!(
+                                        command = %command.name,
+                                        "removed stale global command"
+                                    ),
+                                    Err(e) => tracing::warn!(
+                                        command = %command.name,
+                                        error = %e,
+                                        "failed to remove stale global command"
+                                    ),
+                                }
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        tracing::warn!(error = %e, "could not list global commands for cleanup")
+                    }
+                }
+
                 events::handle_ready(ctx).await.map_err(|e| {
                     tracing::error!("on_ready handler: {e}");
                     e