Fix playlist issue

Author: standleypg

src/Application/DTOs/PlayRequest.cs

@@ -8,6 +8,8 @@ public abstract class PlayRequest
     public Func<string, Task> Callbacks { get; set; } = null!;
 
     public abstract object ContextAsObject { get; }
+    public string? VideoTitle { get; set; }
+    public string? VideoUrl { get; set; }
 }
 
 public class PlayRequest<TContext> : PlayRequest

src/Domain/Common/Constants.cs

@@ -7,6 +7,7 @@ public static class Constants
     public static class CustomIds
     {
         public const string Play = nameof(EventType.Play);
+        public const string PlayListPlay = nameof(EventType.PlayListPlay);
         public const string Skip = nameof(EventType.Skip);
         public const string Stop = nameof(EventType.Stop);
     }
@@ -15,6 +16,7 @@ public static class CustomIds
 public class EventType
 {
     public record Play : IEvent;
+    public record PlayListPlay : IEvent;
     public record Stop : IEvent;
     public record Skip : IEvent;
 }

src/Infrastructure/Commands/CommandUtils.cs

@@ -18,12 +18,12 @@ public static class CommandUtils
         };
     }
 
-    internal static IEnumerable<IMessageComponentProperties> CreateComponent<T>(T source)
+    internal static IEnumerable<IMessageComponentProperties> CreateComponent<T>(T source, string id = Constants.CustomIds.Play)
         where T : IEnumerable<ComponentModel>
     {
         return
         [
-            new StringMenuProperties(Constants.CustomIds.Play)
+            new StringMenuProperties(id)
             {
                 Options = source.Select(s => new StringMenuSelectOptionProperties(s.Title, s.Url)
                 {

src/Infrastructure/Commands/MusicActionCommands.cs

@@ -58,11 +58,11 @@ await executor.ExecuteAsync(async serviceProvider =>
                 var songs = queue.GetAllRequests().Select(async r =>
                     {
                         var title = await youtubeService.GetVideoTitleAsync(
-                            (r.ContextAsObject as StringMenuInteractionContext)?.SelectedValues[0],
+                            r.VideoUrl ?? (r.ContextAsObject as StringMenuInteractionContext)?.SelectedValues[0]!,
                             CancellationToken.None);
                         return title;
                     }
-                ).ToList();
+                ).Take(20).ToList();
 
                 var titles = await Task.WhenAll(songs);
 

src/Infrastructure/Commands/MusicPlayCommands.cs

@@ -1,4 +1,5 @@
 using Application.Interfaces.Services;
+using Domain.Common;
 using Microsoft.Extensions.DependencyInjection;
 using NetCord.Rest;
 using NetCord.Services.ApplicationCommands;
@@ -86,11 +87,12 @@ await executor.ExecuteAsync(async serviceProvider =>
             try
             {
                 var playlist = await youtubeClient.Playlists.GetAsync(playlistUrl);
-                var videos = await youtubeClient.Playlists.GetVideosAsync(playlist.Id);
-
+                
                 message.Components =
-                    CommandUtils.CreateComponent(videos.Select(s =>
-                        new CommandUtils.ComponentModel(s.Title, s.Url, s.Author.ChannelTitle)));
+                    CommandUtils.CreateComponent(new List<CommandUtils.ComponentModel>
+                    {
+                        new(playlist.Title, playlist.Id, "Playlist")
+                    }, Constants.CustomIds.PlayListPlay);
 
                 await RespondAsync(InteractionCallback.Message(message));
             }

src/Infrastructure/Interaction/NetCordInteraction.cs

@@ -7,31 +7,25 @@
 using Microsoft.Extensions.Logging;
 using NetCord.Rest;
 using NetCord.Services.ComponentInteractions;
+using YoutubeExplode;
+using YoutubeExplode.Common;
 
 namespace Infrastructure.Interaction;
 
 public class NetCordInteraction(
     ILogger<NetCordInteraction> logger,
     IEventDispatcher eventDispatcher,
     IMusicQueueService queueService,
+    YoutubeClient youtubeClient,
     [FromKeyedServices(nameof(YoutubeService))] IStreamService youtubeService) : ComponentInteractionModule<StringMenuInteractionContext>
 {
     [ComponentInteraction(Constants.CustomIds.Play)]
     public async Task<string> Play()
     {
-        if (!CheckMessageExpiration())
-        {
-            return "This interaction has expired. Please use the play command again.";
-        }
-        
-        if (!NotInVoiceChannel())
-        {
-            return "You must be in a voice channel to use this command.";
-        }
-        
-        if (!NotDeafened())
+        var error = EvaluateChecking();
+        if (error != null)
         {
-            return "You must be deafened to use this command.";
+            return error;
         }
 
         logger.LogInformation("Play command invoked by user {UserId} in guild {GuildId}", Context.User.Id,
@@ -58,7 +52,57 @@ public async Task<string> Play()
         }
 
         return message;
+    }
+    
+    [ComponentInteraction(Constants.CustomIds.PlayListPlay)]
+    public async Task<string> PlayPlaylist()
+    {
+        var error = EvaluateChecking();
+        if (error != null)
+        {
+            return error;
+        }
+        
+        logger.LogInformation("Play command invoked by user {UserId} in guild {GuildId}", Context.User.Id,
+            Context.Guild?.Id);
 
+        var videos = await youtubeClient.Playlists.GetVideosAsync(Context.SelectedValues[0]);
+        
+        foreach (var video in videos)
+        {
+            var playRequest = new PlayRequest<StringMenuInteractionContext>
+            {
+                Context = Context,
+                Callbacks = async message => await RespondAsyncCallback(message),
+                VideoTitle = video.Title,
+                VideoUrl = video.Url
+            };
+            queueService.Enqueue(playRequest);
+        }
+        
+        eventDispatcher.Dispatch(new EventType.Play());
+        
+        return "Playlist Added to the queue!";
+    }
+    
+    private string? EvaluateChecking()
+    {
+        if (!CheckMessageExpiration())
+        {
+            return "This interaction has expired. Please use the play command again.";
+        }
+    
+        if (!NotInVoiceChannel())
+        {
+            return "You must be in a voice channel to use this command.";
+        }
+    
+        if (!NotDeafened())
+        {
+            return "You must be deafened to use this command.";
+        }
+    
+        return null;
     }
 
     private bool NotInVoiceChannel()

…re/Services/NetCordAudioPlayerService.cs …structure/Services/AudioPlayerService.cssrc/Infrastructure/Services/NetCordAudioPlayerService.cs renamed to src/Infrastructure/Services/AudioPlayerService.cs src/Infrastructure/Services/NetCordAudioPlayerService.cs renamed to src/Infrastructure/Services/AudioPlayerService.cs

@@ -12,10 +12,10 @@
 
 namespace Infrastructure.Services;
 
-public class NetCordAudioPlayerService(
+public class AudioPlayerService(
     INativePlaceMusicProcessorService ffmpegProcessService,
     IServiceProvider serviceProvider,
-    ILogger<NetCordAudioPlayerService> logger,
+    ILogger<AudioPlayerService> logger,
     PlayerState<VoiceClient> playerState,
     IMusicQueueService queue) : INetCordAudioPlayerService
 {
@@ -85,8 +85,8 @@ async Task HandleVoiceStream()
                 var radioSourceService = scope.ServiceProvider
                     .GetRequiredService<IRadioSourceService>();
 
-                var selectedValue = _currentTrack.Context.SelectedValues[0];
-                var sourceUrl = await GetSourceUrl(selectedValue, radioSourceService, youTubeService, _currentTrack);
+                var selectedValue = _currentTrack.VideoUrl ?? _currentTrack.Context.SelectedValues[0];
+                var sourceUrl = await GetSourceUrl(selectedValue, radioSourceService, youTubeService, _currentTrack.Context.User.Id, _currentTrack.Context.User.Username, _currentTrack.Context.User.GlobalName);
 
                 await StartFfmpegStream(sourceUrl, stream);
             }
@@ -160,7 +160,7 @@ await ffmpeg.StandardOutput.BaseStream.CopyToAsync(stream,
     }
 
     private async Task<string> GetSourceUrl(string selectedValue, IRadioSourceService radioSourceService,
-        IStreamService youTubeService, PlayRequest<StringMenuInteractionContext> currentTrack)
+        IStreamService youTubeService, ulong userId, string userName, string? globalName)
     {
         string sourceUrl;
 
@@ -186,22 +186,21 @@ private async Task<string> GetSourceUrl(string selectedValue, IRadioSourceServic
                 Url = selectedValue,
                 Title = await youTubeService.GetVideoTitleAsync(selectedValue,
                     playerState.SkipCts.Token),
-                UserId = currentTrack.Context.User.Id
+                UserId = userId
             };
-            ffmpegProcessService.OnProcessStart += () => HandleOnProcessStartAsync(song, currentTrack.Context);
+            ffmpegProcessService.OnProcessStart += () => HandleOnProcessStartAsync(song, userId, userName, globalName);
         }
 
         return sourceUrl;
     }
 
-    private async Task HandleOnProcessStartAsync(SongDtoBase song, StringMenuInteractionContext currentContext)
+    private async Task HandleOnProcessStartAsync(SongDtoBase song, ulong userId, string userName,string? globalName)
     {
         using var scope = serviceProvider.CreateScope();
         var statisticsService = scope.ServiceProvider
             .GetRequiredService<IStatisticsService>();
         await statisticsService
-            .LogSongPlayAsync(currentContext.User.Id, currentContext.User.Username,
-                currentContext.User.GlobalName ?? string.Empty, song)
+            .LogSongPlayAsync(userId, userName, globalName ?? string.Empty, song)
             .ConfigureAwait(false);
 
         playerState.CurrentAction = PlayerAction.Play;

…ructure/Services/NetCordPlayerHandler.cs …Infrastructure/Services/PlayerHandler.cssrc/Infrastructure/Services/NetCordPlayerHandler.cs renamed to src/Infrastructure/Services/PlayerHandler.cs src/Infrastructure/Services/NetCordPlayerHandler.cs renamed to src/Infrastructure/Services/PlayerHandler.cs

@@ -7,9 +7,9 @@
 
 namespace Infrastructure.Services;
 
-public class NetCordPlayerHandler(
+public class PlayerHandler(
     IMusicQueueService queue,
-    ILogger<NetCordPlayerHandler> logger,
+    ILogger<PlayerHandler> logger,
     INetCordAudioPlayerService playerService,
     PlayerState<VoiceClient> playerState)
     : IEventHandler<EventType.Play>, IEventHandler<EventType.Stop>, IEventHandler<EventType.Skip>

src/Worker/DependencyInjection.cs

@@ -49,7 +49,7 @@ public static void AddDiscordServices(this IServiceCollection services, IConfigu
         services.AddSingleton<PlayerState<VoiceClient>>();
         services.AddSingleton<IHttpRequestService, HttpRequestService>();
         services.AddSingleton<INativePlaceMusicProcessorService, FfmpegProcessService>();
-        services.AddSingleton<INetCordAudioPlayerService, NetCordAudioPlayerService>();
+        services.AddSingleton<INetCordAudioPlayerService, AudioPlayerService>();
         services.AddSingleton<IMusicQueueService, MusicQueueService>();
         services.AddSingleton<IScopeExecutor, ScopeExecutor>();