- fix spotify playlist playback

- fix spotify playlist embed failing due to too long description
- fix not removing current playlist after adding another
- exchanged Description and Tracks field in playlist embed

TomatenMusicCore/Commands/PlayCommandGroup.cs

@@ -206,14 +206,14 @@ namespace TomatenMusic.Commands
                     }
                 }
 
-                try
+            try
                 {
                     if (response.isPlaylist)
                     {
                         LavalinkPlaylist playlist = response.Playlist;
                         await player.PlayPlaylistAsync(playlist);
 
-                        _ = ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Now Playing:").AddEmbed(
+                        await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Now Playing:").AddEmbed(
                         Common.AsEmbed(playlist)
                         ));
 
@@ -231,7 +231,7 @@ namespace TomatenMusic.Commands
                 catch (Exception ex)
                 {
                     await ctx.EditResponseAsync(new DiscordWebhookBuilder()
-                     .WithContent($"❌ An error occured while playing your Track: ``{ex.Message}``")
+                     .WithContent($"❌ An error occured while playing your Track: ``{ex.Message}``, ```{ex.StackTrace}```")
                       );
                     return;
                 }

TomatenMusicCore/Music/PlayerQueue.cs

@@ -40,8 +40,10 @@ namespace TomatenMusic.Music
         {
             return Task.Run(() =>
             {
-                if (CurrentPlaylist == null)
+                if (CurrentPlaylist == null && Queue.Count == 0)
                     CurrentPlaylist = playlist;
+                else
+                    CurrentPlaylist = null;
 
                 _logger.LogInformation("Queued Playlist {0}", playlist.Name);
                 foreach (LavalinkTrack track in playlist.Tracks)

TomatenMusicCore/Services/SpotifyService.cs

@@ -70,7 +70,7 @@ namespace TomatenMusic.Services
 
                     if (track == null) throw new ArgumentException("This Spotify Track was not found on Youtube");
 
-                    tracks.Add(await FullTrackContext.PopulateAsync(track, sTrack.Uri));
+                    tracks.Add(await FullTrackContext.PopulateAsync(track, sTrack.Uri.Replace("spotify:track:", "")));
                 }
                 Uri uri;
                 Uri.TryCreate(url, UriKind.Absolute, out uri);
@@ -98,7 +98,7 @@ namespace TomatenMusic.Services
 
                         if (track == null) throw new ArgumentException("This Spotify Track was not found on Youtube");
 
-                        tracks.Add(await FullTrackContext.PopulateAsync(track, fullTrack.Uri));
+                        tracks.Add(await FullTrackContext.PopulateAsync(track, fullTrack.Uri.Replace("spotify:track:", "")));
                     }
 
                 }
@@ -115,23 +115,35 @@ namespace TomatenMusic.Services
         public async Task<SpotifyPlaylist> PopulateSpotifyPlaylistAsync(SpotifyPlaylist playlist)
         {
             var list = await this.Playlists.Get(playlist.Identifier);
-            playlist.Description = list.Description;
+            string desc = list.Description;
-            playlist.AuthorUri = new Uri(list.Owner.Uri);
+
+            playlist.Description = desc.Substring(0, Math.Min(desc.Length, 1024)) + (desc.Length > 1020 ? "..." : " ");
+            if (playlist.Description.Length < 2)
+                playlist.Description = "None";
+
+            playlist.AuthorUri = new Uri($"https://open.spotify.com/user/{list.Owner.Id}");
             playlist.AuthorName = list.Owner.DisplayName;
             playlist.Followers = list.Followers.Total;
-            playlist.Url = new Uri(list.Uri);
+            playlist.Url = new Uri($"https://open.spotify.com/playlist/{playlist.Identifier}");
-            playlist.AuthorThumbnail = new Uri(list.Owner.Images.First().Url);
+            try
+            {
+                playlist.AuthorThumbnail = new Uri(list.Owner.Images.First().Url);
+            }
+            catch (Exception ex) { }
+
             return playlist;
         }
 
         public async Task<SpotifyPlaylist> PopulateSpotifyAlbumAsync(SpotifyPlaylist playlist)
         {
             var list = await this.Albums.Get(playlist.Identifier);
-            playlist.Description = list.Label;
+            string desc = list.Label;
-            playlist.AuthorUri = new Uri(list.Artists.First().Uri);
+
+            playlist.Description = desc.Substring(0, Math.Min(desc.Length, 1024)) + (desc.Length > 1020 ? "..." : " ");
+            playlist.AuthorUri = new Uri($"https://open.spotify.com/user/{list.Artists.First().Uri}");
             playlist.AuthorName = list.Artists.First().Name;
             playlist.Followers = list.Popularity;
-            playlist.Url = new Uri(list.Uri);
+            playlist.Url = new Uri($"https://open.spotify.com/album/{playlist.Identifier}");
 
             return playlist;
         }
@@ -147,7 +159,7 @@ namespace TomatenMusic.Services
             context.SpotifyAlbum = spotifyTrack.Album;
             context.SpotifyArtists = spotifyTrack.Artists;
             context.SpotifyPopularity = spotifyTrack.Popularity;
