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, 6 insertions, 5 deletions

diff --git a/cogs/music/play_commands.py b/cogs/music/play_commands.py
index 80a30ef..c6a55b0 100644
--- a/cogs/music/play_commands.py
+++ b/cogs/music/play_commands.py
@@ -17,10 +17,11 @@ import discord
 from discord.commands import OptionChoice
 from discord.ext import commands
 
-from cogs.music import audio_playback, media_processing
+from cogs.music import media_processing
 from cogs.utils.file_search import UniversalSearcher
 from cogs.utils.settings import get_uploadurl
 from cogs.utils.url_helper import clean_url_for_ytdlp
+from cogs.voice import get_voice_manager
 
 logger = logging.getLogger(__name__)
 
@@ -163,7 +164,7 @@ class PlayCommands(commands.Cog):
             if not compressed_path:
                 return
 
-            await audio_playback.AudioPlaybackManager.play(
+            await get_voice_manager(self.bot).play(
                 ctx, compressed_path, delete_after_play=True
             )
         except Exception as e:
@@ -210,7 +211,7 @@ class PlayCommands(commands.Cog):
 
             upload_task = asyncio.create_task(self._upload_to_copyparty_async(local_path))
 
-            await audio_playback.AudioPlaybackManager.play(
+            await get_voice_manager(self.bot).play(
                 ctx, local_path, delete_after_play=True
             )
 
@@ -266,7 +267,7 @@ class PlayCommands(commands.Cog):
         if compressed:
             await self._handle_compressed_file_play(ctx, url)
         else:
-            await audio_playback.AudioPlaybackManager.play(ctx, url)
+            await get_voice_manager(self.bot).play(ctx, url)
 
     @discord.slash_command(name="grajcuj", description="grajcujmy wszyscy!")
     async def play(
@@ -301,7 +302,7 @@ class PlayCommands(commands.Cog):
         if file:
             file_path: PathLike[str] | str = os.path.join(self.temp_dir, file.filename)
             await file.save(file_path)
-            await audio_playback.AudioPlaybackManager.play(ctx, file_path)
+            await get_voice_manager(self.bot).play(ctx, file_path)
         else:
             try:
                 if EXTERNAL_URL_PATTERN.match(melodia.lower()):