Compare commits

..

2 Commits

Author SHA1 Message Date
4ba01ed72b Small fix (#6)
Co-authored-by: Myx <info@azaaxin.com>
2024-08-13 03:24:29 +02:00
1e2c10a7ea Require user to be in chat to queue (#5)
Co-authored-by: Myx <info@azaaxin.com>
2024-08-12 19:16:11 +02:00
4 changed files with 89 additions and 31 deletions

View File

@@ -39,6 +39,26 @@ 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) private static async Task<ulong> StoreForRemoval(SocketSlashCommand context, DiscordSocketClient client)
{ {
var guildId = context.GetGuild(client).Id; var guildId = context.GetGuild(client).Id;

View File

@@ -5,7 +5,6 @@ using Lavalink4NET;
using Lavalink4NET.Events.Players; using Lavalink4NET.Events.Players;
using Lavalink4NET.Players.Queued; using Lavalink4NET.Players.Queued;
using Lavalink4NET.Rest.Entities.Tracks; using Lavalink4NET.Rest.Entities.Tracks;
using System.Threading;
namespace Lunaris2.Handler.MusicPlayer.PlayCommand; namespace Lunaris2.Handler.MusicPlayer.PlayCommand;
@@ -17,6 +16,7 @@ public class PlayHandler : IRequestHandler<PlayCommand>
private readonly DiscordSocketClient _client; private readonly DiscordSocketClient _client;
private readonly IAudioService _audioService; private readonly IAudioService _audioService;
private SocketSlashCommand _context; private SocketSlashCommand _context;
private const int MaxTrackDuration = 30;
public PlayHandler( public PlayHandler(
DiscordSocketClient client, DiscordSocketClient client,
@@ -44,11 +44,20 @@ public class PlayHandler : IRequestHandler<PlayCommand>
return Task.CompletedTask; return Task.CompletedTask;
async void PlayMusic() async void PlayMusic()
{
try
{ {
await _audioService.StartAsync(cancellationToken); await _audioService.StartAsync(cancellationToken);
var context = command.Message; var context = command.Message;
_context = context; _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); var searchQuery = context.GetOptionValueByName(Option.Input);
if (string.IsNullOrWhiteSpace(searchQuery)) if (string.IsNullOrWhiteSpace(searchQuery))
@@ -57,15 +66,28 @@ public class PlayHandler : IRequestHandler<PlayCommand>
return; return;
} }
await context.SendMessageAsync("📻 Searching...", _client);
var player = await _audioService.GetPlayerAsync(_client, context, connectToVoiceChannel: true); var player = await _audioService.GetPlayerAsync(_client, context, connectToVoiceChannel: true);
if (player is null) return; if (player is null)
return;
var trackLoadOptions = new TrackLoadOptions { SearchMode = TrackSearchMode.YouTube, }; var trackLoadOptions = new TrackLoadOptions { SearchMode = TrackSearchMode.YouTube, };
var track = await _audioService.Tracks.LoadTrackAsync(searchQuery, trackLoadOptions, cancellationToken: cancellationToken); var track = await _audioService.Tracks.LoadTrackAsync(searchQuery, trackLoadOptions, cancellationToken: cancellationToken);
if (track is null) await context.SendMessageAsync("😖 No results.", _client); 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) if (player.CurrentTrack is null)
{ {
@@ -75,17 +97,15 @@ public class PlayHandler : IRequestHandler<PlayCommand>
await _musicEmbed.NowPlayingEmbed(track, context, _client); await _musicEmbed.NowPlayingEmbed(track, context, _client);
} }
else else
{
if (track != null)
{ {
var queueTracks = new[] { new TrackQueueItem(track) }; var queueTracks = new[] { new TrackQueueItem(track) };
await player.Queue.AddRangeAsync(queueTracks, cancellationToken); await player.Queue.AddRangeAsync(queueTracks, cancellationToken);
await context.SendMessageAsync($"🔈 Added to queue: {track.Title}", _client); await context.SendMessageAsync($"🔈 Added to queue: {track.Title}", _client);
} }
else }
catch (Exception error)
{ {
await context.SendMessageAsync($"Couldn't read song information", _client); throw new Exception("Error occured in the Play handler!", error);
}
} }
} }
} }

View File

@@ -23,6 +23,24 @@ 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. 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 ## Usage
- `/play <song>`: Plays the specified song in the voice channel you're currently in. - `/play <song>`: Plays the specified song in the voice channel you're currently in.