Merge branch 'master' into features/panel

TomatenMusic/TomatenMusic.csproj

@@ -5,10 +5,6 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>TomatenMusic_Api</RootNamespace>
-    <RestoreAdditionalProjectSources>
-      https://api.nuget.org/v3/index.json;
-      https://nuget.emzi0767.com/api/v3/index.json
-    </RestoreAdditionalProjectSources>
   </PropertyGroup>
 
   <ItemGroup>

TomatenMusicCore/Music/GuildPlayer.cs

@@ -89,17 +89,12 @@ namespace TomatenMusic.Music
             MusicActionResponse response;
             try
             {
-                response = PlayerQueue.NextTrack(true);
+                response = PlayerQueue.NextTrack(true, Autoplay);
             }catch (Exception ex)
             {
                 if (Autoplay)
                 {
-                    YoutubeService youtube = TomatenMusicBot.ServiceProvider.GetRequiredService<YoutubeService>();
+                    _ = OnAutoPlay(CurrentTrack);
-                    LavalinkTrack newTrack = await youtube.GetRelatedTrackAsync(CurrentTrack.TrackIdentifier, PlayerQueue.PlayedTracks.Take(5).ToList().ConvertAll(x => x.TrackIdentifier));
-
-                    _logger.LogInformation($"Skipped Track {CurrentTrack.Title} for Autoplayed Track {newTrack.Title}");
-                    await PlayAsync(newTrack);
-                    QueuePrompt.UpdateFor(GuildId);
                     return;
                 }
                 throw ex;
@@ -164,10 +159,16 @@ namespace TomatenMusic.Music
 
             if (channel.Type == ChannelType.Stage)
             {
-                DiscordStageInstance stageInstance = await channel.GetStageInstanceAsync();
+                DiscordStageInstance stageInstance;
+                try
+                {
+                    stageInstance = await channel.GetStageInstanceAsync();
 
-                if (stageInstance == null)
+                }catch (Exception ex)
+                {
                     stageInstance = await channel.CreateStageInstanceAsync("Music");
+                }
+                
                 await stageInstance.Channel.UpdateCurrentUserVoiceStateAsync(false);
             }
 
@@ -203,7 +204,6 @@ namespace TomatenMusic.Music
         public async override Task OnTrackEndAsync(TrackEndEventArgs eventArgs)
         {
             DisconnectOnStop = false;
-            YoutubeService youtube = TomatenMusicBot.ServiceProvider.GetRequiredService<YoutubeService>();
             var oldTrack = CurrentTrack;
 
             if (eventArgs.Reason != TrackEndReason.Finished)
@@ -226,17 +226,28 @@ namespace TomatenMusic.Music
                         return;
                     }
 
-                    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 base.OnTrackEndAsync(eventArgs);
+                    _ = OnAutoPlay(oldTrack);
+
+                }
+            }
+
+            
+        }
+
+        public async Task OnAutoPlay(LavalinkTrack oldTrack)
+        {
+            YoutubeService youtube = TomatenMusicBot.ServiceProvider.GetRequiredService<YoutubeService>();
+
+            TomatenMusicTrack newTrack;
+            if (oldTrack.Provider != StreamProvider.YouTube)
+                newTrack = await youtube.GetRelatedTrackAsync(PlayerQueue.PlayedTracks.First(x => x.Provider == StreamProvider.YouTube).TrackIdentifier, PlayerQueue.PlayedTracks.Take(5).ToList().ConvertAll(x => x.TrackIdentifier));
+            else
+                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}");
             PlayerQueue.LastTrack = newTrack;
-                    await newTrack.Play(this);
+            await newTrack.PlayNow(this, withoutQueuePrepend: true);
             QueuePrompt.UpdateFor(GuildId);
-
-                }
-            }
-
-            
         }
 
         public async Task<DiscordChannel> GetChannelAsync()

TomatenMusicCore/Music/PlayerQueue.cs

@@ -92,9 +92,10 @@ namespace TomatenMusic.Music
 
         }
 
-        public MusicActionResponse NextTrack(bool ignoreLoop = false)
+        public MusicActionResponse NextTrack(bool ignoreLoop = false, bool autoplay = false)
         {
             if (LastTrack != null)
+                if (LoopType != LoopType.NONE && Queue.Count == 0 || autoplay)
                     PlayedTracks = new Queue<TomatenMusicTrack>(PlayedTracks.Prepend(new TomatenMusicTrack(LastTrack.WithPosition(TimeSpan.Zero))));
 
             switch (LoopType)
@@ -157,8 +158,7 @@ namespace TomatenMusic.Music
 
             if (type == LoopType.QUEUE)
             {
-                QueueLoopList = new List<TomatenMusicTrack>(Queue);
+                QueueLoopList = new List<TomatenMusicTrack>(QueueLoopList.Prepend(LastTrack));
-                QueueLoopList.Add(LastTrack);
             }
         }
     }

TomatenMusicCore/Prompt/Implementation/QueuePrompt.cs

@@ -98,7 +98,10 @@ namespace TomatenMusic.Prompt.Implementation
                         await Player.RewindAsync();
                     }catch (Exception ex)
                     {
-
+                        _ = args.Interaction.CreateResponseAsync(
+                            DSharpPlus.InteractionResponseType.ChannelMessageWithSource,
+                            new DiscordInteractionResponseBuilder()
+                            .WithContent($"An Error occurred during this Interaction {ex.Message}"));
                     }
                 }
             }
@@ -131,9 +134,19 @@ namespace TomatenMusic.Prompt.Implementation
                         _ = args.Interaction.EditOriginalResponseAsync(new DiscordWebhookBuilder().WithContent("Please connect to the bots Channel to use this Interaction"));
                         return;
                     }
-
+                    try
+                    {
                         await Player.SkipAsync();
 
+                    }
+                    catch (Exception ex)
+                    {
+                        _ = args.Interaction.CreateResponseAsync(
+                            DSharpPlus.InteractionResponseType.ChannelMessageWithSource,
+                            new DiscordInteractionResponseBuilder()
+                            .WithContent($"An Error occurred during this Interaction {ex.Message}"));
+                    }
+
                     System.Timers.Timer timer = new System.Timers.Timer(800);
                     timer.Elapsed += (s, args) =>
                     {

TomatenMusicCore/TomatenMusicCore.csproj

@@ -4,17 +4,13 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <RestoreAdditionalProjectSources>
-      https://api.nuget.org/v3/index.json;
-      https://nuget.emzi0767.com/api/v3/index.json
-    </RestoreAdditionalProjectSources>
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="DSharpPlus" Version="4.2.0-nightly-01101" />
+		<PackageReference Include="DSharpPlus" Version="4.2.0-nightly-01107" />
-		<PackageReference Include="DSharpPlus.Interactivity" Version="4.2.0-nightly-01101" />
+		<PackageReference Include="DSharpPlus.Interactivity" Version="4.2.0-nightly-01107" />
-		<PackageReference Include="DSharpPlus.SlashCommands" Version="4.2.0-nightly-01101" />
+		<PackageReference Include="DSharpPlus.SlashCommands" Version="4.2.0-nightly-01107" />
-		<PackageReference Include="Google.Apis.YouTube.v3" Version="1.56.0.2630" />
+		<PackageReference Include="Google.Apis.YouTube.v3" Version="1.57.0.2637" />
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
 		<PackageReference Include="Lavalink4NET" Version="2.1.1" />
 		<PackageReference Include="Lavalink4NET.DSharpPlus" Version="2.1.1" />