Update README.md

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

.github/workflows/dotnet.yml

@@ -15,23 +15,6 @@ jobs:
       with:
         fetch-depth: 0 # required for github-action-get-previous-tag
         
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '8.0.x'
-
-    - name: Restore dependencies
-      run: dotnet restore ./Bot/Lunaris2.csproj
-
-    - name: Build
-      run: dotnet build ./Bot/Lunaris2.csproj --no-restore -c Release -o ./out
-
-    - name: Publish
-      run: dotnet publish ./Bot/Lunaris2.csproj --configuration Release --output ./out
-
-    - name: Zip the build
-      run: 7z a -tzip ./out/Lunaris.zip ./out/*
-
     - name: Get previous tag
       id: previoustag
       uses: 'WyriHaximus/github-action-get-previous-tag@v1'
@@ -44,6 +27,23 @@ jobs:
       with:
         version: ${{ steps.previoustag.outputs.tag }}
 
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '8.0.x'
+
+    - name: Restore dependencies
+      run: dotnet restore ./Bot/Lunaris2.csproj
+
+    - name: Build
+      run: dotnet build ./Bot/Lunaris2.csproj --no-restore -c Release /p:AssemblyVersion=${{ steps.previoustag.outputs.tag }} -o ./out
+
+    - name: Publish
+      run: dotnet publish ./Bot/Lunaris2.csproj --configuration Release --output ./out
+
+    - name: Zip the build
+      run: 7z a -tzip ./out/Lunaris.zip ./out/*
+
     - name: Create Release
       id: create_release
       uses: actions/create-release@v1
@@ -63,5 +63,5 @@ jobs:
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: ./out/Lunaris.zip
-        asset_name: Lunaris.zip
+        asset_name: Lunaris_${{steps.semver.outputs.patch}}.zip
         asset_content_type: application/zip

.gitignore

@@ -3,3 +3,5 @@
 .vs
 bin
 appsettings.json
+ollama
+plugins

Bot/Handler/MessageReceivedHandler.cs

@@ -1,4 +1,6 @@
+using System.Text;
 using System.Text.RegularExpressions;
+using Discord;
 using Discord.WebSocket;
 using Lunaris2.Notification;
 using MediatR;
@@ -19,13 +21,43 @@ public class MessageReceivedHandler : INotificationHandler<MessageReceivedNotifi
     public async Task Handle(MessageReceivedNotification notification, CancellationToken cancellationToken)
     {
         await BotMentioned(notification, cancellationToken);
+        await Statistics(notification, cancellationToken);
+    }
+    
+    private async Task Statistics(MessageReceivedNotification notification, CancellationToken cancellationToken)
+    {
+        if (notification.Message.Content.Contains("!LunarisStats"))
+        {
+            var servers = _client.Guilds.Select(guild => guild.Name);
+            var channels = _client.Guilds
+                .SelectMany(guild => guild.VoiceChannels)
+                .Where(channel => channel.ConnectedUsers.Any(guildUser => guildUser.Id == _client.CurrentUser.Id) &&
+                                  channel.Users.Count != 1);
+            
+            var statsList = new StringBuilder();
+            statsList.AppendLine("➡️ Servers");
+            
+            foreach (var server in servers) 
+                statsList.AppendLine($"* {server}");
+            
+            statsList.AppendLine("➡️ Now playing channels: ");
+            
+            foreach (var channel in channels) 
+                statsList.AppendLine($"* {channel.Name} in {channel.Guild.Name}");
+            
+            var embed = new EmbedBuilder()
+                .WithTitle("Lunaris Statistics")
+                .WithDescription(statsList.ToString())
+                .Build();
+            
+            await notification.Message.Channel.SendMessageAsync(embed: embed);
+        }
     }
 
     private async Task BotMentioned(MessageReceivedNotification notification, CancellationToken cancellationToken)
     {
         if (notification.Message.MentionedUsers.Any(user => user.Id == _client.CurrentUser.Id))
         {
-            // The bot was mentioned
             const string pattern = "<.*?>";
             const string replacement = "";
             var regex = new Regex(pattern);

Bot/Handler/MusicPlayer/ClearQueueCommand/ClearQueueHandler.cs

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

Bot/Handler/MusicPlayer/DisconnectCommand/DisconnectHandler.cs

@@ -17,6 +17,6 @@ public class DisconnectHandler(DiscordSocketClient client, IAudioService audioSe
             return;
 
         await player.DisconnectAsync(cancellationToken).ConfigureAwait(false);
-        await context.RespondAsync("Disconnected.").ConfigureAwait(false);
+        await context.SendMessageAsync("Disconnected.", client).ConfigureAwait(false);
     }
 }

Bot/Handler/MusicPlayer/MessageModule.cs

@@ -1,4 +1,6 @@
+using System.Net;
 using Discord;
+using Discord.Net;
 using Discord.WebSocket;
 
 namespace Lunaris2.Handler.MusicPlayer;
@@ -68,17 +70,32 @@ public static class MessageModule
             if (value.Count <= 0)
                 return guildId;
 
-            foreach (var messageId in value)
+            // Create a copy of the list to avoid modifying it during iteration
+            var messagesToDelete = new List<ulong>(value);
+
+            foreach (var messageId in messagesToDelete)
+            {
+                try
                 {
                     var messageToDelete = await context.Channel.GetMessageAsync(messageId);
                     if (messageToDelete != null)
+                    {
                         await messageToDelete.DeleteAsync();
                     }
+                }
+                catch (HttpException ex)
+                {
+                    if (ex.HttpCode != HttpStatusCode.NotFound)
+                        throw;
+                }
+            }
 
+            // Clear the list after we're done with the iteration
             value.Clear();
         }
         else
         {
+            // If the guildId does not exist, add it to the dictionary
             GuildMessageIds.Add(guildId, new List<ulong>());
         }
 

Bot/Handler/MusicPlayer/MusicEmbed.cs

@@ -1,5 +1,6 @@
 using Discord;
 using Discord.WebSocket;
+using Lavalink4NET.Players.Queued;
 using Lavalink4NET.Tracks;
 
 namespace Lunaris2.Handler.MusicPlayer;
@@ -11,29 +12,37 @@ public class MusicEmbed
         string title, 
         string length, 
         string artist, 
-        string queuedBy)
+        string queuedBy,
+        string? nextSong = null)
     {
+        var getNextSong = nextSong is not null ? $"\nNext Song: {nextSong}" : string.Empty;
+        
         return new EmbedBuilder()
             .WithAuthor("Lunaris", "https://media.tenor.com/GqAwMt01UXgAAAAi/cd.gif")
             .WithTitle(title)
-            .WithDescription($"Length: {length}\nArtist: {artist}\nQueued by: {queuedBy}")
+            .WithDescription($"Length: {length}\nArtist: {artist}\nQueued by: {queuedBy}{getNextSong}")
             .WithColor(Color.Magenta)
             .WithThumbnailUrl(imageUrl)
             .Build();
     }
     
     public async Task NowPlayingEmbed(
-        LavalinkTrack player, 
+        LavalinkTrack track, 
         SocketSlashCommand context, 
-        DiscordSocketClient client)
+        DiscordSocketClient client,
+        ITrackQueue? queue = null)
     {
-        var artwork = player.ArtworkUri;
+        var duration = TimeSpan.Parse(track.Duration.ToString());
+
+        var artwork = track.ArtworkUri;
+        var nextSong = queue?.Count > 1 ? queue[1].Track?.Title : null;
         var embed = SendMusicEmbed(
             artwork.ToString(), 
-            player.Title, 
+            track.Title, 
-            player.Duration.ToString(), 
+            duration.ToString(@"hh\:mm\:ss"), 
-            player.Author, 
+            track.Author, 
-            context.User.Username);
+            context.User.Username,
+            nextSong);
     
         await context.SendMessageAsync(embed, client);
     }

Bot/Handler/MusicPlayer/PlayCommand/NormalizationFilter.cs

@@ -0,0 +1,30 @@
+using System.Text.Json;
+using Lavalink4NET.Filters;
+using Lavalink4NET.Protocol.Models.Filters;
+
+namespace Lunaris2.Handler.MusicPlayer.PlayCommand;
+
+public class NormalizationFilter : IFilterOptions
+{
+    private double MaxAmplitude { get; set; }
+    private bool Adaptive { get; set; }
+
+    public NormalizationFilter(double maxAmplitude, bool adaptive)
+    {
+        MaxAmplitude = maxAmplitude;
+        Adaptive = adaptive;
+    }
+
+    public bool IsDefault => MaxAmplitude == 1.0 && !Adaptive;
+
+    public void Apply(ref PlayerFilterMapModel filterMap)
+    {
+        filterMap.AdditionalFilters ??= new Dictionary<string, JsonElement>();
+        var normalizationFilter = new
+        {
+            maxAmplitude = MaxAmplitude,
+            adaptive = Adaptive
+        };
+        filterMap.AdditionalFilters["normalization"] = JsonSerializer.SerializeToElement(normalizationFilter);
+    }
+}

Bot/Handler/MusicPlayer/PlayCommand/PlayHandler.cs

@@ -1,10 +1,14 @@
+using System.Collections.Immutable;
 using Discord.WebSocket;
 using Lunaris2.SlashCommand;
 using MediatR;
 using Lavalink4NET;
 using Lavalink4NET.Events.Players;
+using Lavalink4NET.Integrations.SponsorBlock;
+using Lavalink4NET.Integrations.SponsorBlock.Extensions;
 using Lavalink4NET.Players.Queued;
 using Lavalink4NET.Rest.Entities.Tracks;
+using Lavalink4NET.Tracks;
 
 namespace Lunaris2.Handler.MusicPlayer.PlayCommand;
 
@@ -17,6 +21,8 @@ public class PlayHandler : IRequestHandler<PlayCommand>
     private readonly IAudioService _audioService;
     private SocketSlashCommand _context;
     private const int MaxTrackDuration = 30;
+    private LavalinkTrack? _previousTrack;
+    private static readonly HashSet<ulong> SubscribedGuilds = new();
     
     public PlayHandler(
         DiscordSocketClient client, 
@@ -26,16 +32,35 @@ public class PlayHandler : IRequestHandler<PlayCommand>
         _client = client;
         _musicEmbed = musicEmbed;
         _audioService = audioService;
-        _audioService.TrackStarted += OnTrackStarted;
+    }
+    
+    private async Task OnTrackEnded(object sender, TrackEndedEventArgs eventargs)
+    {
+        // Reset the previous track when the track ends.
+        _previousTrack = null;
     }
     
     private async Task OnTrackStarted(object sender, TrackStartedEventArgs eventargs)
     {
         var player = sender as QueuedLavalinkPlayer;
-        var track = player?.CurrentTrack;
 
-        if (track != null) 
+        if (player?.CurrentTrack is null)
-            await _musicEmbed.NowPlayingEmbed(track, _context, _client);
+        {
+            return; // No track is currently playing.
+        }
+
+        var currentTrack = player.CurrentTrack;
+
+        // Check if the current track is the same as the previous one
+        if (_previousTrack?.Identifier == currentTrack.Identifier)
+        {
+            // The same track is playing, so we don't need to create a new embed.
+            return;
+        }
+
+        // Track has changed, update the previous track and send the embed
+        _previousTrack = currentTrack;
+        await _musicEmbed.NowPlayingEmbed(currentTrack, _context, _client);
     }
     
     public Task Handle(PlayCommand command, CancellationToken cancellationToken)
@@ -47,6 +72,8 @@ public class PlayHandler : IRequestHandler<PlayCommand>
         {
             try
             {
+                RegisterTrackStartedEventListerner(command);
+                
                 await _audioService.StartAsync(cancellationToken);
                 
                 var context = command.Message;
@@ -73,34 +100,62 @@ public class PlayHandler : IRequestHandler<PlayCommand>
                 if (player is null) 
                     return;
                 
-                var trackLoadOptions = new TrackLoadOptions { SearchMode = TrackSearchMode.YouTube, };
+                await ApplyFilters(cancellationToken, player);
+                await ConfigureSponsorBlock(cancellationToken, player);
 
-                var track = await _audioService.Tracks.LoadTrackAsync(searchQuery, trackLoadOptions, cancellationToken: cancellationToken);
+                var trackLoadOptions = new TrackLoadOptions 
-
-                if (track is null)
                 { 
-                    await context.SendMessageAsync("😖 No results.", _client);
+                    SearchMode = TrackSearchMode.YouTubeMusic, 
-                    return;
+                };
-                }
 
-                if (player.CurrentTrack?.Duration.TotalMinutes > MaxTrackDuration)
+                var trackCollection = await _audioService.Tracks.LoadTracksAsync(searchQuery, trackLoadOptions, cancellationToken: cancellationToken);
+
+                // Check if the result is a playlist or just a single track from the search result
+                if (trackCollection.IsPlaylist)
                 {
-                    await context.SendMessageAsync($"🔈 Sorry the track is longer than { MaxTrackDuration } minutes, to save resources this limit is active for now.", _client);
+                    // If it's a playlist, check if it's a free-text input.
-                    return;
+                    if (!Uri.IsWellFormedUriString(searchQuery, UriKind.Absolute))
-                }
-
-                if (player.CurrentTrack is null)
                     {
-                    await player.PlayAsync(track, cancellationToken: cancellationToken)
+                        // Free text was used (not a direct URL to a playlist), let's prevent queueing the whole playlist.
-                        .ConfigureAwait(false);
+                        // Queue only the first track of the search result
-
+                        // var firstTrack = trackCollection.Tracks.FirstOrDefault();
-                    await _musicEmbed.NowPlayingEmbed(track, context, _client);
+                        if (trackCollection.Track != null)
+                        {
+                            await player.PlayAsync(trackCollection.Track, cancellationToken: cancellationToken).ConfigureAwait(false);
+                            await _musicEmbed.NowPlayingEmbed(trackCollection.Track, _context, _client);
                         }
                         else
                         {
-                    var queueTracks = new[] { new TrackQueueItem(track) };
+                            await context.SendMessageAsync("No tracks found.", _client);
+                        }
+                    }
+                    else
+                    {
+                        // It's a playlist and a URL was used, so we can queue all tracks as usual
+                        var queueTracks = trackCollection.Tracks
+                            .Skip(1)
+                            .Select(t => new TrackQueueItem(t))
+                            .ToList();
+                        
+                        await player.PlayAsync(trackCollection.Tracks.First(), cancellationToken: cancellationToken).ConfigureAwait(false);
                         await player.Queue.AddRangeAsync(queueTracks, cancellationToken);
-                    await context.SendMessageAsync($"🔈 Added to queue: {track.Title}", _client);
+                        await context.SendMessageAsync($"Queued playlist {trackCollection.Playlist?.Name} with {queueTracks.Count} tracks.", _client);
+                    }
+                }
+                else
+                {
+                    // It's just a single track or a search result.
+                    var track = trackCollection.Track;
+    
+                    if (track != null)
+                    {
+                        await player.PlayAsync(track, cancellationToken: cancellationToken).ConfigureAwait(false);
+                        await _musicEmbed.NowPlayingEmbed(track, _context, _client);
+                    }
+                    else
+                    {
+                        await context.SendMessageAsync("No tracks found.", _client);
+                    }
                 }
             }
             catch (Exception error)
@@ -109,4 +164,33 @@ public class PlayHandler : IRequestHandler<PlayCommand>
             }
         }
     }
+
+    private void RegisterTrackStartedEventListerner(PlayCommand command)
+    {
+        if (SubscribedGuilds.Contains((ulong)command.Message.GuildId!)) 
+            return;
+        
+        _audioService.TrackStarted += OnTrackStarted;
+        _audioService.TrackEnded += OnTrackEnded;
+        SubscribedGuilds.Add((ulong)command.Message.GuildId!);
+    }
+
+    private static async Task ApplyFilters(CancellationToken cancellationToken, QueuedLavalinkPlayer player)
+    {
+        var normalizationFilter = new NormalizationFilter(0.5, true);
+        player.Filters.SetFilter(normalizationFilter);
+        await player.Filters.CommitAsync(cancellationToken);
+    }
+
+    private static async Task ConfigureSponsorBlock(CancellationToken cancellationToken, QueuedLavalinkPlayer player)
+    {
+        var categories = ImmutableArray.Create(
+            SegmentCategory.Intro,
+            SegmentCategory.Sponsor,
+            SegmentCategory.SelfPromotion,
+            SegmentCategory.Outro,
+            SegmentCategory.Filler);
+
+        await player.UpdateSponsorBlockCategoriesAsync(categories, cancellationToken: cancellationToken);
+    }
 }

Bot/Handler/MusicPlayer/PlayCommand/readme.md

@@ -8,6 +8,75 @@ flowchart TD
     PlayTrack --> NowPlayingEmbed
 ```
 
+```mermaid
+classDiagram
+    class PlayHandler {
+        -MusicEmbed _musicEmbed
+        -DiscordSocketClient _client
+        -IAudioService _audioService
+        -SocketSlashCommand _context
+        -const int MaxTrackDuration
+        -LavalinkTrack? _previousTrack
+        -static HashSet~ulong~ SubscribedGuilds
+        +PlayHandler(DiscordSocketClient client, MusicEmbed musicEmbed, IAudioService audioService)
+        +Task Handle(PlayCommand command, CancellationToken cancellationToken)
+        -void PlayMusic()
+        -Task OnTrackEnded(object sender, TrackEndedEventArgs eventargs)
+        -Task OnTrackStarted(object sender, TrackStartedEventArgs eventargs)
+        -void RegisterTrackStartedEventListerner(PlayCommand command)
+        -static Task ApplyFilters(CancellationToken cancellationToken, QueuedLavalinkPlayer player)
+        -static Task ConfigureSponsorBlock(CancellationToken cancellationToken, QueuedLavalinkPlayer player)
+    }
+
+    class PlayCommand {
+        +SocketSlashCommand Message
+    }
+
+    class TrackEndedEventArgs {
+    }
+
+    class TrackStartedEventArgs {
+    }
+
+    class QueuedLavalinkPlayer {
+        +LavalinkTrack? CurrentTrack
+        +Task PlayAsync(LavalinkTrack track, CancellationToken cancellationToken)
+        +Task Queue.AddRangeAsync(List~TrackQueueItem~ queueTracks, CancellationToken cancellationToken)
+        +Task Filters.SetFilter(NormalizationFilter normalizationFilter)
+        +Task Filters.CommitAsync(CancellationToken cancellationToken)
+        +Task UpdateSponsorBlockCategoriesAsync(ImmutableArray~SegmentCategory~ categories, CancellationToken cancellationToken)
+    }
+
+    class LavalinkTrack {
+        +string Identifier
+    }
+
+    class NormalizationFilter {
+        +NormalizationFilter(double gain, bool enabled)
+    }
+
+    class SegmentCategory {
+        +static SegmentCategory Intro
+        +static SegmentCategory Sponsor
+        +static SegmentCategory SelfPromotion
+        +static SegmentCategory Outro
+        +static SegmentCategory Filler
+    }
+
+    class TrackQueueItem {
+        +TrackQueueItem(LavalinkTrack track)
+    }
+
+    PlayHandler --> PlayCommand
+    PlayHandler --> TrackEndedEventArgs
+    PlayHandler --> TrackStartedEventArgs
+    PlayHandler --> QueuedLavalinkPlayer
+    PlayHandler --> LavalinkTrack
+    PlayHandler --> NormalizationFilter
+    PlayHandler --> SegmentCategory
+    PlayHandler --> TrackQueueItem
+```
+
 ## Steps in the code
 
 | Name | Description |

Bot/Handler/MusicPlayer/README.md

@@ -0,0 +1,139 @@
+### README.md
+
+# Handlers
+
+Handlers for the Lunaris2 bot, which is built using C#, Discord.Net, and Lavalink4NET. Below is a detailed description of each handler and their responsibilities.
+
+## Handlers
+
+### ClearQueueHandler
+
+Handles the command to clear the music queue.
+
+```csharp
+public class ClearQueueHandler : IRequestHandler<ClearQueueCommand>
+```
+
+### DisconnectHandler
+
+Handles the command to disconnect the bot from the voice channel.
+
+```csharp
+public class DisconnectHandler : IRequestHandler<DisconnectCommand>
+```
+
+### PauseHandler
+
+Handles the command to pause the currently playing track.
+
+```csharp
+public class PauseHandler : IRequestHandler<PauseCommand>
+```
+
+### PlayHandler
+
+Handles the command to play a track or playlist.
+
+```csharp
+public class PlayHandler : IRequestHandler<PlayCommand>
+```
+
+### ResumeHandler
+
+Handles the command to resume the currently paused track.
+
+```csharp
+public class ResumeHandler : IRequestHandler<ResumeCommand>
+```
+
+### SkipHandler
+
+Handles the command to skip the currently playing track.
+
+```csharp
+public class SkipHandler : IRequestHandler<SkipCommand>
+```
+
+### MessageReceivedHandler
+
+Handles incoming messages and processes commands or statistics requests.
+
+```csharp
+public class MessageReceivedHandler : INotificationHandler<MessageReceivedNotification>
+```
+
+## Mermaid Diagrams
+
+### Class Diagram
+
+```mermaid
+sequenceDiagram
+    participant User as User
+    participant DiscordSocketClient as DiscordSocketClient
+    participant MessageReceivedHandler as MessageReceivedHandler
+    participant MessageReceivedNotification as MessageReceivedNotification
+    participant EmbedBuilder as EmbedBuilder
+    participant Channel as Channel
+
+    User->>DiscordSocketClient: Send message "!LunarisStats"
+    DiscordSocketClient->>MessageReceivedHandler: MessageReceivedNotification
+    MessageReceivedHandler->>MessageReceivedNotification: Handle(notification, cancellationToken)
+    MessageReceivedNotification->>MessageReceivedHandler: BotMentioned(notification, cancellationToken)
+    MessageReceivedHandler->>DiscordSocketClient: Get guilds and voice channels
+    DiscordSocketClient-->>MessageReceivedHandler: List of guilds and voice channels
+    MessageReceivedHandler->>EmbedBuilder: Create embed with statistics
+    EmbedBuilder-->>MessageReceivedHandler: Embed
+    MessageReceivedHandler->>Channel: Send embed message
+```
+
+### Sequence Diagram for PlayHandler
+
+```mermaid
+sequenceDiagram
+    participant User
+    participant Bot
+    participant DiscordSocketClient
+    participant IAudioService
+    participant SocketSlashCommand
+    participant LavalinkPlayer
+
+    User->>Bot: /play [song]
+    Bot->>DiscordSocketClient: Get user voice channel
+    DiscordSocketClient-->>Bot: Voice channel info
+    Bot->>IAudioService: Get or create player
+    IAudioService-->>Bot: Player instance
+    Bot->>SocketSlashCommand: Get search query
+    SocketSlashCommand-->>Bot: Search query
+    Bot->>IAudioService: Load tracks
+    IAudioService-->>Bot: Track collection
+    Bot->>LavalinkPlayer: Play track
+    LavalinkPlayer-->>Bot: Track started
+    Bot->>User: Now playing embed
+```
+
+### Sequence Diagram for MessageReceivedHandler
+
+```mermaid
+sequenceDiagram
+    participant User
+    participant Bot
+    participant DiscordSocketClient
+    participant ISender
+    participant MessageReceivedNotification
+
+    User->>Bot: Send message
+    Bot->>MessageReceivedNotification: Create notification
+    Bot->>DiscordSocketClient: Check if bot is mentioned
+    DiscordSocketClient-->>Bot: Mention info
+    alt Bot is mentioned
+        Bot->>ISender: Send ChatCommand
+    end
+    Bot->>DiscordSocketClient: Check for statistics command
+    alt Statistics command found
+        Bot->>DiscordSocketClient: Get server and channel info
+        DiscordSocketClient-->>Bot: Server and channel info
+        Bot->>User: Send statistics embed
+    end
+```
+
+This README provides an overview of the handlers and their responsibilities, along with class and sequence diagrams to illustrate the interactions and relationships between the components.

Bot/Handler/SlashCommandReceivedHandler.cs

@@ -1,3 +1,4 @@
+using Lunaris2.Handler.MusicPlayer.ClearQueueCommand;
 using Lunaris2.Handler.MusicPlayer.DisconnectCommand;
 using Lunaris2.Handler.MusicPlayer.PauseCommand;
 using Lunaris2.Handler.MusicPlayer.PlayCommand;
@@ -32,6 +33,9 @@ public class SlashCommandReceivedHandler(ISender mediator) : INotificationHandle
             case Command.Skip.Name:
                 await mediator.Send(new SkipCommand(notification.Message), cancellationToken);
                 break;
+            case Command.Clear.Name:
+                await mediator.Send(new ClearQueueCommand(notification.Message), cancellationToken);
+                break;
         }
     }
 }

Bot/Lunaris2.csproj

@@ -6,28 +6,34 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <UserSecretsId>ec2f340f-a44c-4869-ab79-a12ba9459d80</UserSecretsId>
+    <AssemblyVersion>0.0.1337</AssemblyVersion>
   </PropertyGroup>
 
+  <!--  Lavalink4net 4.0.25 seems to break the Message Module-->
   <ItemGroup>
-    <PackageReference Include="Discord.Net" Version="3.15.3" />
+    <PackageReference Include="Discord.Net" Version="3.16.0" />
-    <PackageReference Include="Discord.Net.Commands" Version="3.15.3" />
+    <PackageReference Include="Discord.Net.Commands" Version="3.16.0" />
-    <PackageReference Include="Discord.Net.Core" Version="3.15.3" />
+    <PackageReference Include="Discord.Net.Core" Version="3.16.0" />
-    <PackageReference Include="Discord.Net.Interactions" Version="3.15.3" />
+    <PackageReference Include="Discord.Net.Interactions" Version="3.16.0" />
-    <PackageReference Include="Discord.Net.Rest" Version="3.15.3" />
+    <PackageReference Include="Discord.Net.Rest" Version="3.16.0" />
-    <PackageReference Include="Lavalink4NET" Version="4.0.20" />
+    <PackageReference Include="Lavalink4NET" Version="4.0.25" />
-    <PackageReference Include="Lavalink4NET.Artwork" Version="4.0.20" />
+    <PackageReference Include="Lavalink4NET.Artwork" Version="4.0.25" />
-    <PackageReference Include="Lavalink4NET.Discord.NET" Version="4.0.20" />
+    <PackageReference Include="Lavalink4NET.Discord.NET" Version="4.0.25" />
-    <PackageReference Include="MediatR" Version="12.4.0" />
+    <PackageReference Include="Lavalink4NET.Integrations.Lavasrc" Version="4.0.25" />
+    <PackageReference Include="Lavalink4NET.Integrations.SponsorBlock" Version="4.0.25" />
+    <PackageReference Include="MediatR" Version="12.4.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageReference Include="OllamaSharp" Version="1.1.10" />
-    <PackageReference Include="Victoria" Version="6.0.23.324" />
   </ItemGroup>
 
   <ItemGroup>
+    <None Include="../docker-compose.yml" pack="true" PackagePath="." />
+    <None Include="../application.yml" pack="true" PackagePath="." />
+    <None Include="../start-services.sh" pack="true" PackagePath="." />
     <None Update="appsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

Bot/Program.cs

@@ -4,6 +4,7 @@ using Discord.Interactions;
 using Discord.WebSocket;
 using Lunaris2.Handler.ChatCommand;
 using Lavalink4NET.Extensions;
+using Lavalink4NET.Integrations.SponsorBlock.Extensions;
 using Lunaris2.Handler.MusicPlayer;
 using Lunaris2.Notification;
 using Lunaris2.Service;
@@ -11,7 +12,6 @@ using Lunaris2.SlashCommand;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Victoria.Node;
 
 namespace Lunaris2;
 
@@ -23,7 +23,10 @@ public class Program
         {
             Console.WriteLine(eventArgs.ExceptionObject);
         };
-        CreateHostBuilder(args).Build().Run();
+        var app = CreateHostBuilder(args).Build();
+        
+        app.UseSponsorBlock();
+        app.Run();
     }
 
     private static IHostBuilder CreateHostBuilder(string[] args) =>
@@ -53,7 +56,6 @@ public class Program
                         options.Passphrase = configuration["LavaLinkPassword"] ?? "youshallnotpass";
                         options.Label = "Node";
                     })
-                    .AddSingleton<LavaNode>()
                     .AddSingleton<MusicEmbed>()
                     .AddSingleton<ChatSettings>()
                     .AddSingleton(client)

Bot/README.md

@@ -2,11 +2,15 @@
 ```mermaid
 flowchart TD
     Program[Program] -->|Register| EventListener
+    Program --> Intervals[VoiceChannelMonitorService]
+    Intervals --> SetStatus[SetStatus, Updates status with amount of playing bots]
+    Intervals --> LeaveChannel[LeaveOnAlone, Leaves channel when alone for a time]
     EventListener[DiscordEventListener] --> A[MessageReceivedHandler]
 
     EventListener[DiscordEventListener] --> A2[SlashCommandReceivedHandler]
 
     A --> |Message| f{If bot is mentioned}
+    A --> |Message '!LunarisStats'| p[Responds with Server and Channel Statistics.]
     f --> |ChatCommand| v[ChatHandler]
 
     A2[SlashCommandReceivedHandler] -->|Message| C{Send to correct command by 
@@ -14,8 +18,11 @@ flowchart TD
 
     C -->|JoinCommand| D[JoinHandler]
     C -->|PlayCommand| E[PlayHandler]
-    C -->|HelloCommand| F[HelloHandler]
+    C -->|PauseCommand| F[PauseHandler]
-    C -->|GoodbyeCommand| G[GoodbyeHandler]
+    C -->|DisconnectCommand| H[DisconnectHandler]
+    C -->|ResumeCommand| J[ResumeHandler]
+    C -->|SkipCommand| K[SkipHandler]
+    C -->|ClearQueueCommand| L[ClearQueueHandler]
 ```
 Program registers an event listener ```DiscordEventListener``` which publish a message :
 
@@ -30,20 +37,33 @@ await Mediator.Publish(new MessageReceivedNotification(arg), _cancellationToken)
 
 ## Handler integrations
 ```mermaid
-flowchart TD
+flowchart LR
     D[JoinHandler] --> Disc[Discord Api]
     E[PlayHandler] --> Disc[Discord Api]
-    F[HelloHandler] --> Disc[Discord Api]
+    F[SkipHandler] --> Disc[Discord Api]
-    G[GoodbyeHandler] --> Disc[Discord Api]
+    G[PauseHandler] --> Disc[Discord Api]
     v[ChatHandler] --> Disc[Discord Api]
+    ClearQueueHandler --> Disc
+    ClearQueuehandler --> Lava
+    DisconnectHandler --> Disc
+    Resumehandler --> Disc
     v --> o[Ollama Server]
     o --> v
     E --> Lava[Lavalink]
+    F --> Lava
+    G --> Lava
 ```
 |Name| Description |
 |--|--|
 | JoinHandler| Handles the logic for **just** joining a voice channel. |
 | PlayHandler| Handles the logic for joining and playing music in a voice channel. |
-| HelloHandler| Responds with Hello. (Dummy handler, will be removed)|
+| PauseHandler | Handles the logic for pausing currently playing track. |
-| GoodbyeHandler| Responds with Goodbye. (Dummy handler, will be removed)|
+| DisconnectHandler | Handles the logic for disconnecting from voicechannels. |
+| ClearQueueHandler | Handles the logic for clearing the queued songs, except the currently playing one. |
+| SkipHandler | Handles the logic for skipping tracks that are queued. If 0 trackS is in queue, it stops the current one.|
+| Resumehandler | Resumes paused tracks. |
 | ChatHandler| Handles the logic for LLM chat with user. |
+
+
+
+

Bot/Service/VoiceChannelMonitorService.cs

@@ -1,7 +1,8 @@
+using Discord;
 using Discord.WebSocket;
 
-namespace Lunaris2.Service;
+namespace Lunaris2.Service
-
+{
     public class VoiceChannelMonitorService
     {
         private readonly DiscordSocketClient _client;
@@ -19,30 +20,64 @@ public class VoiceChannelMonitorService
                 while (true)
                 {
                     await CheckVoiceChannels();
-                await Task.Delay(TimeSpan.FromMinutes(1));
+                    await Task.Delay(TimeSpan.FromMinutes(1)); // Monitor every minute
                 }
             });
         }
 
         private async Task CheckVoiceChannels()
+        {
+            SetStatus();
+            await LeaveOnAlone();
+        }
+        
+        private void SetStatus()
+        {
+            var channels = _client.Guilds
+                .SelectMany(guild => guild.VoiceChannels)
+                .Count(channel => 
+                    channel.ConnectedUsers
+                        .Any(guildUser => guildUser.Id == _client.CurrentUser.Id) && 
+                    channel.Users.Count > 1
+                );
+            
+            if (channels == 0)
+                _client.SetGameAsync(System.Reflection.Assembly.GetEntryAssembly()?.GetName().Version?.ToString(), type: ActivityType.CustomStatus);
+            else if(channels == 1)
+                _client.SetGameAsync("in 1 server", type: ActivityType.Playing);
+            else if(channels > 1)
+                _client.SetGameAsync($" in {channels} servers", type: ActivityType.Playing);
+        }
+
+        private async Task LeaveOnAlone()
         {
             foreach (var guild in _client.Guilds)
             {
-            var voiceChannel = guild.VoiceChannels.FirstOrDefault(vc => vc.ConnectedUsers.Count == 1);
+                // Find voice channels where only the bot is left
+                var voiceChannel = guild.VoiceChannels.FirstOrDefault(vc => 
+                    vc.ConnectedUsers.Count == 1 && 
+                    vc.Users.Any(u => u.Id == _client.CurrentUser.Id));
+
                 if (voiceChannel != null)
                 {
+                    // If timer not set for this channel, start one
                     if (!_timers.ContainsKey(voiceChannel.Id))
                     {
-                    _timers[voiceChannel.Id] = new Timer(async _ => await LeaveChannel(voiceChannel), null, TimeSpan.FromMinutes(3), Timeout.InfiniteTimeSpan);
+                        Console.WriteLine($"Bot is alone in channel {voiceChannel.Name}, starting timer...");
+                        _timers[voiceChannel.Id] = new Timer(async _ => await LeaveChannel(voiceChannel), null, 
+                            TimeSpan.FromMinutes(3), Timeout.InfiniteTimeSpan);  // Set delay before leaving
                     }
                 }
                 else
                 {
-                if (voiceChannel == null || !_timers.ContainsKey(voiceChannel.Id)) 
+                    // Clean up timer if channel is no longer active
-                    continue;
+                    var timersToDispose = _timers.Where(t => guild.VoiceChannels.All(vc => vc.Id != t.Key)).ToList();
-                
+                    foreach (var timer in timersToDispose)
-                await _timers[voiceChannel.Id].DisposeAsync();
+                    {
-                _timers.Remove(voiceChannel.Id);
+                        await timer.Value.DisposeAsync();
+                        _timers.Remove(timer.Key);
+                        Console.WriteLine($"Disposed timer for inactive voice channel ID: {timer.Key}");
+                    }
                 }
             }
         }
@@ -51,9 +86,11 @@ public class VoiceChannelMonitorService
         {
             if (voiceChannel.ConnectedUsers.Count == 1 && voiceChannel.Users.Any(u => u.Id == _client.CurrentUser.Id))
             {
+                Console.WriteLine($"Leaving channel {voiceChannel.Name} due to inactivity...");
                 await voiceChannel.DisconnectAsync();
                 await _timers[voiceChannel.Id].DisposeAsync();
-            _timers.Remove(voiceChannel.Id);
+                _timers.Remove(voiceChannel.Id);  // Clean up after leaving
+            }
         }
     }
 }

Bot/SlashCommand/Command.cs

@@ -15,6 +15,12 @@ public static class Command
         public const string Description = "Disconnect from the voice channel!";
     }
     
+    public static class Clear
+    {
+        public const string Name = "clear";
+        public const string Description = "Clear the music queue!";
+    }
+    
     public static class Skip
     {
         public const string Name = "skip";

Bot/SlashCommand/SlashCommandRegistration.cs

@@ -13,6 +13,7 @@ public static class SlashCommandRegistration
         RegisterCommand(client, Command.Skip.Name, Command.Skip.Description);
         RegisterCommand(client, Command.Play.Name, Command.Play.Description, Command.Play.Options);
         RegisterCommand(client, Command.Resume.Name, Command.Resume.Description);
+        RegisterCommand(client, Command.Clear.Name, Command.Clear.Description);
     }
 
     private static void RegisterCommand(

Bot/generate-trusted-session.sh

@@ -0,0 +1,2 @@
+docker run quay.io/invidious/youtube-trusted-session-generator
+read -p "Copy the codes and press enter to close the terminal."

application.yml

@@ -2,7 +2,45 @@ server: # REST and WS server
   port: 2333
   address: 0.0.0.0
 plugins:
+  lavasrc:
+    providers: # Custom providers for track loading. This is the default
+      # - "dzisrc:%ISRC%" # Deezer ISRC provider
+      # - "dzsearch:%QUERY%" # Deezer search provider
+      - "ytsearch:\"%ISRC%\"" # Will be ignored if track does not have an ISRC. See https://en.wikipedia.org/wiki/International_Standard_Recording_Code
+      - "ytsearch:%QUERY%" # Will be used if track has no ISRC or no track could be found for the ISRC
+      #  you can add multiple other fallback sources here
+    sources:
+      spotify: true # Enable Spotify source
+      applemusic: false # Enable Apple Music source
+      deezer: false # Enable Deezer source
+      yandexmusic: false # Enable Yandex Music source
+      flowerytts: false # Enable Flowery TTS source
+      youtube: false # Enable YouTube search source (https://github.com/topi314/LavaSearch)
+      vkmusic: false # Enable Vk Music source
+    spotify:
+      clientId: "ID"
+      clientSecret: "SECRET"
+      # spDc: "your sp dc cookie" # the sp dc cookie used for accessing the spotify lyrics api
+      countryCode: "US" # the country code you want to use for filtering the artists top tracks. See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+      playlistLoadLimit: 6 # The number of pages at 100 tracks each
+      albumLoadLimit: 6 # The number of pages at 50 tracks each
+      resolveArtistsInSearch: true # Whether to resolve artists in track search results (can be slow)
+      localFiles: false # Enable local files support with Spotify playlists. Please note `uri` & `isrc` will be `null` & `identifier` will be `"local"`
   youtube:
+    oauth:
+      # setting "enabled: true" is the bare minimum to get OAuth working.
+      enabled: true
+      
+      # if you have a refresh token, you may set it below (make sure to uncomment the line to apply it).
+      # setting a valid refresh token will skip the OAuth flow entirely. See above note on how to retrieve
+      # your refreshToken.      
+      # Set this if you don't want the OAuth flow to be triggered, if you intend to supply a refresh token later.
+      # Initialization is skipped automatically if a valid refresh token is supplied. Leave this commented if you're
+      # completing the OAuth flow for the first time/do not have a refresh token.
+      # skipInitialization: true
+    #    pot: // run generate-trusted-session.sh
+    #      token: ""
+    #      visitorData: ""
     enabled: true # Whether this source can be used.
     allowSearch: true # Whether "ytsearch:" and "ytmsearch:" can be used.
     allowDirectVideoIds: true # Whether just video IDs can match. If false, only complete URLs will be loaded.
@@ -11,19 +49,22 @@ plugins:
     # Clients are queried in the order they are given (so the first client is queried first and so on...)
     clients:
       - MUSIC
-      - ANDROID_TESTSUITE
       - WEB
       - TVHTML5EMBEDDED
-    #  name: # Name of the plugin
+      - ANDROID_TESTSUITE
-    #    some_key: some_value # Some key-value pair for the plugin
-    #    another_key: another_value
 lavalink:
   plugins:
-#    - dependency: "group:artifact:version"
+      - dependency: com.github.devoxin:lavadspx-plugin:0.0.5 # replace {VERSION} with the latest version from the "Releases" tab.
-#      repository: "repository"
+        repository: https://jitpack.io
-      - dependency: "dev.lavalink.youtube:youtube-plugin:1.5.2"
+      - dependency: "dev.lavalink.youtube:youtube-plugin:1.8.3"
         snapshot: false # Set to true if you want to use a snapshot version.
-        
+      - dependency: "com.github.topi314.lavasearch:lavasearch-plugin:1.0.0"
+        repository: "https://maven.lavalink.dev/releases" # this is optional for lavalink v4.0.0-beta.5 or greater
+        snapshot: false # set to true if you want to use snapshot builds (see below)
+      - dependency: "com.github.topi314.sponsorblock:sponsorblock-plugin:3.0.1"
+      - dependency: "com.github.topi314.lavasrc:lavasrc-plugin:4.2.0"
+        repository: "https://maven.lavalink.dev/releases" # this is optional for lavalink v4.0.0-beta.5 or greater
+        snapshot: false # set to true if you want to use snapshot builds (see below)
   server:
     password: "youshallnotpass"
     sources:
@@ -56,20 +97,6 @@ lavalink:
     youtubeSearchEnabled: true
     soundcloudSearchEnabled: true
     gc-warnings: true
-    #ratelimit:
-      #ipBlocks: ["1.0.0.0/8", "..."] # list of ip blocks
-      #excludedIps: ["...", "..."] # ips which should be explicit excluded from usage by lavalink
-      #strategy: "RotateOnBan" # RotateOnBan | LoadBalance | NanoSwitch | RotatingNanoSwitch
-      #searchTriggersFail: true # Whether a search 429 should trigger marking the ip as failing
-      #retryLimit: -1 # -1 = use default lavaplayer value | 0 = infinity | >0 = retry will happen this numbers times
-    #youtubeConfig: # Required for avoiding all age restrictions by YouTube, some restricted videos still can be played without.
-      #email: "" # Email of Google account
-      #password: "" # Password of Google account
-    #httpConfig: # Useful for blocking bad-actors from ip-grabbing your music node and attacking it, this way only the http proxy will be attacked
-      #proxyHost: "localhost" # Hostname of the proxy, (ip or domain)
-      #proxyPort: 3128 # Proxy port, 3128 is the default for squidProxy
-      #proxyUser: "" # Optional user for basic authentication fields, leave blank if you don't use basic auth
-      #proxyPassword: "" # Password for basic authentication
 
 metrics:
   prometheus:
@@ -79,9 +106,6 @@ metrics:
 sentry:
   dsn: ""
   environment: ""
-#  tags:
-#    some_key: some_value
-#    another_key: another_value
 
 logging:
   file:
@@ -99,7 +123,6 @@ logging:
     includePayload: true
     maxPayloadLength: 10000
 
-
   logback:
     rollingpolicy:
       max-file-size: 1GB

docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   lavalink:
     # pin the image version to Lavalink v4
-    image: ghcr.io/lavalink-devs/lavalink:4.0.7
+    image: ghcr.io/lavalink-devs/lavalink:4.0.8
     container_name: lavalink
     restart: unless-stopped
     environment:

start-services.sh

@@ -1,3 +1 @@
 docker compose up -d
-
-read -p "Press enter to continue"