TomatenMusicCore/Music/Entitites/SpotifyPlaylist.cs

@@ -44,10 +44,8 @@ namespace TomatenMusic.Music.Entitites
             if (!player.PlayerQueue.Queue.Any())
                 player.PlayerQueue.CurrentPlaylist = this;
 
-            if (!withoutQueuePrepend && player.State == PlayerState.Playing)
             player.PlayerQueue.Queue = new Queue<TomatenMusicTrack>(player.PlayerQueue.Queue.Prepend(new TomatenMusicTrack(player.PlayerQueue.LastTrack.WithPosition(player.TrackPosition))));
 
-
             Queue<TomatenMusicTrack> reversedTracks = new Queue<TomatenMusicTrack>(Tracks);
 
             TomatenMusicTrack track = reversedTracks.Dequeue();

TomatenMusicCore/Music/Entitites/TomatenMusicTrack.cs

@@ -38,7 +38,7 @@ namespace TomatenMusicCore.Music.Entities
 
         public async Task PlayNow(GuildPlayer player, TimeSpan? startTime = null, TimeSpan? endTime = null, bool withoutQueuePrepend = false)
         {
-            if (!withoutQueuePrepend && player.State == PlayerState.Playing)
+            if (!withoutQueuePrepend)
                 player.PlayerQueue.Queue = new Queue<TomatenMusicTrack>(player.PlayerQueue.Queue.Prepend(new TomatenMusicTrack(player.PlayerQueue.LastTrack.WithPosition(player.TrackPosition))));
 
 

TomatenMusicCore/Music/Entitites/YoutubePlaylist.cs

@@ -57,11 +57,9 @@ namespace TomatenMusic.Music.Entitites
             if (!player.PlayerQueue.Queue.Any())
                 player.PlayerQueue.CurrentPlaylist = this;
 
-            if (!withoutQueuePrepend && player.State == PlayerState.Playing)
             player.PlayerQueue.Queue = new Queue<TomatenMusicTrack>(player.PlayerQueue.Queue.Prepend(new TomatenMusicTrack(player.PlayerQueue.LastTrack.WithPosition(player.TrackPosition))));
 
 
-
             Queue<TomatenMusicTrack> reversedTracks = new Queue<TomatenMusicTrack>(Tracks);
 
             TomatenMusicTrack track = reversedTracks.Dequeue();

TomatenMusicCore/Music/GuildPlayer.cs

@@ -89,19 +89,24 @@ namespace TomatenMusic.Music
             MusicActionResponse response;
             try
             {
-                response = PlayerQueue.NextTrack(true, Autoplay);
+                response = PlayerQueue.NextTrack(true);
             }catch (Exception ex)
             {
                 if (Autoplay)
                 {
-                    _ = OnAutoPlay(CurrentTrack);
+                    YoutubeService youtube = TomatenMusicBot.ServiceProvider.GetRequiredService<YoutubeService>();
+                    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;
             }
 
             _logger.LogInformation($"Skipped Track {CurrentTrack.Title} for Track {response.Track.Title}");
-            await PlayNowAsync(response.Track, withoutQueuePrepend: true);
+            await base.PlayAsync(response.Track);
             QueuePrompt.UpdateFor(GuildId);
         }
 
@@ -159,16 +164,10 @@ namespace TomatenMusic.Music
 
             if (channel.Type == ChannelType.Stage)
             {
-                DiscordStageInstance stageInstance;
-                try
-                {
-                    stageInstance = await channel.GetStageInstanceAsync();
+                DiscordStageInstance stageInstance = await channel.GetStageInstanceAsync();
 
-                }catch (Exception ex)
-                {
+                if (stageInstance == null)
                     stageInstance = await channel.CreateStageInstanceAsync("Music");
-                }
-                
                 await stageInstance.Channel.UpdateCurrentUserVoiceStateAsync(false);
             }
 
@@ -204,6 +203,7 @@ 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,28 +226,17 @@ namespace TomatenMusic.Music
                         return;
                     }
 
-                    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));
+                    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);
                     PlayerQueue.LastTrack = newTrack;
-            await newTrack.PlayNow(this, withoutQueuePrepend: true);
+                    await newTrack.Play(this);
                     QueuePrompt.UpdateFor(GuildId);
+
+                }
+            }
+
+            
         }
 
         public async Task<DiscordChannel> GetChannelAsync()

TomatenMusicCore/Music/PlayerQueue.cs

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

TomatenMusicCore/Prompt/Implementation/QueuePrompt.cs

@@ -93,15 +93,11 @@ namespace TomatenMusic.Prompt.Implementation
                         _ = args.Interaction.EditOriginalResponseAsync(new DiscordWebhookBuilder().WithContent("Please connect to the bots Channel to use this Interaction"));
                         return;
                     }
-
-
                     try
                     {
                         await Player.RewindAsync();
-                    }
-                    catch (Exception ex)
+                    }catch (Exception ex)
                     {
-                        Console.WriteLine(ex);
 
                     }
                 }
@@ -135,18 +131,8 @@ 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}"));
-                    }
+                    await Player.SkipAsync();
 
                     System.Timers.Timer timer = new System.Timers.Timer(800);
                     timer.Elapsed += (s, args) =>

TomatenMusicCore/TomatenMusicBot.cs

@@ -87,9 +87,9 @@ namespace TomatenMusic
                     .AddSingleton(
                           new LavalinkNodeOptions
                           {
-                              RestUri = "http://127.0.0.1:2333",
+                              RestUri = "http://116.202.92.16:2333",
                               Password = config.LavaLinkPassword,
-                              WebSocketUri = "ws://127.0.0.1:2333",
+                              WebSocketUri = "ws://116.202.92.16:2333",
                               AllowResuming = true
 
                           })