From 3fd19eb149158983ae93aff11efd4d204582bb16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=BCller?= <ekicilp@gmail.com>
Date: Fri, 1 Apr 2022 18:53:07 +0200
Subject: [PATCH] fix playlist playback nicely

---
 TomatenMusic/Services/TomatenMusicService.cs  |  4 ++--
 TomatenMusicCore/Commands/PlayCommandGroup.cs |  4 ++--
 TomatenMusicCore/Music/GuildPlayer.cs         | 21 -------------------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/TomatenMusic/Services/TomatenMusicService.cs b/TomatenMusic/Services/TomatenMusicService.cs
index a6780ee..1ca8fde 100644
--- a/TomatenMusic/Services/TomatenMusicService.cs
+++ b/TomatenMusic/Services/TomatenMusicService.cs
@@ -46,9 +46,9 @@ namespace TomatenMusic_Api
 			if (e.Response.IsPlaylist)
             {
 				if (e.Now)
-					await player.PlayPlaylistNowAsync(e.Response.Playlist);
+					await player.PlayNowAsync(e.Response.Playlist);
 				else
-					await player.PlayPlaylistAsync(e.Response.Playlist);
+					await player.PlayItemAsync(e.Response.Playlist);
 			}else
             {
 				if (e.Now)
diff --git a/TomatenMusicCore/Commands/PlayCommandGroup.cs b/TomatenMusicCore/Commands/PlayCommandGroup.cs
index 736594d..b7095f8 100644
--- a/TomatenMusicCore/Commands/PlayCommandGroup.cs
+++ b/TomatenMusicCore/Commands/PlayCommandGroup.cs
@@ -84,7 +84,7 @@ namespace TomatenMusic.Commands
                     if (response.IsPlaylist)
                     {
                         ILavalinkPlaylist playlist = response.Playlist;
-                        await player.PlayPlaylistNowAsync(playlist);
+                        await player.PlayNowAsync(playlist);
 
                         _ = ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Now Playing:").AddEmbed(
                         Common.AsEmbed(playlist)
@@ -237,7 +237,7 @@ namespace TomatenMusic.Commands
                     if (response.IsPlaylist)
                     {
                         ILavalinkPlaylist playlist = response.Playlist;
-                        await player.PlayPlaylistAsync(playlist);
+                        await player.PlayItemAsync(playlist);
 
                         await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Now Playing:").AddEmbed(
                         Common.AsEmbed(playlist)
diff --git a/TomatenMusicCore/Music/GuildPlayer.cs b/TomatenMusicCore/Music/GuildPlayer.cs
index 3de4f45..c877454 100644
--- a/TomatenMusicCore/Music/GuildPlayer.cs
+++ b/TomatenMusicCore/Music/GuildPlayer.cs
@@ -64,27 +64,6 @@ namespace TomatenMusic.Music
             QueuePrompt.UpdateFor(GuildId);
         }
 
-        public async Task PlayPlaylistAsync(ILavalinkPlaylist playlist)
-        {
-            EnsureNotDestroyed();
-            EnsureConnected();
-
-            _ = playlist.Play(this);
-            _logger.LogInformation("Started playing Playlist {0} on Guild {1}", playlist.Title, (await GetGuildAsync()).Name);
-
-
-            QueuePrompt.UpdateFor(GuildId);
-        }
-
-        public async Task PlayPlaylistNowAsync(ILavalinkPlaylist playlist)
-        {
-            EnsureConnected();
-            EnsureNotDestroyed();
-
-
-            QueuePrompt.UpdateFor(GuildId);
-        }
-
         public async Task RewindAsync()
         {
             EnsureNotDestroyed();