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, 12 insertions, 7 deletions

diff --git a/cogs/vclogs.py b/cogs/vclogs.py
index e5ca202..35826d4 100644
--- a/cogs/vclogs.py
+++ b/cogs/vclogs.py
@@ -116,7 +116,7 @@ class VcLogs(commands.Cog):
 
         voice_mgr = self.get_voice_manager()
         temp_dir = get_temp_dir()
-        tts_file = os.path.join(temp_dir, f"temp_tts_{os.getpid()}.mp3")
+        tts_file = os.path.join(temp_dir, f"temp_tts_{os.getpid()}_{asyncio.get_event_loop().time()}.mp3")
         tts = gTTS(text=text, lang='pl')
         logger.info("saving file")
 
@@ -129,6 +129,16 @@ class VcLogs(commands.Cog):
             is_connected = voice_status[1] if voice_status else False
             is_playing = voice_status[2] if voice_status else False
 
+            if is_connected:
+                from cogs.voice import is_voice_client_alive
+                if not is_voice_client_alive(voice_client, channel.guild):
+                    logger.warning("Stale voice client in play_tts, reconnecting")
+                    try:
+                        await voice_client.disconnect()
+                    except Exception:
+                        pass
+                    is_connected = False
+
             if not is_connected:
                 voice_client = await voice_mgr.join_channel(channel)
                 voice_status = await voice_mgr.get_voice_status(channel.guild)
@@ -150,12 +160,7 @@ class VcLogs(commands.Cog):
 
                 logger.info("preparing to play audio")
                 audio_source = discord.FFmpegPCMAudio(tts_file)
-                if volume != 1.0:
-                    audio_source = discord.PCMVolumeTransformer(audio_source)
-                    audio_source.volume = volume
-                voice_client.play(audio_source)
-                while voice_client.is_playing():
-                    await asyncio.sleep(0.1)
+                await voice_mgr.play_source(channel, audio_source, volume=volume)
         except Exception as e:
             logger.error(f"TTS playback error: {e}")
         finally: