From 03611e3226ab61e13c79d93b72a47bfd4c7d8ca4 Mon Sep 17 00:00:00 2001 From: Marcin Macierzanka Date: Fri, 21 Aug 2026 17:19:36 +0200 Subject: [PATCH] fix: preserve plays on stop and disconnect --- zyrarbot/ui/api/routers/playback_router.py | 1 - zyrarbot/ui/api/routers/voice_router.py | 1 - zyrarbot/ui/bot/cogs/control_cog.py | 1 - zyrarbot/ui/bot/cogs/voice_cog.py | 2 -- 4 files changed, 5 deletions(-) diff --git a/zyrarbot/ui/api/routers/playback_router.py b/zyrarbot/ui/api/routers/playback_router.py index 3878758..ba2c053 100644 --- a/zyrarbot/ui/api/routers/playback_router.py +++ b/zyrarbot/ui/api/routers/playback_router.py @@ -133,7 +133,6 @@ async def stop( player: MusicPlayer = Depends(get_player), broadcaster: StatusBroadcaster = Depends(get_broadcaster), ) -> dict[str, str]: - player.finish_current(guild.id) player.save_queue(guild.id) if player.is_active(guild.id): player.voice_client(guild.id).stop() diff --git a/zyrarbot/ui/api/routers/voice_router.py b/zyrarbot/ui/api/routers/voice_router.py index 5023169..22c55dc 100644 --- a/zyrarbot/ui/api/routers/voice_router.py +++ b/zyrarbot/ui/api/routers/voice_router.py @@ -90,7 +90,6 @@ async def disconnect( if not voice_client: raise HTTPException(status_code=400, detail="Bot not connected to voice on this server") - player.finish_current(guild.id) player.save_queue(guild.id) await voice_client.disconnect() player.clear(guild.id) diff --git a/zyrarbot/ui/bot/cogs/control_cog.py b/zyrarbot/ui/bot/cogs/control_cog.py index 1a552c9..5dfaaf0 100644 --- a/zyrarbot/ui/bot/cogs/control_cog.py +++ b/zyrarbot/ui/bot/cogs/control_cog.py @@ -49,7 +49,6 @@ class ControlCog(MusicCogBase, name="Control"): async def stop(self, interaction: discord.Interaction) -> None: guild_id = interaction.guild.id voice_client = interaction.guild.voice_client - self.player.finish_current(guild_id) self.player.save_queue(guild_id) if voice_client and voice_client.is_playing(): voice_client.stop() diff --git a/zyrarbot/ui/bot/cogs/voice_cog.py b/zyrarbot/ui/bot/cogs/voice_cog.py index eb9872e..a99f0e8 100644 --- a/zyrarbot/ui/bot/cogs/voice_cog.py +++ b/zyrarbot/ui/bot/cogs/voice_cog.py @@ -23,7 +23,6 @@ class VoiceCog(MusicCogBase, name="Voice"): and after.channel is None ) if is_bot_leaving: - self.player.finish_current(before.channel.guild.id) self.player.save_queue(before.channel.guild.id) self.player.clear(before.channel.guild.id) await self.player.trigger_state_change() @@ -35,7 +34,6 @@ class VoiceCog(MusicCogBase, name="Voice"): "Nie jestem na kanale głosowym.", ephemeral=True ) return - self.player.finish_current(interaction.guild.id) self.player.save_queue(interaction.guild.id) await interaction.guild.voice_client.disconnect() self.player.clear(interaction.guild.id)