-            context.SpotifyUri = new Uri(spotifyTrack.Uri);
+            context.SpotifyUri = new Uri($"https://open.spotify.com/track/{context.SpotifyIdentifier}");
             track.Context = context;
 
             return track;

TomatenMusicCore/Services/YoutubeService.cs

@@ -39,7 +39,9 @@ namespace TomatenMusic.Services
                 context.YoutubeAuthorSubs = (ulong) channel.Statistics.SubscriberCount;
             context.YoutubeAuthorThumbnail = new Uri(channel.Snippet.Thumbnails.High.Url);
             context.YoutubeAuthorUri = new Uri($"https://www.youtube.com/channel/{channel.Id}");
-            context.YoutubeDescription = video.Snippet.Description;
+            string desc = video.Snippet.Description;
+
+            context.YoutubeDescription = desc.Substring(0, Math.Min(desc.Length, 1024)) + (desc.Length > 1020 ? "..." : " ");
             if (video.Statistics.LikeCount != null)
                 context.YoutubeLikes = (ulong) video.Statistics.LikeCount;
             context.YoutubeTags = video.Snippet.Tags;
@@ -66,7 +68,10 @@ namespace TomatenMusic.Services
 
             string desc = list.Snippet.Description;
 
-            playlist.Description = desc.Substring(0, Math.Min(desc.Length, 4092)) + (desc.Length > 4092 ? "..." : " ");
+            playlist.Description = desc.Substring(0, Math.Min(desc.Length, 1024)) + (desc.Length > 1020 ? "..." : " ");
+            if (playlist.Description == "")
+                playlist.Description = "None";
+
             playlist.Thumbnail = new Uri(list.Snippet.Thumbnails.High.Url);
             playlist.CreationTime = (DateTime)list.Snippet.PublishedAt;
             playlist.YoutubeItem = list;

TomatenMusicCore/TomatenMusicBot.cs

@@ -186,7 +186,7 @@ namespace TomatenMusic
             if (e.Exception is NotFoundException)
                 logger.LogDebug($"{ ((NotFoundException)e.Exception).JsonMessage }");
             if (e.Exception is BadRequestException)
-                logger.LogDebug($"{ ((BadRequestException)e.Exception).JsonMessage }");
+                logger.LogInformation($"{ ((BadRequestException)e.Exception).Errors }");
             return Task.CompletedTask;
 
         }

TomatenMusicCore/Util/Common.cs

@@ -104,9 +104,9 @@ namespace TomatenMusic.Util
                 .WithAuthor(playlist.AuthorName, playlist.AuthorUri.ToString(), youtubePlaylist.AuthorThumbnail.ToString())
                 .WithTitle(playlist.Name)
                 .WithUrl(playlist.Url)
-                .WithDescription(playlist.Description)
+                .WithDescription(TrackListString(playlist.Tracks))
                 .WithImageUrl(youtubePlaylist.Thumbnail)
-                .AddField("Tracks", TrackListString(playlist.Tracks), false)
+                .AddField("Description", playlist.Description, false)
                 .AddField("Track Count", $"{playlist.Tracks.Count()} Tracks", true)
                 .AddField("Length", $"{Common.GetTimestamp(playlist.GetLength())}", true)
                 .AddField("Create Date", $"{youtubePlaylist.CreationTime:dd. MMMM, yyyy}", true);
@@ -115,17 +115,21 @@ namespace TomatenMusic.Util
             {
                 SpotifyPlaylist spotifyPlaylist = (SpotifyPlaylist)playlist;
                 builder
-                .WithAuthor(playlist.AuthorName, playlist.AuthorUri.ToString(), spotifyPlaylist.AuthorThumbnail.ToString())
                 .WithTitle(playlist.Name)
                 .WithUrl(playlist.Url)
-                .WithDescription(playlist.Description)
+                .WithDescription(TrackListString(playlist.Tracks))
-                .AddField("Tracks", TrackListString(playlist.Tracks), false)
+                .AddField("Description", playlist.Description, false)
                 .AddField("Track Count", $"{playlist.Tracks.Count()} Tracks", true)
                 .AddField("Length", $"{Common.GetTimestamp(playlist.GetLength())}", true)
                 .AddField("Spotify Followers", $"{spotifyPlaylist.Followers:N0}", true);
+                if (spotifyPlaylist.AuthorThumbnail != null)
+                {
+                    builder.WithAuthor(playlist.AuthorName, playlist.AuthorUri.ToString(), spotifyPlaylist.AuthorThumbnail.ToString());
+                }else
+                    builder.WithAuthor(playlist.AuthorName, playlist.AuthorUri.ToString());
             }
 
-            return builder;
+            return builder.Build();
         }
 
         public static DiscordEmbed GetQueueEmbed(GuildPlayer player)
@@ -161,9 +165,9 @@ namespace TomatenMusic.Util
             foreach (LavalinkTrack track in tracks)
             {
                 FullTrackContext context = (FullTrackContext)track.Context;
-                if (count > 15)
+                if (count > 10)
                 {
-                    builder.Append(String.Format("***And {0} more...***", tracks.Count() - 15));
+                    builder.Append(String.Format("***And {0} more...***", tracks.Count() - 10));
                     break;
                 }