Compare commits

..

No commits in common. "master" and "v0.11.1" have entirely different histories.

7 changed files with 14 additions and 19 deletions

View File

@ -44,9 +44,7 @@ namespace TomatenMusic.Music.Entitites
if (!player.PlayerQueue.Queue.Any()) if (!player.PlayerQueue.Queue.Any())
player.PlayerQueue.CurrentPlaylist = this; 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))));
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); Queue<TomatenMusicTrack> reversedTracks = new Queue<TomatenMusicTrack>(Tracks);

View File

@ -38,7 +38,7 @@ namespace TomatenMusicCore.Music.Entities
public async Task PlayNow(GuildPlayer player, TimeSpan? startTime = null, TimeSpan? endTime = null, bool withoutQueuePrepend = false) 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)))); player.PlayerQueue.Queue = new Queue<TomatenMusicTrack>(player.PlayerQueue.Queue.Prepend(new TomatenMusicTrack(player.PlayerQueue.LastTrack.WithPosition(player.TrackPosition))));

View File

@ -57,9 +57,7 @@ namespace TomatenMusic.Music.Entitites
if (!player.PlayerQueue.Queue.Any()) if (!player.PlayerQueue.Queue.Any())
player.PlayerQueue.CurrentPlaylist = this; 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))));
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); Queue<TomatenMusicTrack> reversedTracks = new Queue<TomatenMusicTrack>(Tracks);

View File

@ -101,7 +101,7 @@ namespace TomatenMusic.Music
} }
_logger.LogInformation($"Skipped Track {CurrentTrack.Title} for Track {response.Track.Title}"); _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); QueuePrompt.UpdateFor(GuildId);
} }

View File

@ -26,7 +26,7 @@ namespace TomatenMusic.Music
public TomatenMusicTrack LastTrack { get; set; } 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) public void QueueTrack(TomatenMusicTrack track)
{ {
@ -95,7 +95,7 @@ namespace TomatenMusic.Music
public MusicActionResponse NextTrack(bool ignoreLoop = false, bool autoplay = false) public MusicActionResponse NextTrack(bool ignoreLoop = false, bool autoplay = false)
{ {
if (LastTrack != null) if (LastTrack != null)
if (LoopType != LoopType.TRACK || (ignoreLoop && (Queue.Any() || autoplay))) if (LoopType != LoopType.NONE && Queue.Count == 0 || autoplay)
PlayedTracks = new Queue<TomatenMusicTrack>(PlayedTracks.Prepend(new TomatenMusicTrack(LastTrack.WithPosition(TimeSpan.Zero)))); PlayedTracks = new Queue<TomatenMusicTrack>(PlayedTracks.Prepend(new TomatenMusicTrack(LastTrack.WithPosition(TimeSpan.Zero))));
switch (LoopType) switch (LoopType)
@ -158,7 +158,7 @@ namespace TomatenMusic.Music
if (type == LoopType.QUEUE) if (type == LoopType.QUEUE)
{ {
QueueLoopList = new List<TomatenMusicTrack>(Queue.Prepend(LastTrack)); QueueLoopList = new List<TomatenMusicTrack>(QueueLoopList.Prepend(LastTrack));
} }
} }
} }

View File

@ -93,16 +93,15 @@ namespace TomatenMusic.Prompt.Implementation
_ = args.Interaction.EditOriginalResponseAsync(new DiscordWebhookBuilder().WithContent("Please connect to the bots Channel to use this Interaction")); _ = args.Interaction.EditOriginalResponseAsync(new DiscordWebhookBuilder().WithContent("Please connect to the bots Channel to use this Interaction"));
return; return;
} }
try try
{ {
await Player.RewindAsync(); await Player.RewindAsync();
} }catch (Exception ex)
catch (Exception ex)
{ {
Console.WriteLine(ex); _ = args.Interaction.CreateResponseAsync(
DSharpPlus.InteractionResponseType.ChannelMessageWithSource,
new DiscordInteractionResponseBuilder()
.WithContent($"An Error occurred during this Interaction {ex.Message}"));
} }
} }
} }

View File

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