Small fix

Test

Migrate from Victoria

Bot/Handler/MusicPlayer/MessageModule.cs

@@ -39,26 +39,6 @@ public static class MessageModule
         }
     }
 
-    public static async Task RemoveMessages(this SocketSlashCommand context, DiscordSocketClient client)
-    {
-        var guildId = context.GetGuild(client).Id;
-
-        if (GuildMessageIds.TryGetValue(guildId, out var value))
-        {
-            if (value.Count <= 0) 
-                return;
-            
-            foreach (var messageId in value)
-            {
-                var messageToDelete = await context.Channel.GetMessageAsync(messageId);
-                if (messageToDelete != null)
-                    await messageToDelete.DeleteAsync();
-            }
-
-            value.Clear();
-        }
-    }
-
     private static async Task<ulong> StoreForRemoval(SocketSlashCommand context, DiscordSocketClient client)
     {
         var guildId = context.GetGuild(client).Id;

Bot/Handler/MusicPlayer/PlayCommand/PlayHandler.cs

@@ -16,7 +16,6 @@ public class PlayHandler : IRequestHandler<PlayCommand>
     private readonly DiscordSocketClient _client;
     private readonly IAudioService _audioService;
     private SocketSlashCommand _context;
-    private const int MaxTrackDuration = 30;
     
     public PlayHandler(
         DiscordSocketClient client, 
@@ -38,74 +37,57 @@ public class PlayHandler : IRequestHandler<PlayCommand>
             await _musicEmbed.NowPlayingEmbed(track, _context, _client);
     }
 
-    public Task Handle(PlayCommand command, CancellationToken cancellationToken)
+    public async Task Handle(PlayCommand command, CancellationToken cancellationToken)
     {
-        new Thread(PlayMusic).Start();
-        return Task.CompletedTask;
+        await _audioService.StartAsync(cancellationToken);
+        var context = command.Message;
+        _context = context;
         
-        async void PlayMusic()
+        var searchQuery = context.GetOptionValueByName(Option.Input);
+
+        if (string.IsNullOrWhiteSpace(searchQuery)) {
+            await context.SendMessageAsync("Please provide search terms.", _client);
+            return;
+        }
+        
+        var player = await _audioService.GetPlayerAsync(_client, context, connectToVoiceChannel: true);
+
+        if (player is null)
+            return;
+
+        var trackLoadOptions = new TrackLoadOptions
         {
-            try
+            SearchMode = TrackSearchMode.YouTube,
+        };
+
+        var track = await _audioService.Tracks
+            .LoadTrackAsync(
+                searchQuery,
+                trackLoadOptions,
+                cancellationToken: cancellationToken);
+        
+        if (track is null) 
+            await context.SendMessageAsync("😖 No results.", _client);
+
+        if (player.CurrentTrack is null)
+        {
+            await player
+                .PlayAsync(track, cancellationToken: cancellationToken)
+                .ConfigureAwait(false);
+        
+            await _musicEmbed.NowPlayingEmbed(track, context, _client);
+        }
+        else
+        {
+            if (track != null)
             {
-                await _audioService.StartAsync(cancellationToken);
-                
-                var context = command.Message;
-                _context = context;
-                
-                if ((context.User as SocketGuildUser)?.VoiceChannel == null)
-                {
-                    await context.SendMessageAsync("You must be in a voice channel to use this command.", _client);
-                    return;
-                }
-                
-                var searchQuery = context.GetOptionValueByName(Option.Input);
-
-                if (string.IsNullOrWhiteSpace(searchQuery))
-                {
-                    await context.SendMessageAsync("Please provide search terms.", _client);
-                    return;
-                }
-                
-                await context.SendMessageAsync("📻 Searching...", _client);
-                
-                var player = await _audioService.GetPlayerAsync(_client, context, connectToVoiceChannel: true);
-
-                if (player is null) 
-                    return;
-
-                var trackLoadOptions = new TrackLoadOptions { SearchMode = TrackSearchMode.YouTube, };
-
-                var track = await _audioService.Tracks.LoadTrackAsync(searchQuery, trackLoadOptions, cancellationToken: cancellationToken);
-
-                if (track is null)
-                {
-                    await context.SendMessageAsync("😖 No results.", _client);
-                    return;
-                }
-                
-                if (player.CurrentTrack?.Duration.TotalMinutes > MaxTrackDuration)
-                {
-                    await context.SendMessageAsync($"🔈 Sorry the track is longer than { MaxTrackDuration } minutes, to save resources this limit is active for now.", _client);
-                    return;
-                }
-
-                if (player.CurrentTrack is null)
-                {
-                    await player.PlayAsync(track, cancellationToken: cancellationToken)
-                        .ConfigureAwait(false);
-
-                    await _musicEmbed.NowPlayingEmbed(track, context, _client);
-                }
-                else
-                {
-                    var queueTracks = new[] { new TrackQueueItem(track) };
-                    await player.Queue.AddRangeAsync(queueTracks, cancellationToken);
-                    await context.SendMessageAsync($"🔈 Added to queue: {track.Title}", _client);
-                }
+                var queueTracks = new[] { new TrackQueueItem(track) };
+                await player.Queue.AddRangeAsync(queueTracks, cancellationToken);
+                await context.SendMessageAsync($"🔈 Added to queue: {track.Title}", _client);
             }
-            catch (Exception error)
+            else
             {
-                throw new Exception("Error occured in the Play handler!", error);
+                await context.SendMessageAsync($"Couldn't read song information", _client);
             }
         }
     }

Bot/Program.cs

@@ -6,7 +6,6 @@ using Lunaris2.Handler.ChatCommand;
 using Lavalink4NET.Extensions;
 using Lunaris2.Handler.MusicPlayer;
 using Lunaris2.Notification;
-using Lunaris2.Service;
 using Lunaris2.SlashCommand;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -42,7 +41,10 @@ public class Program
                     .Build();
 
                 services
+                    .AddSingleton(client)
                     .AddMediatR(mediatRServiceConfiguration => mediatRServiceConfiguration.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly()))
