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

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

4 files changed, 40 insertions, 35 deletions

diff --git a/tests/cogs/test_music_audio.py b/tests/cogs/test_music_audio.py
index 705f1b3..98c6f6b 100644
--- a/tests/cogs/test_music_audio.py
+++ b/tests/cogs/test_music_audio.py
@@ -6,7 +6,7 @@ from conftest import MockApplicationContext
 
 @pytest.mark.asyncio
 async def test_validate_voice_channel_not_in_voice():
-    from cogs.music.audio_playback import AudioPlaybackManager
+    from cogs.voice import VoiceManager as AudioPlaybackManager
 
     mock_ctx = MagicMock()
     mock_ctx.author.voice = None
@@ -20,7 +20,7 @@ async def test_validate_voice_channel_not_in_voice():
 
 @pytest.mark.asyncio
 async def test_validate_voice_channel_in_voice():
-    from cogs.music.audio_playback import AudioPlaybackManager
+    from cogs.voice import VoiceManager as AudioPlaybackManager
 
     mock_channel = MagicMock()
     mock_ctx = MagicMock()
@@ -35,7 +35,7 @@ async def test_validate_voice_channel_in_voice():
 
 @pytest.mark.asyncio
 async def test_prepare_file_source_file_not_found():
-    from cogs.music.audio_playback import AudioPlaybackManager
+    from cogs.voice import VoiceManager as AudioPlaybackManager
 
     display_name, absolute_path = await AudioPlaybackManager.prepare_file_source("/nonexistent/file.mp3")
 
@@ -45,7 +45,7 @@ async def test_prepare_file_source_file_not_found():
 
 @pytest.mark.asyncio
 async def test_prepare_file_source_absolute_path():
-    from cogs.music.audio_playback import AudioPlaybackManager
+    from cogs.voice import VoiceManager as AudioPlaybackManager
 
     with patch('os.path.exists', return_value=True):
         with patch('os.path.isabs', return_value=True):
@@ -57,9 +57,9 @@ async def test_prepare_file_source_absolute_path():
 
 @pytest.mark.asyncio
 async def test_prepare_source_url():
-    from cogs.music.audio_playback import AudioPlaybackManager
+    from cogs.voice import VoiceManager as AudioPlaybackManager
 
-    source, _, is_url = await AudioPlaybackManager.prepare_source(MagicMock(), "https://example.com/stream")
+    source, _, is_url = await AudioPlaybackManager.prepare_source("https://example.com/stream")
 
     assert is_url == True
     assert source == "https://example.com/stream"
@@ -67,10 +67,10 @@ async def test_prepare_source_url():
 
 @pytest.mark.asyncio
 async def test_prepare_source_local_file():
-    from cogs.music.audio_playback import AudioPlaybackManager
+    from cogs.voice import VoiceManager as AudioPlaybackManager
 
     with patch('os.path.exists', return_value=True):
-        source, display_name, is_url = await AudioPlaybackManager.prepare_source(MagicMock(), "/tmp/test.mp3")
+        source, display_name, is_url = await AudioPlaybackManager.prepare_source("/tmp/test.mp3")
 
         assert is_url == False
         assert display_name == "test"
@@ -78,7 +78,7 @@ async def test_prepare_source_local_file():
 
 @pytest.mark.asyncio
 async def test_cleanup_temp_file():
-    from cogs.music.audio_playback import AudioPlaybackManager
+    from cogs.voice import VoiceManager as AudioPlaybackManager
 
     with patch('os.path.exists', return_value=True):
         with patch('os.remove'):
@@ -87,7 +87,7 @@ async def test_cleanup_temp_file():
 
 @pytest.mark.asyncio
 async def test_cleanup_temp_file_not_exists():
-    from cogs.music.audio_playback import AudioPlaybackManager
+    from cogs.voice import VoiceManager as AudioPlaybackManager
 
     with patch('os.path.exists', return_value=False):
         await AudioPlaybackManager.cleanup_temp_file("/nonexistent/file.mp3")
diff --git a/tests/cogs/test_music_integration.py b/tests/cogs/test_music_integration.py
index 1c0260a..692e1c1 100644
--- a/tests/cogs/test_music_integration.py
+++ b/tests/cogs/test_music_integration.py
@@ -27,18 +27,20 @@ async def test_music_join_stop(music_cog, bot):
     ctx.author.voice.channel = MagicMock()
     ctx.guild = MagicMock()
 
-    voice_client = AsyncMock()
-    ctx.voice_client = voice_client
-
     # Test join
