Fix BasicTrackInfo having wrong TrackID

Add Character Limit to  TrackList Method to fix tracklists being to big for messages

TomatenMusic/Models/BasicTrackInfo.cs

@@ -27,7 +27,7 @@ namespace TomatenMusic_Api.Models
 
             Name = track.Title;
             Platform = ctx.SpotifyIdentifier == null ? TrackPlatform.YOUTUBE : TrackPlatform.SPOTIFY;
-            YoutubeId = track.Identifier;
+            YoutubeId = track.TrackIdentifier;
             SpotifyId = ctx.SpotifyIdentifier;
             URL = ctx.YoutubeUri;
         }

TomatenMusicCore/Commands/PlayCommandGroup.cs

@@ -81,7 +81,7 @@ namespace TomatenMusic.Commands
                 {
                     if (response.isPlaylist)
                     {
-                        LavalinkPlaylist playlist = response.Playlist;
+                        ILavalinkPlaylist playlist = response.Playlist;
                         await player.PlayPlaylistNowAsync(playlist);
 
                         _ = ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Now Playing:").AddEmbed(
@@ -234,7 +234,7 @@ namespace TomatenMusic.Commands
                 {
                     if (response.isPlaylist)
                     {
-                        LavalinkPlaylist playlist = response.Playlist;
+                        ILavalinkPlaylist playlist = response.Playlist;
                         await player.PlayPlaylistAsync(playlist);
 
                         await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Now Playing:").AddEmbed(

TomatenMusicCore/Music/Entitites/ILavalinkPlaylist.cs

@@ -8,7 +8,7 @@ using Lavalink4NET.Player;
 
 namespace TomatenMusic.Music.Entitites
 {
-    public interface LavalinkPlaylist
+    public interface ILavalinkPlaylist
     {
         public string Name { get; }
         public IEnumerable<LavalinkTrack> Tracks { get; }

TomatenMusicCore/Music/Entitites/SpotifyPlaylist.cs

@@ -5,7 +5,7 @@ using System.Text;
 
 namespace TomatenMusic.Music.Entitites
 {
-    public class SpotifyPlaylist : LavalinkPlaylist
+    public class SpotifyPlaylist : ILavalinkPlaylist
     {
         public string Name { get; }
         public IEnumerable<LavalinkTrack> Tracks { get; }

TomatenMusicCore/Music/Entitites/YoutubePlaylist.cs

@@ -9,7 +9,7 @@ using TomatenMusic.Services;
 
 namespace TomatenMusic.Music.Entitites
 {
-    public class YoutubePlaylist : LavalinkPlaylist
+    public class YoutubePlaylist : ILavalinkPlaylist
     {
         public string Name { get; }
 

TomatenMusicCore/Music/GuildPlayer.cs

@@ -114,7 +114,7 @@ namespace TomatenMusic.Music
             QueuePrompt.UpdateFor(GuildId);
         }
 
-        public async Task PlayPlaylistAsync(LavalinkPlaylist playlist)
+        public async Task PlayPlaylistAsync(ILavalinkPlaylist playlist)
         {
             EnsureNotDestroyed();
             EnsureConnected();
@@ -132,7 +132,7 @@ namespace TomatenMusic.Music
             QueuePrompt.UpdateFor(GuildId);
         }
 
-        public async Task PlayPlaylistNowAsync(LavalinkPlaylist playlist)
+        public async Task PlayPlaylistNowAsync(ILavalinkPlaylist playlist)
         {
             EnsureConnected();
             EnsureNotDestroyed();

TomatenMusicCore/Music/MusicActionResponse.cs

@@ -8,11 +8,11 @@ namespace TomatenMusic.Music
 {
     public class MusicActionResponse
     {
-        public LavalinkPlaylist Playlist { get; }
+        public ILavalinkPlaylist Playlist { get; }
         public LavalinkTrack Track { get; }
         public IEnumerable<LavalinkTrack> Tracks { get; }
         public bool isPlaylist { get; }
-        public MusicActionResponse(LavalinkTrack track = null, LavalinkPlaylist playlist = null, IEnumerable<LavalinkTrack> tracks = null)
+        public MusicActionResponse(LavalinkTrack track = null, ILavalinkPlaylist playlist = null, IEnumerable<LavalinkTrack> tracks = null)
         {
             Playlist = playlist;
             Track = track;

TomatenMusicCore/Music/PlayerQueue.cs

@@ -18,7 +18,7 @@ namespace TomatenMusic.Music
         public Queue<LavalinkTrack> Queue { get; set; } = new Queue<LavalinkTrack>();
         public Queue<LavalinkTrack> PlayedTracks { get; set; } = new Queue<LavalinkTrack>();
         public ILogger<PlayerQueue> _logger { get; set; } = TomatenMusicBot.ServiceProvider.GetRequiredService<ILogger<PlayerQueue>>();
-        public LavalinkPlaylist CurrentPlaylist { get; set; }
+        public ILavalinkPlaylist CurrentPlaylist { get; set; }
 
         public LoopType LoopType { get; private set; } = LoopType.NONE;
 
@@ -36,7 +36,7 @@ namespace TomatenMusic.Music
                 QueueLoopList.Add(track);
         }
 
-        public Task QueuePlaylistAsync(LavalinkPlaylist playlist)
+        public Task QueuePlaylistAsync(ILavalinkPlaylist playlist)
         {
             return Task.Run(() =>
             {

TomatenMusicCore/Prompt/Implementation/SongListActionPrompt.cs

@@ -32,7 +32,7 @@ namespace TomatenMusic.Prompt.Implementation
             DiscordEmbedBuilder builder = new DiscordEmbedBuilder()
                 .WithTitle("What do you want to do with these Tracks?");
 
-            builder.WithDescription(Common.TrackListString(Tracks));
+            builder.WithDescription(Common.TrackListString(Tracks, 1000));
 
             return Task.FromResult(new DiscordMessageBuilder().WithEmbed(builder.Build()));
         }

TomatenMusicCore/Prompt/Implementation/SongSelectorPrompt.cs

@@ -87,7 +87,7 @@ namespace TomatenMusic.Prompt.Implementation
         {
 
             builder.WithTitle(Title);
-            builder.WithDescription(Common.TrackListString(PageManager.GetPage(CurrentPage)));
+            builder.WithDescription(Common.TrackListString(PageManager.GetPage(CurrentPage), 4000));
             List<DiscordEmbed> embeds = new List<DiscordEmbed>();
             embeds.Add(builder.Build());
 

TomatenMusicCore/Prompt/Model/DiscordPromptBase.cs

@@ -164,6 +164,7 @@ namespace TomatenMusic.Prompt.Model
             _client = client.GetShard((ulong)interaction.GuildId);
 
             _client.ComponentInteractionCreated += Discord_ComponentInteractionCreated;
+
             ActivePrompts.Add(this);
             AddGuids();
             DiscordWebhookBuilder builder = await GetWebhookMessageAsync();

TomatenMusicCore/Prompt/Option/IPromptOption.cs

@@ -19,8 +19,5 @@ namespace TomatenMusic.Prompt.Option
         public Func<IPromptOption, Task<IPromptOption>> UpdateMethod { get; set; }
         public Func<DSharpPlus.EventArgs.ComponentInteractionCreateEventArgs, DiscordClient, IPromptOption, Task> Run { get; set; }
 
-
-
-
     }
 }

TomatenMusicCore/Services/YoutubeService.cs

@@ -37,7 +37,7 @@ namespace TomatenMusic.Services
 
             if (channel.Statistics.SubscriberCount != null)
                 context.YoutubeAuthorSubs = (ulong) channel.Statistics.SubscriberCount;
-            context.YoutubeAuthorThumbnail = new Uri(channel.Snippet.Thumbnails.High.Url);
+            context.YoutubeAuthorThumbnail = new Uri(channel.Snippet.Thumbnails.Default__.Url);
             context.YoutubeAuthorUri = new Uri($"https://www.youtube.com/channel/{channel.Id}");
             string desc = video.Snippet.Description;
 
@@ -45,7 +45,12 @@ namespace TomatenMusic.Services
             if (video.Statistics.LikeCount != null)
                 context.YoutubeLikes = (ulong) video.Statistics.LikeCount;
             context.YoutubeTags = video.Snippet.Tags;
-            context.YoutubeThumbnail = new Uri(video.Snippet.Thumbnails.High.Url);
+
+            try
+            {
+                context.YoutubeThumbnail = new Uri(video.Snippet.Thumbnails.High.Url);
+            }catch (Exception ex) { }
+
             context.YoutubeUploadDate = (DateTime)video.Snippet.PublishedAt;
             context.YoutubeViews = (ulong)video.Statistics.ViewCount;
             context.YoutubeCommentCount = video.Statistics.CommentCount;
@@ -61,7 +66,7 @@ namespace TomatenMusic.Services
 
             return newTracks;
         }
-        public async Task<LavalinkPlaylist> PopulatePlaylistAsync(YoutubePlaylist playlist)
+        public async Task<ILavalinkPlaylist> PopulatePlaylistAsync(YoutubePlaylist playlist)
         {
             var list = await GetPlaylistAsync(playlist.Identifier);
             var channel = await GetChannelAsync(list.Snippet.ChannelId);
@@ -72,10 +77,14 @@ namespace TomatenMusic.Services
             if (playlist.Description.Length < 2)
                 playlist.Description = "None";
 
-            playlist.Thumbnail = new Uri(list.Snippet.Thumbnails.High.Url);
+            try
+            {
+                playlist.Thumbnail = new Uri(list.Snippet.Thumbnails.Maxres.Url);
+            }catch (Exception ex) { }
+            playlist.AuthorName = channel.Snippet.Title;
             playlist.CreationTime = (DateTime)list.Snippet.PublishedAt;
             playlist.YoutubeItem = list;
-            playlist.AuthorThumbnail = new Uri(channel.Snippet.Thumbnails.High.Url);
+            playlist.AuthorThumbnail = new Uri(channel.Snippet.Thumbnails.Default__.Url);
             playlist.AuthorUri = new Uri($"https://www.youtube.com/channels/{channel.Id}");
 
             return playlist;

TomatenMusicCore/Util/Common.cs

@@ -92,7 +92,7 @@ namespace TomatenMusic.Util
             return builder;
         }
 
-        public static DiscordEmbed AsEmbed(LavalinkPlaylist playlist)
+        public static DiscordEmbed AsEmbed(ILavalinkPlaylist playlist)
         {
 
             DiscordEmbedBuilder builder = new DiscordEmbedBuilder();
@@ -100,11 +100,11 @@ namespace TomatenMusic.Util
             if (playlist is YoutubePlaylist)
             {
                 YoutubePlaylist youtubePlaylist = (YoutubePlaylist)playlist;
-
+                Console.WriteLine($"{playlist.AuthorName}, {playlist.AuthorUri.ToString()}, {playlist.AuthorThumbnail.ToString()}");
                 builder.WithAuthor(playlist.AuthorName, playlist.AuthorUri.ToString(), youtubePlaylist.AuthorThumbnail.ToString());
                 builder.WithTitle(playlist.Name);
                 builder.WithUrl(playlist.Url);
-                builder.WithDescription(TrackListString(playlist.Tracks));
+                builder.WithDescription(TrackListString(playlist.Tracks, 4000));
                 builder.WithImageUrl(youtubePlaylist.Thumbnail);
                 builder.AddField("Description", playlist.Description, false);
                 builder.AddField("Track Count", $"{playlist.Tracks.Count()} Tracks", true);
@@ -117,7 +117,7 @@ namespace TomatenMusic.Util
 
                 builder.WithTitle(playlist.Name);
                 builder.WithUrl(playlist.Url);
-                builder.WithDescription(TrackListString(playlist.Tracks));
+                builder.WithDescription(TrackListString(playlist.Tracks, 4000));
                 builder.AddField("Description", playlist.Description, false);
                 builder.AddField("Track Count", $"{playlist.Tracks.Count()} Tracks", true);
                 builder.AddField("Length", $"{Common.GetTimestamp(playlist.GetLength())}", true);
@@ -136,7 +136,7 @@ namespace TomatenMusic.Util
         {
             DiscordEmbedBuilder builder = new DiscordEmbedBuilder();
 
-            builder.WithDescription(TrackListString(player.PlayerQueue.Queue));
+            builder.WithDescription(TrackListString(player.PlayerQueue.Queue, 4000));
             builder.WithTitle("Current Queue");
             builder.WithAuthor($"{player.PlayerQueue.Queue.Count} Songs");
 
@@ -154,24 +154,28 @@ namespace TomatenMusic.Util
                 builder.AddField("Current Playlist", $"[{player.PlayerQueue.CurrentPlaylist.Name}]({player.PlayerQueue.CurrentPlaylist.Url})", true);
 
             if (player.PlayerQueue.PlayedTracks.Any())
-                builder.AddField("History", TrackListString(player.PlayerQueue.PlayedTracks), true);
+                builder.AddField("History", TrackListString(player.PlayerQueue.PlayedTracks, 1000), true);
 
             return builder;
         }
 
-        public static string TrackListString(IEnumerable<LavalinkTrack> tracks)
+        public static string TrackListString(IEnumerable<LavalinkTrack> tracks, int maxCharacters)
         {
             StringBuilder builder = new StringBuilder();
+            string lastString = " ";
             int count = 1;
             foreach (LavalinkTrack track in tracks)
             {
-                FullTrackContext context = (FullTrackContext)track.Context;
-                if (count > 10)
+                if (builder.ToString().Length > maxCharacters)
                 {
-                    builder.Append(String.Format("***And {0} more...***", tracks.Count() - 10));
+                    builder = new StringBuilder(lastString);
+                    builder.Append(String.Format("***And {0} more...***", tracks.Count() - count));
                     break;
                 }
 
+                FullTrackContext context = (FullTrackContext)track.Context;
+
+                lastString = builder.ToString();
                 builder.Append(count).Append(": ").Append($"[{track.Title}]({context.YoutubeUri})").Append(" [").Append(Common.GetTimestamp(track.Duration)).Append("] | ");
                 builder.Append($"[{track.Author}]({context.YoutubeAuthorUri})").Append("\n\n");
                 count++;