myxelium/Lunaris2.0
1
0
Fork 0
mirror of https://github.com/Myxelium/Lunaris2.0.git synced 2026-04-13 08:00:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Spotify support (#7)

Browse Source 
Co-authored-by: Myx <info@azaaxin.com>
This commit is contained in:
SocksOnHead
2024-10-23 10:31:27 +02:00
committed by GitHub
parent e044f2f91b
commit 373d482906
19 changed files with 382 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Bot/Handler/MessageReceivedHandler.cs
View File

@@ -1,4 +1,6 @@
using System.Text;
using System.Text.RegularExpressions;
using Discord;
using Discord.WebSocket;
using Lunaris2.Notification;
using MediatR;
@@ -19,13 +21,41 @@ 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.Users.Any(user => user.IsBot));
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 embed = new EmbedBuilder()
.WithTitle("Lunaris Statistics")
.WithDescription(table.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);

22
Bot/Handler/MusicPlayer/ClearQueueCommand/ClearQueueHandler.cs Normal file
View File

@@ -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);
}
}

2
Bot/Handler/MusicPlayer/DisconnectCommand/DisconnectHandler.cs
View File

@@ -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);
}
}

29
Bot/Handler/MusicPlayer/MessageModule.cs
View File

@@ -1,4 +1,6 @@
using System.Net;
using Discord;
using Discord.Net;
using Discord.WebSocket;
namespace Lunaris2.Handler.MusicPlayer;
@@ -65,20 +67,35 @@ public static class MessageModule
if (GuildMessageIds.TryGetValue(guildId, out var value))
{
if (value.Count <= 0)
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)
{
var messageToDelete = await context.Channel.GetMessageAsync(messageId);
if (messageToDelete != null)
await messageToDelete.DeleteAsync();
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>());
}

29
Bot/Handler/MusicPlayer/MusicEmbed.cs
View File

@@ -1,5 +1,6 @@
using Discord;
using Discord.WebSocket;
using Lavalink4NET.Players.Queued;
using Lavalink4NET.Tracks;
namespace Lunaris2.Handler.MusicPlayer;
@@ -11,30 +12,38 @@ 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,
player.Duration.ToString(),
player.Author,
context.User.Username);
track.Title,
duration.ToString(@"hh\:mm\:ss"),
track.Author,
context.User.Username,
nextSong);
await context.SendMessageAsync(embed, client);
}
}

30
Bot/Handler/MusicPlayer/PlayCommand/NormalizationFilter.cs Normal file
View File

@@ -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);
}
}

142
Bot/Handler/MusicPlayer/PlayCommand/PlayHandler.cs
View File

@@ -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,18 +32,37 @@ 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)
await _musicEmbed.NowPlayingEmbed(track, _context, _client);
if (player?.CurrentTrack is null)
{
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)
{
new Thread(PlayMusic).Start();
@@ -47,6 +72,8 @@ public class PlayHandler : IRequestHandler<PlayCommand>
{
try
{
RegisterTrackStartedEventListerner(command);
await _audioService.StartAsync(cancellationToken);
var context = command.Message;
@@ -69,38 +96,66 @@ public class PlayHandler : IRequestHandler<PlayCommand>
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;
}
await ApplyFilters(cancellationToken, player);
await ConfigureSponsorBlock(cancellationToken, player);
if (player.CurrentTrack is null)
{
await player.PlayAsync(track, cancellationToken: cancellationToken)
.ConfigureAwait(false);
var trackLoadOptions = new TrackLoadOptions
{
SearchMode = TrackSearchMode.YouTube,
};
await _musicEmbed.NowPlayingEmbed(track, context, _client);
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)
{
// If it's a playlist, check if it's a free-text input.
if (!Uri.IsWellFormedUriString(searchQuery, UriKind.Absolute))
{
// Free text was used (not a direct URL to a playlist), let's prevent queueing the whole playlist.
// Queue only the first track of the search result
// var firstTrack = trackCollection.Tracks.FirstOrDefault();
if (trackCollection.Track != null)
{
await player.PlayAsync(trackCollection.Track, cancellationToken: cancellationToken).ConfigureAwait(false);
await _musicEmbed.NowPlayingEmbed(trackCollection.Track, _context, _client);
}
else
{
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($"Queued playlist {trackCollection.Playlist?.Name} with {queueTracks.Count} tracks.", _client);
}
}
else
{
var queueTracks = new[] { new TrackQueueItem(track) };
await player.Queue.AddRangeAsync(queueTracks, cancellationToken);
await context.SendMessageAsync($"🔈 Added to queue: {track.Title}", _client);
// It's just a single track or a search result.
var track = trackCollection.Tracks.FirstOrDefault();
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);
}
}

4
Bot/Handler/SlashCommandReceivedHandler.cs
View File

@@ -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;
}
}
}