-    ctx.author.voice.channel.connect = AsyncMock(return_value=voice_client)
-    with patch.object(ctx, 'respond', new_callable=AsyncMock):
-        with patch.object(ctx.interaction, 'delete_original_response', new_callable=AsyncMock):
-            await join_cog.join.callback(join_cog, ctx)
-            ctx.author.voice.channel.connect.assert_called_once()
+    mock_vm = MagicMock()
+    mock_vm.connect = AsyncMock()
+    with patch('cogs.music.join.get_voice_manager', return_value=mock_vm):
+        with patch.object(ctx, 'respond', new_callable=AsyncMock):
+            with patch.object(ctx.interaction, 'delete_original_response', new_callable=AsyncMock):
+                await join_cog.join.callback(join_cog, ctx)
+                mock_vm.connect.assert_called_once_with(ctx.author.voice.channel)
 
     # Test stop
-    with patch.object(ctx, 'respond', new_callable=AsyncMock):
-        with patch.object(ctx.interaction, 'delete_original_response', new_callable=AsyncMock):
-            await stop_cog.stop.callback(stop_cog, ctx)
-            voice_client.disconnect.assert_called_once()
+    mock_vm_stop = MagicMock()
+    mock_vm_stop.disconnect = AsyncMock()
+    with patch('cogs.music.stop.get_voice_manager', return_value=mock_vm_stop):
+        with patch.object(ctx, 'respond', new_callable=AsyncMock):
+            with patch.object(ctx.interaction, 'delete_original_response', new_callable=AsyncMock):
+                await stop_cog.stop.callback(stop_cog, ctx)
+                mock_vm_stop.disconnect.assert_called_once_with(ctx.guild)
diff --git a/tests/cogs/test_music_join.py b/tests/cogs/test_music_join.py
index 0176759..b40d93a 100644
--- a/tests/cogs/test_music_join.py
+++ b/tests/cogs/test_music_join.py
@@ -24,16 +24,18 @@ async def test_join_command_success(join_cog, mock_channel, mock_guild, bot, moc
     ctx.author = mock_user
 
     mock_voice_channel = MagicMock()
-    mock_voice = MagicMock()
-    mock_voice_channel.connect = AsyncMock(return_value=mock_voice)
-
     ctx.author.voice = MagicMock()
     ctx.author.voice.channel = mock_voice_channel
 
-    with patch.object(mock_voice_channel, 'connect', new_callable=AsyncMock, return_value=mock_voice):
+    with patch('cogs.music.join.get_voice_manager') as mock_get_vm:
+        mock_vm = MagicMock()
+        mock_vm.connect = AsyncMock()
+        mock_get_vm.return_value = mock_vm
+
         with patch.object(ctx, 'respond', new_callable=AsyncMock):
             with patch.object(ctx.interaction, 'delete_original_response', new_callable=AsyncMock):
                 await join_cog.join.callback(join_cog, ctx)
+                mock_vm.connect.assert_called_once_with(mock_voice_channel)
 
 
 @pytest.mark.asyncio
@@ -42,12 +44,13 @@ async def test_stop_command_success(stop_cog, mock_channel, mock_guild, bot, moc
     ctx.user = mock_user
     ctx.author = mock_user
 
-    mock_voice_client = MagicMock()
-    mock_voice_client.disconnect = AsyncMock()
-    ctx.voice_client = mock_voice_client
+    with patch('cogs.music.stop.get_voice_manager') as mock_get_vm:
+        mock_vm = MagicMock()
+        mock_vm.disconnect = AsyncMock()
+        mock_get_vm.return_value = mock_vm
 
-    with patch.object(ctx, 'respond', new_callable=AsyncMock):
-        with patch.object(ctx.interaction, 'delete_original_response', new_callable=AsyncMock):
-            await stop_cog.stop.callback(stop_cog, ctx)
+        with patch.object(ctx, 'respond', new_callable=AsyncMock):
+            with patch.object(ctx.interaction, 'delete_original_response', new_callable=AsyncMock):
+                await stop_cog.stop.callback(stop_cog, ctx)
 
-            mock_voice_client.disconnect.assert_called_once()
+                mock_vm.disconnect.assert_called_once_with(mock_guild)
diff --git a/tests/cogs/test_voice.py b/tests/cogs/test_voice.py
index 104eea6..6eb226b 100644
--- a/tests/cogs/test_voice.py
+++ b/tests/cogs/test_voice.py
@@ -53,7 +53,7 @@ async def test_voice_manager_get_voice_status_not_connected():
     mock_bot = MagicMock()
     mock_guild = MagicMock()
 
-    with patch('cogs.voice.VoiceManager.get_voice_client', return_value=None):
+    with patch('cogs.voice.VoiceManager.get_client', return_value=None):
         manager = VoiceManager(mock_bot)
         voice_client, is_connected, is_playing = await manager.get_voice_status(mock_guild)
 
@@ -71,7 +71,7 @@ async def test_voice_manager_stop():
     mock_voice_client = MagicMock()
     mock_voice_client.disconnect = AsyncMock()
 
-    with patch('cogs.voice.VoiceManager.get_voice_client', return_value=mock_voice_client):
+    with patch('cogs.voice.VoiceManager.get_client', return_value=mock_voice_client):
         manager = VoiceManager(mock_bot)
         await manager.stop(mock_guild)