Lavalink4net (#3)

* Update readme.md

Test

Migrate from Victoria

* Small fix

---------

Co-authored-by: Myx <info@azaaxin.com>

Bot/Handler/MusicPlayer/DisconnectCommand/DisconnectHandler.cs

@@ -0,0 +1,22 @@
+using Discord.WebSocket;
+using Lavalink4NET;
+using MediatR;
+
+namespace Lunaris2.Handler.MusicPlayer.DisconnectCommand;
+
+public record DisconnectCommand(SocketSlashCommand Message) : IRequest;
+
+public class DisconnectHandler(DiscordSocketClient client, IAudioService audioService) : IRequestHandler<DisconnectCommand>
+{
+    public async Task Handle(DisconnectCommand command, CancellationToken cancellationToken)
+    {
+        var context = command.Message;
+        var player = await audioService.GetPlayerAsync(client, context, connectToVoiceChannel: true);
+
+        if (player is null)
+            return;
+
+        await player.DisconnectAsync(cancellationToken).ConfigureAwait(false);
+        await context.RespondAsync("Disconnected.").ConfigureAwait(false);
+    }
+}

Bot/Handler/MusicPlayer/Extensions.cs

@@ -1,11 +1,46 @@
 using Discord;
 using Discord.WebSocket;
-using Victoria.Node;
+using Lavalink4NET;
+using Lavalink4NET.Players;
+using Lavalink4NET.Players.Queued;
+using Microsoft.Extensions.Options;
 
 namespace Lunaris2.Handler.MusicPlayer;
 
 public static class Extensions
 {
+    public static async ValueTask<QueuedLavalinkPlayer?> GetPlayerAsync(
+        this IAudioService audioService, 
+        DiscordSocketClient client, 
+        SocketSlashCommand context, 
+        bool connectToVoiceChannel = true)
+    {
+        ArgumentNullException.ThrowIfNull(context);
+
+        var retrieveOptions = new PlayerRetrieveOptions(
+            ChannelBehavior: connectToVoiceChannel ? PlayerChannelBehavior.Join : PlayerChannelBehavior.None);
+
+        var playerOptions = new QueuedLavalinkPlayerOptions { HistoryCapacity = 10000 };
+
+        var result = await audioService.Players
+            .RetrieveAsync(context.GetGuild(client).Id, context.GetGuild(client).GetUser(context.User.Id).VoiceChannel.Id, playerFactory: PlayerFactory.Queued, Options.Create(playerOptions), retrieveOptions)
+            .ConfigureAwait(false);
+
+        if (!result.IsSuccess)
+        {
+            var errorMessage = result.Status switch
+            {
+                PlayerRetrieveStatus.UserNotInVoiceChannel => "You are not connected to a voice channel.",
+                PlayerRetrieveStatus.BotNotConnected => "The bot is currently not connected.",
+                _ => "Unknown error.",
+            };
+
+            return null;
+        }
+        
+        return result.Player;
+    }
+    
     public static SocketGuild GetGuild(this SocketSlashCommand message, DiscordSocketClient client)
     {
         if (message.GuildId == null)
@@ -32,25 +67,7 @@ public static class Extensions
     {
         await message.RespondAsync(content, ephemeral: true);
     }
-        
-    public static async Task EnsureConnected(this LavaNode lavaNode)
-    {
-        if(!lavaNode.IsConnected)
-            await lavaNode.ConnectAsync();
-    }
-        
-    public static async Task JoinVoiceChannel(this SocketSlashCommand context, LavaNode lavaNode)
-    {
-        try
-        {
-            var textChannel = context.Channel as ITextChannel;
-            await lavaNode.JoinAsync(context.GetVoiceState().VoiceChannel, textChannel);
-            await context.RespondAsync($"Joined {context.GetVoiceState().VoiceChannel.Name}!");
-        }
-        catch (Exception exception) {
-            Console.WriteLine(exception);
-        }
-    }
+    
         
     public static string GetOptionValueByName(this SocketSlashCommand command, string optionName)
     {

Bot/Handler/MusicPlayer/JoinCommand/JoinHandler.cs

@@ -1,33 +0,0 @@
-using Discord.WebSocket;
-using MediatR;
-using Victoria.Node;
-
-namespace Lunaris2.Handler.MusicPlayer.JoinCommand;
-
-public record JoinCommand(SocketSlashCommand Message) : IRequest;
-
-public class JoinHandler : IRequestHandler<JoinCommand>
-{
-    private readonly LavaNode _lavaNode;
-    private readonly DiscordSocketClient _client;
-    
-    public JoinHandler(LavaNode lavaNode, DiscordSocketClient client)
-    {
-        _lavaNode = lavaNode;
-        _client = client;
-    }
-    
-    public async Task Handle(JoinCommand command, CancellationToken cancellationToken)
-    {
-        var context = command.Message;
-        
-        await _lavaNode.EnsureConnected();
-
-        if (_lavaNode.HasPlayer(context.GetGuild(_client))) {
-            await context.RespondAsync("I'm already connected to a voice channel!");
-            return;
-        }
-        
-        await context.JoinVoiceChannel(_lavaNode);
-    }
-}

Bot/Handler/MusicPlayer/MessageModule.cs

@@ -1,50 +1,65 @@
 using Discord;
 using Discord.WebSocket;
-using Lunaris2.Handler.MusicPlayer;
+
+namespace Lunaris2.Handler.MusicPlayer;
 
 public static class MessageModule
 {
-    private static Dictionary<ulong, List<ulong>> guildMessageIds = new Dictionary<ulong, List<ulong>>();
+    private static readonly Dictionary<ulong, List<ulong>> GuildMessageIds = new();
 
     public static async Task SendMessageAsync(this SocketSlashCommand context, string message, DiscordSocketClient client)
     {
-        var guildId = await StoreForRemoval(context, client);
-        
-        await context.RespondAsync(message);
-        var sentMessage = await context.GetOriginalResponseAsync();
-        
-        guildMessageIds[guildId].Add(sentMessage.Id);
+        try
+        {
+            var guildId = await StoreForRemoval(context, client);
+
+            var sentMessage = await context.FollowupAsync(message);
+            GuildMessageIds[guildId].Add(sentMessage.Id);
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine(e);
+            throw;
+        }
     }
-    
+
     public static async Task SendMessageAsync(this SocketSlashCommand context, Embed message, DiscordSocketClient client)
     {
-        var guildId = await StoreForRemoval(context, client);
+        try
+        {
+            var guildId = await StoreForRemoval(context, client);
 
-        await context.RespondAsync(embed: message);
-        
-        var sentMessage = await context.GetOriginalResponseAsync();
-
-        guildMessageIds[guildId].Add(sentMessage.Id);
+            var sentMessage = await context.FollowupAsync(embed: message);
+            GuildMessageIds[guildId].Add(sentMessage.Id);
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine(e);
+            throw;
+        }
     }
 
     private static async Task<ulong> StoreForRemoval(SocketSlashCommand context, DiscordSocketClient client)
     {
         var guildId = context.GetGuild(client).Id;
-        
-        if (guildMessageIds.ContainsKey(guildId))
+
+        if (GuildMessageIds.TryGetValue(guildId, out var value))
         {
-            foreach (var messageId in guildMessageIds[guildId])
+            if (value.Count <= 0) 
+                return guildId;
+            
+            foreach (var messageId in value)
             {
                 var messageToDelete = await context.Channel.GetMessageAsync(messageId);
-                if (messageToDelete != null) 
+                if (messageToDelete != null)
                     await messageToDelete.DeleteAsync();
             }
-            
-            guildMessageIds[guildId].Clear();
+
+            value.Clear();
         }
         else
         {
-            guildMessageIds.Add(guildId, []);
+            GuildMessageIds.Add(guildId, new List<ulong>());
         }
 
         return guildId;

Bot/Handler/MusicPlayer/MusicEmbed.cs

@@ -1,7 +1,6 @@
 using Discord;
 using Discord.WebSocket;
-using Victoria;
-using Victoria.Player;
+using Lavalink4NET.Tracks;
 
 namespace Lunaris2.Handler.MusicPlayer;
 
@@ -12,33 +11,30 @@ public class MusicEmbed
         string title, 
         string length, 
         string artist, 
-        string queuedBy, 
-        string? nextInQueue)
+        string queuedBy)
     {
         return new EmbedBuilder()
             .WithAuthor("Lunaris", "https://media.tenor.com/GqAwMt01UXgAAAAi/cd.gif")
             .WithTitle(title)
-            .WithDescription($"Length: {length}\nArtist: {artist}\nQueued by: {queuedBy}\nNext in queue: {nextInQueue}")
+            .WithDescription($"Length: {length}\nArtist: {artist}\nQueued by: {queuedBy}")
             .WithColor(Color.Magenta)
             .WithThumbnailUrl(imageUrl)
             .Build();
     }
     
     public async Task NowPlayingEmbed(
-        LavaPlayer<LavaTrack> player, 
+        LavalinkTrack player, 
         SocketSlashCommand context, 
         DiscordSocketClient client)
     {
-        var artwork = await player.Track.FetchArtworkAsync();
-        var getNextTrack = player.Vueue.Count > 1 ? player.Vueue.ToArray()[1].Title : "No songs in queue.";
+        var artwork = player.ArtworkUri;
         var embed = SendMusicEmbed(
-            artwork, 
-            player.Track.Title, 
-            player.Track.Duration.ToString(), 
-            player.Track.Author, 
-            context.User.Username, 
-            getNextTrack);
-
+            artwork.ToString(), 
+            player.Title, 
+            player.Duration.ToString(), 
+            player.Author, 
+            context.User.Username);
+        
         await context.SendMessageAsync(embed, client);
     }
 }

Bot/Handler/MusicPlayer/PauseCommand/PauseHandler.cs

@@ -0,0 +1,31 @@
+using Discord.WebSocket;
+using Lavalink4NET;
+using Lavalink4NET.Players;
+using MediatR;
+
+namespace Lunaris2.Handler.MusicPlayer.PauseCommand;
+
+public record PauseCommand(SocketSlashCommand Message) : IRequest;
+
+public class PauseHandler(DiscordSocketClient client, IAudioService audioService) : IRequestHandler<PauseCommand>
+{
+    public async Task Handle(PauseCommand command, CancellationToken cancellationToken)
+    {
+        var context = command.Message;
+        var player = await audioService.GetPlayerAsync(client, context, connectToVoiceChannel: true);
+
+        if (player is null)
+        {
+            return;
+        }
+
+        if (player.State is PlayerState.Paused)
+        {
+            await context.SendMessageAsync("Player is already paused.", client);
+            return;
+        }
+
+        await player.PauseAsync(cancellationToken);
+        await context.SendMessageAsync("Paused.", client);
+    }
+}

Bot/Handler/MusicPlayer/PlayCommand/PlayHandler.cs

@@ -1,12 +1,10 @@
-using Discord;
-using Discord.Commands;
 using Discord.WebSocket;
 using Lunaris2.SlashCommand;
 using MediatR;
-using Victoria.Node;
-using Victoria.Node.EventArgs;
-using Victoria.Player;
-using Victoria.Responses.Search;
+using Lavalink4NET;
+using Lavalink4NET.Events.Players;
+using Lavalink4NET.Players.Queued;
+using Lavalink4NET.Rest.Entities.Tracks;
 
 namespace Lunaris2.Handler.MusicPlayer.PlayCommand;
 
@@ -15,105 +13,82 @@ public record PlayCommand(SocketSlashCommand Message) : IRequest;
 public class PlayHandler : IRequestHandler<PlayCommand>
 {
     private readonly MusicEmbed _musicEmbed;
-    private readonly LavaNode _lavaNode;
     private readonly DiscordSocketClient _client;
+    private readonly IAudioService _audioService;
     private SocketSlashCommand _context;
     
     public PlayHandler(
-        LavaNode lavaNode, 
         DiscordSocketClient client, 
-        MusicEmbed musicEmbed)
+        MusicEmbed musicEmbed, 
+        IAudioService audioService)
     {
-        _lavaNode = lavaNode;
         _client = client;
         _musicEmbed = musicEmbed;
+        _audioService = audioService;
+        _audioService.TrackStarted += OnTrackStarted;
     }
-    
-    [Command(RunMode = RunMode.Async)]
+
+    private async Task OnTrackStarted(object sender, TrackStartedEventArgs eventargs)
+    {
+        var player = sender as QueuedLavalinkPlayer;
+        var track = player?.CurrentTrack;
+
+        if (track != null) 
+            await _musicEmbed.NowPlayingEmbed(track, _context, _client);
+    }
+
     public async Task Handle(PlayCommand command, CancellationToken cancellationToken)
     {
-        _context = command.Message;
+        await _audioService.StartAsync(cancellationToken);
+        var context = command.Message;
+        _context = context;
+        
+        var searchQuery = context.GetOptionValueByName(Option.Input);
 
-        await _lavaNode.EnsureConnected();
-
-        var songName = _context.GetOptionValueByName(Option.Input);
-
-        if (string.IsNullOrWhiteSpace(songName)) {
-            await _context.RespondAsync("Please provide search terms.");
+        if (string.IsNullOrWhiteSpace(searchQuery)) {
+            await context.SendMessageAsync("Please provide search terms.", _client);
             return;
         }
-
-        var player = await GetPlayer();
         
-        if (player == null) 
+        var player = await _audioService.GetPlayerAsync(_client, context, connectToVoiceChannel: true);
+
+        if (player is null)
             return;
 
-        var searchResponse = await _lavaNode.SearchAsync(
-            Uri.IsWellFormedUriString(songName, UriKind.Absolute)
-                ? SearchType.Direct
-                : SearchType.YouTube, songName);
+        var trackLoadOptions = new TrackLoadOptions
+        {
+            SearchMode = TrackSearchMode.YouTube,
+        };
+
+        var track = await _audioService.Tracks
+            .LoadTrackAsync(
+                searchQuery,
+                trackLoadOptions,
+                cancellationToken: cancellationToken);
         
-        if (!await SearchResponse(searchResponse, player, songName)) 
-            return;
+        if (track is null) 
+            await context.SendMessageAsync("😖 No results.", _client);
 
-        await PlayTrack(player);
+        if (player.CurrentTrack is null)
+        {
+            await player
+                .PlayAsync(track, cancellationToken: cancellationToken)
+                .ConfigureAwait(false);
         
-        await _musicEmbed.NowPlayingEmbed(player, _context, _client);
-
-        _lavaNode.OnTrackEnd += OnTrackEnd;
-    }
-
-    private async Task OnTrackEnd(TrackEndEventArg<LavaPlayer<LavaTrack>, LavaTrack> arg)
-    {
-        var player = arg.Player;
-        if (!player.Vueue.TryDequeue(out var nextTrack))
-            return;
-
-        await player.PlayAsync(nextTrack);
-        
-        await _musicEmbed.NowPlayingEmbed(player, _context, _client);
-    }
-    
-    private static async Task PlayTrack(LavaPlayer<LavaTrack> player)
-    {
-        if (player.PlayerState is PlayerState.Playing or PlayerState.Paused) {
-            return;
+            await _musicEmbed.NowPlayingEmbed(track, context, _client);
         }
-
-        player.Vueue.TryDequeue(out var lavaTrack);
-        await player.PlayAsync(lavaTrack);
-    }
-    
-    private async Task<LavaPlayer<LavaTrack>?> GetPlayer()
-    {
-        var voiceState = _context.User as IVoiceState;
-
-        if (voiceState?.VoiceChannel != null)
-            return await _lavaNode.JoinAsync(voiceState.VoiceChannel, _context.Channel as ITextChannel);
-        
-        await _context.RespondAsync("You must be connected to a voice channel!");
-        return null;
-    }
-    
-    private async Task<bool> SearchResponse(
-        SearchResponse searchResponse, LavaPlayer<LavaTrack> player, 
-        string songName)
-    {
-        if (searchResponse.Status is SearchStatus.LoadFailed or SearchStatus.NoMatches) {
-            await _context.RespondAsync($"I wasn't able to find anything for `{songName}`.");
-            return false;
+        else
+        {
+            if (track != null)
+            {
+                var queueTracks = new[] { new TrackQueueItem(track) };
+                await player.Queue.AddRangeAsync(queueTracks, cancellationToken);
+                await context.SendMessageAsync($"🔈 Added to queue: {track.Title}", _client);
+            }
+            else
+            {
+                await context.SendMessageAsync($"Couldn't read song information", _client);
+            }
         }
-
-        if (!string.IsNullOrWhiteSpace(searchResponse.Playlist.Name)) {
-            player.Vueue.Enqueue(searchResponse.Tracks);
-            
-            await _context.RespondAsync($"Enqueued {searchResponse.Tracks.Count} songs.");
-        }
-        else {
-            var track = searchResponse.Tracks.FirstOrDefault()!;
-            player.Vueue.Enqueue(track);
-        }
-
-        return true;
     }
 }

Bot/Handler/MusicPlayer/ResumeCommand/ResumeHandler.cs

@@ -0,0 +1,29 @@
+using Discord.WebSocket;
+using Lavalink4NET;
+using Lavalink4NET.Players;
+using MediatR;
+
+namespace Lunaris2.Handler.MusicPlayer.ResumeCommand;
+
+public record ResumeCommand(SocketSlashCommand Message) : IRequest;
+
+public class ResumeHandler(DiscordSocketClient client, IAudioService audioService) : IRequestHandler<ResumeCommand>
+{
+    public async Task Handle(ResumeCommand command, CancellationToken cancellationToken)
+    {
+        var context = command.Message;
+        var player = await audioService.GetPlayerAsync(client, context, connectToVoiceChannel: true);
+
+        if (player is null)
+            return;
+
+        if (player.State is not PlayerState.Paused)
+        {
+            await context.SendMessageAsync("Player is not paused.", client);
+            return;
+        }
+
+        await player.ResumeAsync(cancellationToken);
+        await context.SendMessageAsync("Resumed.", client);
+    }
+}

Bot/Handler/MusicPlayer/SkipCommand/SkipHandler.cs

@@ -1,48 +1,34 @@
 using Discord.WebSocket;
+using Lavalink4NET;
 using MediatR;
-using Victoria.Node;
-using Victoria.Player;
 
 namespace Lunaris2.Handler.MusicPlayer.SkipCommand;
 
 public record SkipCommand(SocketSlashCommand Message) : IRequest;
 
-public class SkipHandler : IRequestHandler<SkipCommand>
+public class SkipHandler(DiscordSocketClient client, IAudioService audioService) : IRequestHandler<SkipCommand>
 {
-    private readonly LavaNode _lavaNode;
-    private readonly DiscordSocketClient _client;
-    private readonly MusicEmbed _musicEmbed;
-
-    public SkipHandler(LavaNode lavaNode, DiscordSocketClient client, MusicEmbed musicEmbed)
+    public async Task Handle(SkipCommand command, CancellationToken cancellationToken)
     {
-        _lavaNode = lavaNode;
-        _client = client;
-        _musicEmbed = musicEmbed;
-    }
+        var context = command.Message;
+        var player = await audioService.GetPlayerAsync(client, context, connectToVoiceChannel: true);
 
-    public async Task Handle(SkipCommand message, CancellationToken cancellationToken)
-    {
-        var context = message.Message;
-        
-        await _lavaNode.EnsureConnected();
-        
-        if (!_lavaNode.TryGetPlayer(context.GetGuild(_client), out var player)) {
-            await context.RespondAsync("I'm not connected to a voice channel.");
+        if (player is null)
+            return;
+
+        if (player.CurrentItem is null)
+        {
+            await context.SendMessageAsync("Nothing playing!", client).ConfigureAwait(false);
             return;
         }
 
-        if (player.PlayerState != PlayerState.Playing) {
-            await context.RespondAsync("Woaaah there, I can't skip when nothing is playing.");
-            return;
-        }
-        
-        try {
-            await player.SkipAsync();
-            await _musicEmbed.NowPlayingEmbed(player, context, _client);
-        }
-        catch (Exception exception) {
-            await context.RespondAsync("There is not more tracks to skip.");
-            Console.WriteLine(exception);
-        }
+        await player.SkipAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+
+        var track = player.CurrentItem;
+
+        if (track is not null)
+            await context.SendMessageAsync($"Skipped. Now playing: {track.Track!.Title}", client).ConfigureAwait(false);
+        else
+            await context.SendMessageAsync("Skipped. Stopped playing because the queue is now empty.", client).ConfigureAwait(false);
     }
 }