+                    .AddSingleton<DiscordEventListener>()
+                    .AddSingleton(service => new InteractionService(service.GetRequiredService<DiscordSocketClient>()))
                     .AddLavalink()
                     .ConfigureLavalink(options =>
                     {
@@ -56,10 +58,6 @@ public class Program
                     .AddSingleton<LavaNode>()
                     .AddSingleton<MusicEmbed>()
                     .AddSingleton<ChatSettings>()
-                    .AddSingleton(client)
-                    .AddSingleton<DiscordEventListener>()
-                    .AddSingleton<VoiceChannelMonitorService>()
-                    .AddSingleton(service => new InteractionService(service.GetRequiredService<DiscordSocketClient>()))
                     .Configure<ChatSettings>(configuration.GetSection("LLM"));
 
                 client.Ready += () => Client_Ready(client);
@@ -88,8 +86,6 @@ public class Program
     private static Task Client_Ready(DiscordSocketClient client)
     {
         client.RegisterCommands();
-        
-        new VoiceChannelMonitorService(client).StartMonitoring();
         return Task.CompletedTask;
     }
         

Bot/Service/VoiceChannelMonitorService.cs

@@ -1,59 +0,0 @@
-using Discord.WebSocket;
-
-namespace Lunaris2.Service;
-
-public class VoiceChannelMonitorService
-{
-    private readonly DiscordSocketClient _client;
-    private readonly Dictionary<ulong, Timer> _timers = new();
-
-    public VoiceChannelMonitorService(DiscordSocketClient client)
-    {
-        _client = client;
-    }
-
-    public void StartMonitoring()
-    {
-        Task.Run(async () =>
-        {
-            while (true)
-            {
-                await CheckVoiceChannels();
-                await Task.Delay(TimeSpan.FromMinutes(1));
-            }
-        });
-    }
-
-    private async Task CheckVoiceChannels()
-    {
-        foreach (var guild in _client.Guilds)
-        {
-            var voiceChannel = guild.VoiceChannels.FirstOrDefault(vc => vc.ConnectedUsers.Count == 1);
-            if (voiceChannel != null)
-            {
-                if (!_timers.ContainsKey(voiceChannel.Id))
-                {
-                    _timers[voiceChannel.Id] = new Timer(async _ => await LeaveChannel(voiceChannel), null, TimeSpan.FromMinutes(3), Timeout.InfiniteTimeSpan);
-                }
-            }
-            else
-            {
-                if (voiceChannel == null || !_timers.ContainsKey(voiceChannel.Id)) 
-                    continue;
-                
-                await _timers[voiceChannel.Id].DisposeAsync();
-                _timers.Remove(voiceChannel.Id);
-            }
-        }
-    }
-
-    private async Task LeaveChannel(SocketVoiceChannel voiceChannel)
-    {
-        if (voiceChannel.ConnectedUsers.Count == 1 && voiceChannel.Users.Any(u => u.Id == _client.CurrentUser.Id))
-        {
-            await voiceChannel.DisconnectAsync();
-            await _timers[voiceChannel.Id].DisposeAsync();
-            _timers.Remove(voiceChannel.Id);
-        }
-    }
-}

Bot/SlashCommand/Command.cs

@@ -9,6 +9,18 @@ public static class Option
 
 public static class Command
 {
+    // public static class Hello
+    // {
+    //     public const string Name = "hello";
+    //     public const string Description = "Say hello to the bot!";
+    // }
+    //
+    // public static class Goodbye
+    // {
+    //     public const string Name = "goodbye";
+    //     public const string Description = "Say goodbye to the bot!";
+    // }
+    
     public static class Disconnect
     {
         public const string Name = "disconnect";

README.md

@@ -23,24 +23,6 @@ Lunaris supports AI chat using a large language model, this is done by hosting t
 
 The LLM is run using Ollama see more about Ollama [here](https://ollama.com/). Running LLM locally requires much resources from your system, minimum requirements is at least 8GB of ram. If your don't have enought ram, select a LLM model in the [appsettings file](https://github.com/Myxelium/Lunaris2.0/blob/master/Bot/appsettings.json#L15) that requires less of your system.
 
-*NOTE: you need to download the model from the Ollama ui, the model name which is preselected in the code is called ``gemma``.*
-
-## PM2 Setup
-- Install PM2 and configure it following their setup guide
-#### Lavalink
-* Download Lavalink 4.X.X (.jar)
-* Install Java 17
-
-If using Linux run following command to start Lavalink with PM2:
-``pm2 start "sudo java -Xmx1G -jar Lavalink.jar" --name Lavalink4.0.7``
-
-For me I have Lavalink.jar downloaded in ``/opt`` folder from Linux root. By running Lavalink using PM2, you can monitor it and manage it from a page in your browser instead of having to access the server terminal.
-#### Lunaris
-* Install dotnet
-
-Register the Lunaris bot with PM2:
-``pm2 start "dotnet Lunaris2.dll"``
-
 ## Usage
 
 - `/play <song>`: Plays the specified song in the voice channel you're currently in.