Implement voice keepalive feature and enhance command validations

app.py

@@ -15,6 +15,7 @@ if os.path.exists("assets") is False:
         "not-lain/assets", "lofi.mp3", repo_type="dataset", local_dir="assets"
     )
 
+song = "assets/lofi.mp3"
 
 # Bot configuration
 intents = discord.Intents.default()
@@ -26,12 +27,30 @@ class MusicBot:
     def __init__(self):
         self.is_playing = False
         self.voice_client = None
+        self.keepalive_task = None
+        self.last_context = None
+
+    async def voice_keepalive(self, voice_client):
+        """Keeps the voice connection alive by periodically playing audio"""
+        print("Starting voice keepalive task")
+        while True:
+            if voice_client.is_connected() and not self.is_playing:
+                await self.play_next(self.last_context)
+                await asyncio.sleep(15)
+            else:
+                await asyncio.sleep(1)
 
     async def join_voice(self, ctx):
         if ctx.author.voice:
             channel = ctx.author.voice.channel
             if self.voice_client is None:
                 self.voice_client = await channel.connect()
+                self.last_context = ctx
+                if self.keepalive_task:
+                    self.keepalive_task.cancel()
+                self.keepalive_task = asyncio.create_task(
+                    self.voice_keepalive(self.voice_client)
+                )
             else:
                 await self.voice_client.move_to(channel)
         else:
@@ -41,14 +60,10 @@ class MusicBot:
         if not self.is_playing:
             self.is_playing = True
             try:
-                audio_source = discord.FFmpegPCMAudio("assets/lofi.mp3")
+                audio_source = discord.FFmpegPCMAudio(song)
 
                 def after_playing(e):
                     self.is_playing = False
-                    # test loop by default
-                    if e:
-                        print(f"Playback error: {e}")
-                    asyncio.run_coroutine_threadsafe(self.play_next(ctx), bot.loop)
 
                 self.voice_client.play(audio_source, after=after_playing)
             except Exception as e:
@@ -56,6 +71,35 @@ class MusicBot:
                 await ctx.send("Error playing the song.")
                 self.is_playing = False
 
+    async def stop_playing(self, ctx):
+        try:
+            if self.keepalive_task:
+                self.keepalive_task.cancel()
+                self.keepalive_task = None
+
+            if self.voice_client:
+                if self.voice_client.is_playing():
+                    self.voice_client.stop()
+
+                self.is_playing = False
+                self.last_context = None
+
+                if self.voice_client.is_connected():
+                    await self.voice_client.disconnect(force=False)
+
+                self.voice_client = None
+                return True
+
+            return False
+
+        except Exception as e:
+            print(f"Error during cleanup: {e}")
+            self.is_playing = False
+            self.voice_client = None
+            self.last_context = None
+            self.keepalive_task = None
+            return False
+
 
 music_bot = MusicBot()
 
@@ -76,7 +120,7 @@ async def on_ready():
 @bot.tree.command(name="play", description="Play the sample music")
 async def play(interaction: discord.Interaction):
     await interaction.response.defer()
-    ctx = await commands.Context.from_interaction(interaction)
+    ctx = await bot.get_context(interaction)
     await music_bot.join_voice(ctx)
 
     if not music_bot.is_playing:
@@ -86,27 +130,70 @@ async def play(interaction: discord.Interaction):
         await interaction.followup.send("Already playing!")
 
 
-# Replace the existing skip command with this version
 @bot.tree.command(name="skip", description="Skip the current song")
 async def skip(interaction: discord.Interaction):
-    if music_bot.voice_client:
+    # Check if user is in a voice channel
+    if not interaction.user.voice:
+        await interaction.response.send_message(
+            "You must be in a voice channel to use this command!"
+        )
+        return
+
+    # Check if bot is in a voice channel
+    if not music_bot.voice_client:
+        await interaction.response.send_message("No song is currently playing!")
+        return
+
+    # Check if user is in the same channel as the bot
+    if interaction.user.voice.channel != music_bot.voice_client.channel:
+        await interaction.response.send_message(
+            "You must be in the same voice channel as the bot!"
+        )
+        return
+
+    if music_bot.voice_client and music_bot.is_playing:
+        music_bot.is_playing = False  # Reset playing state
         music_bot.voice_client.stop()
         await interaction.response.send_message("Skipped current song!")
     else:
         await interaction.response.send_message("No song is currently playing!")
 
 
-# Replace the existing leave command with this version
 @bot.tree.command(name="leave", description="Disconnect bot from voice channel")
 async def leave(interaction: discord.Interaction):
-    if music_bot.voice_client:
-        await music_bot.voice_client.disconnect()
-        music_bot.voice_client = None
-        music_bot.queue = []
-        music_bot.is_playing = False
-        await interaction.response.send_message("Bot disconnected!")
-    else:
-        await interaction.response.send_message("Bot is not in a voice channel!")
+    # Check if user is in a voice channel
+    if not interaction.user.voice:
+        await interaction.response.send_message(
+            "You must be in a voice channel to use this command!"
+        )
+        return
+
+    # Check if bot is in a voice channel
+    if not music_bot.voice_client:
+        await interaction.response.send_message("I'm not in any voice channel!")
+        return
+
+    # Check if user is in the same channel as the bot
+    if interaction.user.voice.channel != music_bot.voice_client.channel:
+        await interaction.response.send_message(
+            "You must be in the same voice channel as the bot!"
+        )
+        return
+
+    await interaction.response.defer()
+    ctx = await bot.get_context(interaction)
+
+    try:
+        success = await music_bot.stop_playing(ctx)
+        if success:
+            await interaction.followup.send("Successfully disconnected! 👋")
+        else:
+            await interaction.followup.send(
+                "Failed to disconnect properly. Please try again."
+            )
+    except Exception as e:
+        print(f"Error during leave command: {e}")
+        await interaction.followup.send("An error occurred while trying to disconnect.")
 
 
 def run_discord_bot():
@@ -118,6 +205,7 @@ with gr.Blocks() as iface:
     gr.Markdown("# Discord Music Bot Control Panel")
     gr.Markdown("Bot is running in background")
 
+
 if __name__ == "__main__":
     # Start the Discord bot in a separate thread
     bot_thread = threading.Thread(target=run_discord_bot, daemon=True)