fix playlist playback nicely

fix tracks in history still having timestamps

TomatenMusic/Services/TomatenMusicService.cs

@@ -46,9 +46,9 @@ namespace TomatenMusic_Api
 			if (e.Response.IsPlaylist)
             {
 				if (e.Now)
-					await player.PlayPlaylistNowAsync(e.Response.Playlist);
+					await player.PlayNowAsync(e.Response.Playlist);
 				else
-					await player.PlayPlaylistAsync(e.Response.Playlist);
+					await player.PlayItemAsync(e.Response.Playlist);
 			}else
             {
 				if (e.Now)

TomatenMusicCore/Commands/PlayCommandGroup.cs

@@ -84,7 +84,7 @@ namespace TomatenMusic.Commands
                     if (response.IsPlaylist)
                     {
                         ILavalinkPlaylist playlist = response.Playlist;
-                        await player.PlayPlaylistNowAsync(playlist);
+                        await player.PlayNowAsync(playlist);
 
                         _ = ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Now Playing:").AddEmbed(
                         Common.AsEmbed(playlist)
@@ -237,7 +237,7 @@ namespace TomatenMusic.Commands
                     if (response.IsPlaylist)
                     {
                         ILavalinkPlaylist playlist = response.Playlist;
-                        await player.PlayPlaylistAsync(playlist);
+                        await player.PlayItemAsync(playlist);
 
                         await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Now Playing:").AddEmbed(
                         Common.AsEmbed(playlist)

TomatenMusicCore/Music/Entitites/FullTrackContext.cs

@@ -20,7 +20,7 @@ namespace TomatenMusic.Music.Entitites
         public IEnumerable<string> YoutubeTags { get; set; }
         public ulong YoutubeViews { get; set; }
         public ulong YoutubeLikes { get; set; }
-        public Uri YoutubeThumbnail { get; set; }
+        public Uri? YoutubeThumbnail { get; set; } = null;
         public DateTime YoutubeUploadDate { get; set; }
         //
         // Summary:

TomatenMusicCore/Music/GuildPlayer.cs

@@ -64,26 +64,6 @@ namespace TomatenMusic.Music
             QueuePrompt.UpdateFor(GuildId);
         }
 
-        public async Task PlayPlaylistAsync(ILavalinkPlaylist playlist)
-        {
-            EnsureNotDestroyed();
-            EnsureConnected();
-
-            _logger.LogInformation("Started playing Playlist {0} on Guild {1}", playlist.Title, (await GetGuildAsync()).Name);
-
-
-            QueuePrompt.UpdateFor(GuildId);
-        }
-
-        public async Task PlayPlaylistNowAsync(ILavalinkPlaylist playlist)
-        {
-            EnsureConnected();
-            EnsureNotDestroyed();
-
-
-            QueuePrompt.UpdateFor(GuildId);
-        }
-
         public async Task RewindAsync()
         {
             EnsureNotDestroyed();
@@ -246,9 +226,13 @@ namespace TomatenMusic.Music
                         return;
                     }
 
-                    LavalinkTrack newTrack = await youtube.GetRelatedTrackAsync(oldTrack.TrackIdentifier, PlayerQueue.PlayedTracks.Take(5).ToList().ConvertAll(x => x.TrackIdentifier));
+                    TomatenMusicTrack newTrack = await youtube.GetRelatedTrackAsync(oldTrack.TrackIdentifier, PlayerQueue.PlayedTracks.Take(5).ToList().ConvertAll(x => x.TrackIdentifier));
                     _logger.LogInformation($"Autoplaying for track {oldTrack.TrackIdentifier} with Track {newTrack.TrackIdentifier}");
-                    await PlayAsync(newTrack);
+                    await base.OnTrackEndAsync(eventArgs);
+                    PlayerQueue.LastTrack = newTrack;
+                    await newTrack.Play(this);
+                    QueuePrompt.UpdateFor(GuildId);
+
                 }
             }
 

TomatenMusicCore/Music/PlayerQueue.cs

