Merge pull request 'Voice related fixes, alongside simplifying assistant' (#5) from dev into main

Reviewed-on: https://codeberg.org/salmonik/senator-sperma/pulls/5

1 files changed, 10 insertions, 16 deletions

diff --git a/cogs/cron.py b/cogs/cron.py
index aad43d2..ee88085 100644
--- a/cogs/cron.py
+++ b/cogs/cron.py
@@ -145,29 +145,23 @@ class Cron(commands.Cog):
 
         if isinstance(channel, discord.VoiceChannel):
             voice_mgr = get_voice_manager(self.bot)
-            voice_client = await voice_mgr.join_channel(channel)
-            if not voice_client:
-                if channel.guild.system_channel:
-                    await channel.guild.system_channel.send(
-                        "Nie udano się połączyć z kanałem głosowym"
-                    )
-                return
 
             try:
                 audio_source = discord.FFmpegPCMAudio(audio_url)
-                voice_client.play(audio_source)
+                success = await voice_mgr.play_source(channel, audio_source)
 
-                while voice_client.is_playing():
-                    await asyncio.sleep(1)
+                if success:
+                    logger.info(f"Finished playing audio: {audio_url}")
+                else:
+                    raise Exception("Playback failed")
 
-                logger.info("Audio playback finished normally - disconnecting")
-                await voice_client.disconnect()
-                logger.info(f"Finished playing audio: {audio_url}")
+                await voice_mgr.disconnect(channel.guild)
             except Exception as e:
                 logger.error(f"Error playing audio: {e}")
-                if voice_client.is_connected():
-                    logger.info("Audio playback failed - disconnecting")
-                    await voice_client.disconnect()
+                try:
+                    await voice_mgr.disconnect(channel.guild)
+                except Exception:
+                    pass
                 if channel.guild.system_channel:
                     await channel.guild.system_channel.send(
                         f"Błąd podczas odgrywania audio: {audio_url}"