Add jellyfin source

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

Bot/Handler/MessageReceivedHandler.cs

@@ -31,21 +31,23 @@ public class MessageReceivedHandler : INotificationHandler<MessageReceivedNotifi
             var servers = _client.Guilds.Select(guild => guild.Name);
             var channels = _client.Guilds
                 .SelectMany(guild => guild.VoiceChannels)
-                .Where(channel => channel.Users.Any(user => user.IsBot));
+                .Where(channel => channel.ConnectedUsers.Any(guildUser => guildUser.Id == _client.CurrentUser.Id) &&
+                                  channel.Users.Count != 1);
             
-            var table = new StringBuilder();
-            var serverColumnWidth = 25;  // Width for server column
-            var channelColumnWidth = 25; // Width for channel column
-            table.AppendLine($"{"Servers".PadRight(serverColumnWidth - 1)}|{"Channels".PadRight(channelColumnWidth - 1)}");
-            table.AppendLine($"{new string('-', serverColumnWidth - 1)}|{new string('-', channelColumnWidth - 1)}");
-            foreach (var (server, channel) in servers.Zip(channels))
-            {
-                table.AppendLine($"{server.PadRight(serverColumnWidth - 1)}|{channel.Name.PadRight(channelColumnWidth - 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(table.ToString())
+                .WithDescription(statsList.ToString())
                 .Build();
             
             await notification.Message.Channel.SendMessageAsync(embed: embed);

Bot/Handler/MusicPlayer/PlayCommand/PlayHandler.cs

@@ -6,6 +6,7 @@ using Lavalink4NET;
 using Lavalink4NET.Events.Players;
 using Lavalink4NET.Integrations.SponsorBlock;
 using Lavalink4NET.Integrations.SponsorBlock.Extensions;
+using Lavalink4NET.Jellyfin;
 using Lavalink4NET.Players.Queued;
 using Lavalink4NET.Rest.Entities.Tracks;
 using Lavalink4NET.Tracks;
@@ -19,8 +20,7 @@ public class PlayHandler : IRequestHandler<PlayCommand>
     private readonly MusicEmbed _musicEmbed;
     private readonly DiscordSocketClient _client;
     private readonly IAudioService _audioService;
-    private SocketSlashCommand _context;
-    private const int MaxTrackDuration = 30;
+    private SocketSlashCommand _context = default!; // ensure initialized before use
     private LavalinkTrack? _previousTrack;
     private static readonly HashSet<ulong> SubscribedGuilds = new();
     
@@ -34,15 +34,16 @@ public class PlayHandler : IRequestHandler<PlayCommand>
         _audioService = audioService;
     }
     
-    private async Task OnTrackEnded(object sender, TrackEndedEventArgs eventargs)
+    private Task OnTrackEnded(object sender, TrackEndedEventArgs eventargs)
     {
         // Reset the previous track when the track ends.
         _previousTrack = null;
+        return Task.CompletedTask;
     }
     
     private async Task OnTrackStarted(object sender, TrackStartedEventArgs eventargs)
     {
-        var player = sender as QueuedLavalinkPlayer;
+        var player = eventargs.Player as QueuedLavalinkPlayer;
 
         if (player?.CurrentTrack is null)
         {
@@ -60,22 +61,16 @@ public class PlayHandler : IRequestHandler<PlayCommand>
 
         // Track has changed, update the previous track and send the embed
         _previousTrack = currentTrack;
+        if (_context != null)
+        {
             await _musicEmbed.NowPlayingEmbed(currentTrack, _context, _client);
         }
+    }
     
-    public Task Handle(PlayCommand command, CancellationToken cancellationToken)
-    {
-        new Thread(PlayMusic).Start();
-        return Task.CompletedTask;
-
-        async void PlayMusic()
+    public async Task Handle(PlayCommand command, CancellationToken cancellationToken)
     {
         try
         {
-                RegisterTrackStartedEventListerner(command);
-                
-                await _audioService.StartAsync(cancellationToken);
-                
             var context = command.Message;
             _context = context;
 
@@ -93,6 +88,10 @@ public class PlayHandler : IRequestHandler<PlayCommand>
                 return;
             }
 
+            RegisterTrackStartedEventListerner(command);
+
+            await _audioService.StartAsync(cancellationToken);
+
             await context.SendMessageAsync("📻 Searching...", _client);
 
             var player = await _audioService.GetPlayerAsync(_client, context, connectToVoiceChannel: true);
@@ -103,12 +102,17 @@ public class PlayHandler : IRequestHandler<PlayCommand>
             await ApplyFilters(cancellationToken, player);
             await ConfigureSponsorBlock(cancellationToken, player);
 
+            // Parse the query to extract search mode and clean query
+            // Supports prefixes like jfsearch:, ytsearch:, scsearch:, etc.
+            // Default: Jellyfin (jfsearch:) when no prefix is specified
+            var (searchMode, queryToSearch) = SearchQueryParser.Parse(searchQuery, JellyfinSearchMode.Jellyfin);
+
             var trackLoadOptions = new TrackLoadOptions
             {
-                    SearchMode = TrackSearchMode.YouTube, 
+                SearchMode = searchMode,
             };
 
-                var trackCollection = await _audioService.Tracks.LoadTracksAsync(searchQuery, trackLoadOptions, cancellationToken: cancellationToken);
+            var trackCollection = await _audioService.Tracks.LoadTracksAsync(queryToSearch, trackLoadOptions, cancellationToken: cancellationToken);
 
             // Check if the result is a playlist or just a single track from the search result
             if (trackCollection.IsPlaylist)
@@ -122,7 +126,7 @@ public class PlayHandler : IRequestHandler<PlayCommand>
                     if (trackCollection.Track != null)
                     {
                         await player.PlayAsync(trackCollection.Track, cancellationToken: cancellationToken).ConfigureAwait(false);
-                            await _musicEmbed.NowPlayingEmbed(trackCollection.Track, _context, _client);
+                        // rely on TrackStarted event to send Now Playing
                     }
                     else
                     {
@@ -145,12 +149,12 @@ public class PlayHandler : IRequestHandler<PlayCommand>
             else
             {
                 // It's just a single track or a search result.
-                    var track = trackCollection.Tracks.FirstOrDefault();
+                var track = trackCollection.Track;
 
                 if (track != null)
                 {
                     await player.PlayAsync(track, cancellationToken: cancellationToken).ConfigureAwait(false);
-                        await _musicEmbed.NowPlayingEmbed(track, _context, _client);
+                    // rely on TrackStarted event to send Now Playing
                 }
                 else
                 {
@@ -163,16 +167,26 @@ public class PlayHandler : IRequestHandler<PlayCommand>
             throw new Exception("Error occured in the Play handler!", error);
         }
     }
-    }
 
     private void RegisterTrackStartedEventListerner(PlayCommand command)
     {
-        if (SubscribedGuilds.Contains((ulong)command.Message.GuildId!)) 
+        var guildId = command.Message.GuildId;
+        if (!guildId.HasValue)
+        {
+            // Ignore registration for DMs or contexts without a guild.
+            return;
+        }
+
+        var gid = guildId.Value;
+        if (SubscribedGuilds.Contains(gid))
             return;
 
+        // Ensure we don't accidentally double-subscribe.
+        _audioService.TrackStarted -= OnTrackStarted;
+        _audioService.TrackEnded -= OnTrackEnded;
         _audioService.TrackStarted += OnTrackStarted;
         _audioService.TrackEnded += OnTrackEnded;
-        SubscribedGuilds.Add((ulong)command.Message.GuildId!);
+        SubscribedGuilds.Add(gid);
     }
 
     private static async Task ApplyFilters(CancellationToken cancellationToken, QueuedLavalinkPlayer player)

Bot/Handler/MusicPlayer/PlayCommand/readme.md

@@ -8,6 +8,29 @@ flowchart TD
     PlayTrack --> NowPlayingEmbed
 ```
 
+```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
+```
+
 ## Steps in the code
 
 | Name | Description |

Bot/Handler/MusicPlayer/README.md

@@ -0,0 +1,239 @@
+### 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
+```
+
+## Extensions.cs
+
+#### Namespaces
+- **Discord**: Provides classes for interacting with Discord.
+- **Discord.WebSocket**: Provides WebSocket-specific classes for Discord.
+- **Lavalink4NET**: Provides classes for interacting with Lavalink.
+- **Lavalink4NET.Players**: Provides player-related classes for Lavalink.
+- **Lavalink4NET.Players.Queued**: Provides queued player-related classes for Lavalink.
+- **Microsoft.Extensions.Options**: Provides classes for handling options and configurations.
+
+#### Class: `Extensions`
+This static class contains extension methods for various Discord and Lavalink operations.
+
+##### Method: `GetPlayerAsync`
+- **Parameters**:
+  - `IAudioService audioService`: The audio service to retrieve the player from.
+  - `DiscordSocketClient client`: The Discord client.
+  - `SocketSlashCommand context`: The context of the slash command.
+  - `bool connectToVoiceChannel`: Whether to connect to the voice channel (default is true).
+- **Returns**: `ValueTask<QueuedLavalinkPlayer?>`
+- **Description**: Retrieves a `QueuedLavalinkPlayer` for the given context. If the retrieval fails, it returns null and sends an appropriate error message.
+
+##### Method: `GetGuild`
+- **Parameters**:
+  - `SocketSlashCommand message`: The slash command message.
+  - `DiscordSocketClient client`: The Discord client.
+- **Returns**: `SocketGuild`
+- **Description**: Retrieves the guild associated with the given slash command message. Throws an exception if the guild ID is null.
+
+##### Method: `GetVoiceState`
+- **Parameters**:
+  - `SocketSlashCommand message`: The slash command message.
+- **Returns**: `IVoiceState`
+- **Description**: Retrieves the voice state of the user who issued the slash command. Throws an exception if the user is not connected to a voice channel.
+
+##### Method: `RespondAsync`
+- **Parameters**:
+  - `SocketSlashCommand message`: The slash command message.
+  - `string content`: The content of the response.
+- **Returns**: `Task`
+- **Description**: Sends an ephemeral response to the slash command.
+
+##### Method: `GetOptionValueByName`
+- **Parameters**:
+  - `SocketSlashCommand command`: The slash command.
+  - `string optionName`: The name of the option to retrieve the value for.
+- **Returns**: `string`
+- **Description**: Retrieves the value of the specified option from the slash command. Returns an empty string if the option is not found.
+
+# MessageModule
+
+The `MessageModule` class provides utility methods for sending and removing messages in a Discord guild using the Discord.Net library. It maintains a dictionary to keep track of message IDs for each guild, allowing for easy removal of messages when needed.
+
+## Methods
+
+### `SendMessageAsync(SocketSlashCommand context, string message, DiscordSocketClient client)`
+
+Sends a follow-up message with the specified text content in response to a slash command.
+
+- **Parameters:**
+  - `context`: The `SocketSlashCommand` context in which the command was executed.
+  - `message`: The text content of the message to be sent.
+  - `client`: The `DiscordSocketClient` instance.
+
+### `SendMessageAsync(SocketSlashCommand context, Embed message, DiscordSocketClient client)`
+
+Sends a follow-up message with the specified embed content in response to a slash command.
+
+- **Parameters:**
+  - `context`: The `SocketSlashCommand` context in which the command was executed.
+  - `message`: The `Embed` content of the message to be sent.
+  - `client`: The `DiscordSocketClient` instance.
+
+### `RemoveMessages(SocketSlashCommand context, DiscordSocketClient client)`
+
+Removes all tracked messages for the guild in which the command was executed.
+
+- **Parameters:**
+  - `context`: The `SocketSlashCommand` context in which the command was executed.
+  - `client`: The `DiscordSocketClient` instance.
+
+### `StoreForRemoval(SocketSlashCommand context, DiscordSocketClient client)`
+
+Stores the message ID for removal and deletes any previously tracked messages for the guild.
+
+- **Parameters:**
+  - `context`: The `SocketSlashCommand` context in which the command was executed.
+  - `client`: The `DiscordSocketClient` instance.
+
+- **Returns:**
+  - The guild ID as a `ulong`.
+
+## Usage
+
+To use the `MessageModule` class, simply call the appropriate method from your command handling logic. For example:
+
+```csharp
+await context.SendMessageAsync("Hello, world!", client);
+```
+
+This will send a follow-up message with the text "Hello, world!" in response to the slash command.

Bot/Lunaris2.csproj

@@ -6,6 +6,7 @@
     <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-->
@@ -20,6 +21,7 @@
     <PackageReference Include="Lavalink4NET.Discord.NET" Version="4.0.25" />
     <PackageReference Include="Lavalink4NET.Integrations.Lavasrc" Version="4.0.25" />
     <PackageReference Include="Lavalink4NET.Integrations.SponsorBlock" Version="4.0.25" />
+    <PackageReference Include="Lavalink4NET.Jellyfin" Version="1.0.0" />
     <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.2" />

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 -->|GoodbyeCommand| G[GoodbyeHandler]
+    C -->|PauseCommand| F[PauseHandler]
+    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]
-    G[GoodbyeHandler] --> Disc[Discord Api]
+    F[SkipHandler] --> 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)|
-| GoodbyeHandler| Responds with Goodbye. (Dummy handler, will be removed)|
+| PauseHandler | Handles the logic for pausing currently playing track. |
+| 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,3 +1,4 @@
+using Discord;
 using Discord.WebSocket;
 
 namespace Lunaris2.Service
@@ -5,11 +6,14 @@ namespace Lunaris2.Service
     public class VoiceChannelMonitorService
     {
         private readonly DiscordSocketClient _client;
-        private readonly Dictionary<ulong, Timer> _timers = new();
+        // Track a cancellation source per voice channel when the bot is alone
+        private readonly Dictionary<ulong, CancellationTokenSource> _leaveCtsByChannel = new();
 
         public VoiceChannelMonitorService(DiscordSocketClient client)
         {
             _client = client;
+            // Subscribe to voice state updates to react immediately
+            _client.UserVoiceStateUpdated += OnUserVoiceStateUpdated;
         }
 
         public void StartMonitoring()
@@ -19,53 +23,166 @@ namespace Lunaris2.Service
                 while (true)
                 {
                     await CheckVoiceChannels();
-                    await Task.Delay(TimeSpan.FromMinutes(1)); // Monitor every minute
+                    await Task.Delay(TimeSpan.FromMinutes(1)); // Status refresh every minute
                 }
             });
         }
 
         private async Task CheckVoiceChannels()
