Clean up consumers: replace polling with VoiceManager.play_source()

- cron.py: replace while-is_playing polling with VoiceManager.play_source()
- vclogs.py: replace while-is_playing polling with VoiceManager.play_source()
- stop.py: use VoiceManager.disconnect() instead of raw voice_client
- join.py: use VoiceManager.connect() instead of raw channel.connect()
- voice.py: add back join_by_channel_id() convenience method
- Tests: update for new VoiceManager method names and signatures

3 files changed, 18 insertions, 15 deletions

diff --git a/tests/cogs/test_music_audio.py b/tests/cogs/test_music_audio.py
index 705f1b3..150ad5d 100644
--- a/tests/cogs/test_music_audio.py
+++ b/tests/cogs/test_music_audio.py
@@ -59,7 +59,7 @@ async def test_prepare_file_source_absolute_path():
 async def test_prepare_source_url():
     from cogs.music.audio_playback import 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"
@@ -70,7 +70,7 @@ async def test_prepare_source_local_file():
     from cogs.music.audio_playback import 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"
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)