@@ -95,7 +95,7 @@ namespace TomatenMusic.Music
         public MusicActionResponse NextTrack(bool ignoreLoop = false)
         {
             if (LastTrack != null)
-                PlayedTracks = new Queue<TomatenMusicTrack>(PlayedTracks.Prepend(LastTrack));
+                PlayedTracks = new Queue<TomatenMusicTrack>(PlayedTracks.Prepend(new TomatenMusicTrack(LastTrack.WithPosition(TimeSpan.Zero))));
 
             switch (LoopType)
             {

TomatenMusicCore/Prompt/Buttons/AddToQueueButton.cs

@@ -11,6 +11,7 @@ using TomatenMusic.Music.Entitites;
 using Microsoft.Extensions.DependencyInjection;
 using TomatenMusicCore.Music;
 using TomatenMusicCore.Music.Entities;
+using TomatenMusic.Prompt.Option;
 
 namespace TomatenMusic.Prompt.Buttons
 {
@@ -23,7 +24,7 @@ namespace TomatenMusic.Prompt.Buttons
             Tracks = tracks;
             Emoji = new DiscordComponentEmoji("▶️");
                 Row = row;
-                Style = DSharpPlus.ButtonStyle.Primary;
+                Style = DSharpPlus.ButtonStyle.Secondary;
                 UpdateMethod = (prompt) =>
                 {
                     if (requestMember.VoiceState == null || requestMember.VoiceState.Channel == null)
@@ -34,7 +35,7 @@ namespace TomatenMusic.Prompt.Buttons
             Run = async (args, sender, option) =>
             {
                 IAudioService audioService = TomatenMusicBot.ServiceProvider.GetRequiredService<IAudioService>();
-                GuildPlayer player;player = audioService.GetPlayer<GuildPlayer>(args.Guild.Id);
+                GuildPlayer player;
 
                 try
                 {

TomatenMusicCore/Prompt/Buttons/PlayNowButton.cs

@@ -0,0 +1,60 @@
+using DSharpPlus.Entities;
+using Lavalink4NET;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TomatenMusic;
+using TomatenMusic.Music;
+using TomatenMusic.Prompt;
+using TomatenMusic.Prompt.Option;
+using TomatenMusicCore.Music.Entities;
+
+namespace TomatenMusicCore.Prompt.Buttons
+{
+    class PlayNowButton : ButtonPromptOption
+    {
+        public TrackList Tracks { get; set; }
+
+        public PlayNowButton(TrackList tracks, int row, DiscordMember requestMember)
+        {
+            Tracks = tracks;
+            Emoji = new DiscordComponentEmoji("▶");
+            Content = "Now";
+            Row = row;
+            Style = DSharpPlus.ButtonStyle.Secondary;
+            UpdateMethod = (prompt) =>
+            {
+                if (requestMember.VoiceState == null || requestMember.VoiceState.Channel == null)
+                    prompt.Disabled = true;
+
+                return Task.FromResult(prompt);
+            };
+            Run = async (args, sender, option) =>
+            {
+                IAudioService audioService = TomatenMusicBot.ServiceProvider.GetRequiredService<IAudioService>();
+                GuildPlayer player;
+
+                try
+                {
+                    try
+                    {
+                        player = await audioService.JoinAsync<GuildPlayer>(args.Guild.Id, ((DiscordMember)args.User).VoiceState.Channel.Id, true);
+
+                    }
+                    catch (Exception ex)
+                    {
+                        player = audioService.GetPlayer<GuildPlayer>(args.Guild.Id);
+                    }
+                    await player.PlayNowAsync(Tracks);
+                }
+                catch (Exception ex)
+                {
+
+                }
+            };
+        }
+    }
+}

TomatenMusicCore/Prompt/Implementation/PlaylistSongSelectorPrompt.cs

@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using TomatenMusic.Music.Entitites;
 using TomatenMusic.Prompt;
 using TomatenMusic.Prompt.Model;
+using TomatenMusic.Prompt.Option;
 using TomatenMusic.Util;
 using TomatenMusicCore.Music;
 using TomatenMusicCore.Music.Entities;

TomatenMusicCore/Prompt/Implementation/SongActionPrompt.cs

@@ -10,6 +10,7 @@ using TomatenMusic.Prompt.Model;
 using TomatenMusic.Util;
 using TomatenMusicCore.Music;
 using TomatenMusicCore.Music.Entities;
+using TomatenMusicCore.Prompt.Buttons;
 
 namespace TomatenMusic.Prompt.Implementation
 {
@@ -22,6 +23,8 @@ namespace TomatenMusic.Prompt.Implementation
             Track = track;
 
             AddOption(new AddToQueueButton(new TrackList() { track }, 1, requestMember));
+            AddOption(new PlayNowButton(new TrackList() { track }, 1, requestMember));
+
         }
 
         protected async override Task<DiscordMessageBuilder> GetMessageAsync()

TomatenMusicCore/Prompt/Implementation/SongListActionPrompt.cs

@@ -13,6 +13,7 @@ using TomatenMusic.Prompt.Buttons;
 using Lavalink4NET.Player;
 using TomatenMusicCore.Music;
 using TomatenMusicCore.Music.Entities;
+using TomatenMusicCore.Prompt.Buttons;
 
 namespace TomatenMusic.Prompt.Implementation
 {
@@ -26,6 +27,8 @@ namespace TomatenMusic.Prompt.Implementation
             Tracks = tracks;
 
             AddOption(new AddToQueueButton(tracks, 1, requestMember));
+            AddOption(new PlayNowButton(tracks, 1, requestMember));
+
         }
 
         protected override Task<DiscordMessageBuilder> GetMessageAsync()

TomatenMusicCore/Prompt/Implementation/SongSelectorPrompt.cs

@@ -14,6 +14,7 @@ using System.Linq;
 using Lavalink4NET.Player;
 using TomatenMusicCore.Music;
 using TomatenMusicCore.Music.Entities;
+using TomatenMusic.Prompt.Option;
 
 namespace TomatenMusic.Prompt.Implementation
 {

TomatenMusicCore/Prompt/Model/PaginatedButtonPrompt.cs

@@ -7,8 +7,7 @@ using TomatenMusic.Util;
 using DSharpPlus;
 using DSharpPlus.EventArgs;
 using Microsoft.Extensions.Logging;
-
-
+using TomatenMusic.Prompt.Option;
 
 namespace TomatenMusic.Prompt.Model
 {
@@ -26,6 +25,7 @@ namespace TomatenMusic.Prompt.Model
             for (int i = 0; i < 9; i++)
             {
                 int currentNumber = i + 1;
+                
                 ButtonPromptOption option = new ButtonPromptOption()
                 {
                     Style = DSharpPlus.ButtonStyle.Primary,

TomatenMusicCore/Prompt/Option/ButtonPromptOption.cs

@@ -8,7 +8,7 @@ using TomatenMusic.Prompt.Option;
 using TomatenMusic.Prompt.Model;
 
 
-namespace TomatenMusic.Prompt
+namespace TomatenMusic.Prompt.Option
 {
     class ButtonPromptOption : IPromptOption
     {

TomatenMusicCore/Services/TrackProvider.cs

@@ -53,6 +53,9 @@ namespace TomatenMusic.Music
 
             if (loadResult.LoadType == TrackLoadType.NoMatches) throw new FileNotFoundException("Query resulted in no Matches");
 
+            if (ParseTimestamp(query) != null)
+                loadResult.Tracks[0] = loadResult.Tracks[0].WithPosition((TimeSpan)ParseTimestamp(query));
+
             if (withSearchResults && loadResult.LoadType == TrackLoadType.SearchResult)
             {
                 return new MusicActionResponse(tracks: await FullTrackContext.PopulateTracksAsync(new TrackList(loadResult.Tracks)));
@@ -87,8 +90,6 @@ namespace TomatenMusic.Music
         {
             var uri = new Uri(url, UriKind.Absolute);
 
-            // you can check host here => uri.Host <= "www.youtube.com"
-
             var query = HttpUtility.ParseQueryString(uri.Query);
 
             var videoId = string.Empty;
@@ -105,5 +106,30 @@ namespace TomatenMusic.Music
             return videoId;
         }
 
+        public TimeSpan? ParseTimestamp(string url)
+        {
+            Uri uri;
+            try
+            {
+                uri = new Uri(url, UriKind.Absolute);
+            }catch (UriFormatException)
+            {
+                return null;
+            }
+
+            var query = HttpUtility.ParseQueryString(uri.Query);
+
+            int seconds;
+
+            if (query.AllKeys.Contains("t"))
+            {
+                seconds = int.Parse(query["t"]);
+            }
+            else
+                return null;
+
+            return TimeSpan.FromSeconds(seconds);
+        }
+
     }
 }

TomatenMusicCore/Services/YoutubeService.cs

@@ -126,7 +126,7 @@ namespace TomatenMusic.Services
             return response.Items.Where(x => x.Snippet != null);
         }
 
-        public async Task<LavalinkTrack> GetRelatedTrackAsync(string id, List<string> excludeIds)
+        public async Task<TomatenMusicTrack> GetRelatedTrackAsync(string id, List<string> excludeIds)
         {
             var audioService = TomatenMusicBot.ServiceProvider.GetRequiredService<IAudioService>();
 

TomatenMusicCore/Util/Common.cs

@@ -20,39 +20,8 @@ namespace TomatenMusic.Util
 
         public static DiscordEmbed AsEmbed(LavalinkTrack track, LoopType loopType, int position = -1)
         {
-            FullTrackContext context = (FullTrackContext)track.Context;
-
-            DiscordEmbedBuilder builder = new DiscordEmbedBuilder()
-                .WithTitle(track.Title)
-                .AddField("Length", Common.GetTimestamp(track.Duration), true);
-            if (context.IsFile)
-            {
-                builder.WithAuthor(track.Author);
-                builder.WithUrl(track.Source);
-            }
-            else
-                builder
-                    .WithAuthor(track.Author, context.YoutubeAuthorUri.ToString(), context.YoutubeAuthorThumbnail.ToString())
-                    .WithUrl(track.Source)
-                    .WithImageUrl(context.YoutubeThumbnail)
-                    .WithDescription(context.YoutubeDescription);
-
-
-
-            if (position != -1)
-            {
-                builder.AddField("Position", (position == 0 ? "Now Playing" : position.ToString()), true);
-            }
+            DiscordEmbedBuilder builder = new DiscordEmbedBuilder(AsEmbed(track, position));
             builder.AddField("Current Queue Loop", loopType.ToString(), true);
-            if (!context.IsFile)
-            {
-                builder.AddField("Views", $"{context.YoutubeViews:N0} Views", true);
-                builder.AddField("Rating", $"{context.YoutubeLikes:N0} 👍", true);
-                builder.AddField("Upload Date", $"{context.YoutubeUploadDate.ToString("dd. MMMM, yyyy")}", true);
-                builder.AddField("Comments", context.YoutubeCommentCount == null ? "Comments Disabled" : $"{context.YoutubeCommentCount:N0} Comments", true);
-                builder.AddField("Channel Subscriptions", $"{context.YoutubeAuthorSubs:N0} Subscribers", true);
-            }
-
             return builder;
         }
 
@@ -63,10 +32,12 @@ namespace TomatenMusic.Util
             DiscordEmbedBuilder builder = new DiscordEmbedBuilder()
                 .WithTitle(track.Title)
                 .WithUrl(track.Source)
-                .WithImageUrl(context.YoutubeThumbnail)
                 .WithDescription(context.YoutubeDescription)
                 .AddField("Length", Common.GetTimestamp(track.Duration), true);
 
+            if (context.YoutubeThumbnail != null)
+                builder.WithImageUrl(context.YoutubeThumbnail);
+
             if (context.IsFile)
             {
                 builder.WithAuthor(track.Author);
@@ -80,11 +51,14 @@ namespace TomatenMusic.Util
 
             if (position != -1)
             {
-                builder.AddField("Position", (position == 0 ? "Now Playing" : position.ToString()), true);
+                builder.AddField("Queue Position", (position == 0 ? "Now Playing" : position.ToString()), true);
             }
 
             if (!context.IsFile)
             {
+                if (track.Position.Seconds > 0)
+                    builder.AddField("Starting Position", GetTimestamp(track.Position), true);
+
                 builder.AddField("Views", $"{context.YoutubeViews:N0} Views", true);
                 builder.AddField("Rating", $"{context.YoutubeLikes:N0} 👍", true);
                 builder.AddField("Upload Date", $"{context.YoutubeUploadDate.ToString("dd. MMMM, yyyy")}", true);
@@ -180,7 +154,10 @@ namespace TomatenMusic.Util
 
                 lastString = builder.ToString();
                 builder.Append(count).Append(": ").Append($"[{track.Title}]({track.Source})").Append(" [").Append(Common.GetTimestamp(track.Duration)).Append("] | ");
-                builder.Append($"[{track.Author}]({context.YoutubeAuthorUri})").Append("\n\n");
+                builder.Append($"[{track.Author}]({context.YoutubeAuthorUri})");
+                if (track.Position.Seconds != 0)
+                    builder.Append($" | 🕑");
+                builder.Append("\n\n");
                 count++;
             }
             builder.Append(" ");