+        {
+            SetStatus();
+            await EnsureCurrentAloneStatesScheduled();
+        }
+        
+        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);
+        }
+
+        // Monitor existing alone states during the periodic check to ensure timers exist
+        private async Task EnsureCurrentAloneStatesScheduled()
         {
             foreach (var guild in _client.Guilds)
             {
-                // 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));
+                foreach (var voiceChannel in guild.VoiceChannels)
+                {
+                    var botInChannel = voiceChannel.ConnectedUsers.Any(u => u.Id == _client.CurrentUser.Id);
+                    var userCount = voiceChannel.ConnectedUsers.Count;
 
-                if (voiceChannel != null)
+                    if (botInChannel && userCount == 1)
                     {
-                    // If timer not set for this channel, start one
-                    if (!_timers.ContainsKey(voiceChannel.Id))
+                        // Schedule leave if not already scheduled
+                        if (!_leaveCtsByChannel.ContainsKey(voiceChannel.Id))
                         {
-                        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
+                            ScheduleLeave(voiceChannel);
                         }
                     }
                     else
                     {
-                    // Clean up timer if channel is no longer active
-                    var timersToDispose = _timers.Where(t => guild.VoiceChannels.All(vc => vc.Id != t.Key)).ToList();
-                    foreach (var timer in timersToDispose)
+                        // Cancel if a schedule exists but the bot is not alone anymore
+                        if (_leaveCtsByChannel.TryGetValue(voiceChannel.Id, out var cts))
                         {
-                        await timer.Value.DisposeAsync();
-                        _timers.Remove(timer.Key);
-                        Console.WriteLine($"Disposed timer for inactive voice channel ID: {timer.Key}");
+                            cts.Cancel();
+                            _leaveCtsByChannel.Remove(voiceChannel.Id);
                         }
                     }
                 }
             }
 
-        private async Task LeaveChannel(SocketVoiceChannel voiceChannel)
+            await Task.CompletedTask;
+        }
+
+        private Task OnUserVoiceStateUpdated(SocketUser user, SocketVoiceState before, SocketVoiceState after)
         {
-            if (voiceChannel.ConnectedUsers.Count == 1 && voiceChannel.Users.Any(u => u.Id == _client.CurrentUser.Id))
+            // React only when events relate to the guild(s) and voice channels where the bot might be
+            var botId = _client.CurrentUser.Id;
+
+            // Determine affected channels
+            var beforeChannelId = before.VoiceChannel?.Id;
+            var afterChannelId = after.VoiceChannel?.Id;
+
+            // If the bot itself moved, we should cancel any old schedule and possibly set a new one
+            if (user.Id == botId)
+            {
+                if (beforeChannelId.HasValue && _leaveCtsByChannel.TryGetValue(beforeChannelId.Value, out var oldCts))
+                {
+                    oldCts.Cancel();
+                    _leaveCtsByChannel.Remove(beforeChannelId.Value);
+                }
+
+                if (afterChannelId.HasValue)
+                {
+                    var channel = after.VoiceChannel!;
+                    var isAlone = channel.ConnectedUsers.Count == 1 && channel.ConnectedUsers.Any(u => u.Id == botId);
+                    if (isAlone && !_leaveCtsByChannel.ContainsKey(channel.Id))
+                    {
+                        ScheduleLeave(channel);
+                    }
+                }
+
+                return Task.CompletedTask;
+            }
+
+            // For other users, if they join the bot's channel, cancel the leave; if they leave and bot becomes alone, schedule leave
+            if (afterChannelId.HasValue)
+            {
+                var channel = after.VoiceChannel!;
+                var botInChannel = channel.ConnectedUsers.Any(u => u.Id == botId);
+                var userCount = channel.ConnectedUsers.Count;
+
+                if (botInChannel && userCount > 1)
+                {
+                    // Cancel any pending leave
+                    if (_leaveCtsByChannel.TryGetValue(channel.Id, out var cts))
+                    {
+                        cts.Cancel();
+                        _leaveCtsByChannel.Remove(channel.Id);
+                    }
+                }
+            }
+
+            if (beforeChannelId.HasValue)
+            {
+                var channel = before.VoiceChannel!; // user left this channel
+                var botInChannel = channel.ConnectedUsers.Any(u => u.Id == botId);
+                var userCount = channel.ConnectedUsers.Count;
+
+                if (botInChannel && userCount == 1)
+                {
+                    // Bot became alone, schedule leave
+                    if (!_leaveCtsByChannel.ContainsKey(channel.Id))
+                    {
+                        ScheduleLeave(channel);
+                    }
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private void ScheduleLeave(SocketVoiceChannel voiceChannel)
+        {
+            var cts = new CancellationTokenSource();
+            _leaveCtsByChannel[voiceChannel.Id] = cts;
+
+            _ = Task.Run(async () =>
+            {
+                try
+                {
+                    await Task.Delay(TimeSpan.FromMinutes(3), cts.Token);
+
+                    // After delay, verify still alone
+                    var botId = _client.CurrentUser.Id;
+                    var isStillAlone = voiceChannel.ConnectedUsers.Count == 1 && voiceChannel.ConnectedUsers.Any(u => u.Id == botId);
+                    if (isStillAlone)
                     {
                         Console.WriteLine($"Leaving channel {voiceChannel.Name} due to inactivity...");
                         await voiceChannel.DisconnectAsync();
-                await _timers[voiceChannel.Id].DisposeAsync();
-                _timers.Remove(voiceChannel.Id);  // Clean up after leaving
-            }
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                    // Cancelled because someone joined or bot moved
+                }
+                finally
+                {
+                    _leaveCtsByChannel.Remove(voiceChannel.Id);
+                    cts.Dispose();
+                }
+            });
         }
     }
 }

README.md

@@ -1,15 +1,17 @@
-# Lunaris2 - Discord Music Bot
+![Lunaris Logotype](https://github.com/Myxelium/Lunaris2.0/blob/master/LOGOTYPE.png?raw=true)
+
+# Lunaris - Discord BOT
 
 Lunaris2 is a Discord bot designed to play music in your server's voice channels. It's built using C# and the Discord.Net library, and it uses the LavaLink music client for audio streaming.
 
-## Features
+## 🎮Features
 
 - Play music from YouTube directly in your Discord server.
-- Skip tracks, pause, and resume playback.
+- Skip tracks, pause, resume playback and more music related commands.
 - Queue system to line up your favorite tracks.
 - Local LLM (AI chatbot) that answers on @mentions in Discord chat. See more about it below.
 
-## Setup
+## 🤖 Setup
 
 1. Clone the repo.
 2. Extract.
@@ -27,7 +29,8 @@ The LLM is run using Ollama see more about Ollama [here](https://ollama.com/). R
 
 ## PM2 Setup
 - Install PM2 and configure it following their setup guide
-#### Lavalink
+  
+#### 🐦‍🔥 Lavalink
 * Download Lavalink 4.X.X (.jar)
 * Install Java 17
 
@@ -46,6 +49,11 @@ Register the Lunaris bot with PM2:
 - `/play <song>`: Plays the specified song in the voice channel you're currently in.
 - `/skip`: Skips the currently playing song.
 
+## Technical Documentations
+- [Application Layout](https://github.com/Myxelium/Lunaris2.0/blob/master/Bot/README.md)
+  * 🤖 [AI CHAT](https://github.com/Myxelium/Lunaris2.0/blob/master/Bot/Handler/ChatCommand/readme.md)
+  * 🎵 [Music Player](https://github.com/Myxelium/Lunaris2.0/tree/master/Bot/Handler/MusicPlayer)
+
 ## Contributing
 
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.

application.yml

@@ -2,6 +2,14 @@ server: # REST and WS server
   port: 2333
   address: 0.0.0.0
 plugins:
+  jellylink:
+    jellyfin:
+      baseUrl: "http://192.168.50.244:8096"
+      username: "Lunaris"
+      password: "Lunaris"
+      searchLimit: 5
+      audioQuality: "ORIGINAL"   # ORIGINAL | HIGH | MEDIUM | LOW | custom number (kbps)
+      audioCodec: "mp3"          # mp3 | aac | opus | vorbis | flac (only used when not ORIGINAL)
   lavasrc:
     providers: # Custom providers for track loading. This is the default
       # - "dzisrc:%ISRC%" # Deezer ISRC provider
@@ -49,12 +57,9 @@ 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
-    #    some_key: some_value # Some key-value pair for the plugin
-    #    another_key: another_value
+      - ANDROID_TESTSUITE
 lavalink:
   plugins:
       - dependency: com.github.devoxin:lavadspx-plugin:0.0.5 # replace {VERSION} with the latest version from the "Releases" tab.