Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
0024325f4f | ||
![]() |
5a9d978b5e | ||
![]() |
1fc3fae278 |
@ -44,7 +44,9 @@ namespace TomatenMusic.Music.Entitites
|
|||||||
if (!player.PlayerQueue.Queue.Any())
|
if (!player.PlayerQueue.Queue.Any())
|
||||||
player.PlayerQueue.CurrentPlaylist = this;
|
player.PlayerQueue.CurrentPlaylist = this;
|
||||||
|
|
||||||
player.PlayerQueue.Queue = new Queue<TomatenMusicTrack>(player.PlayerQueue.Queue.Prepend(new TomatenMusicTrack(player.PlayerQueue.LastTrack.WithPosition(player.TrackPosition))));
|
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);
|
Queue<TomatenMusicTrack> reversedTracks = new Queue<TomatenMusicTrack>(Tracks);
|
||||||
|
|
||||||
|
@ -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)
|
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))));
|
||||||
|
|
||||||
|
|
||||||
|
@ -57,7 +57,9 @@ namespace TomatenMusic.Music.Entitites
|
|||||||
if (!player.PlayerQueue.Queue.Any())
|
if (!player.PlayerQueue.Queue.Any())
|
||||||
player.PlayerQueue.CurrentPlaylist = this;
|
player.PlayerQueue.CurrentPlaylist = this;
|
||||||
|
|
||||||
player.PlayerQueue.Queue = new Queue<TomatenMusicTrack>(player.PlayerQueue.Queue.Prepend(new TomatenMusicTrack(player.PlayerQueue.LastTrack.WithPosition(player.TrackPosition))));
|
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);
|
Queue<TomatenMusicTrack> reversedTracks = new Queue<TomatenMusicTrack>(Tracks);
|
||||||
|
@ -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 base.PlayAsync(response.Track);
|
await PlayNowAsync(response.Track, withoutQueuePrepend: true);
|
||||||
QueuePrompt.UpdateFor(GuildId);
|
QueuePrompt.UpdateFor(GuildId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ namespace TomatenMusic.Music
|
|||||||
|
|
||||||
public TomatenMusicTrack LastTrack { get; set; }
|
public TomatenMusicTrack LastTrack { get; set; }
|
||||||
|
|
||||||
public List<TomatenMusicTrack> QueueLoopList { get; private set; }
|
public List<TomatenMusicTrack> QueueLoopList { get; private set; } = new List<TomatenMusicTrack>();
|
||||||
|
|
||||||
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.NONE && Queue.Count == 0 || autoplay)
|
if (LoopType != LoopType.TRACK || (ignoreLoop && (Queue.Any() || 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>(QueueLoopList.Prepend(LastTrack));
|
QueueLoopList = new List<TomatenMusicTrack>(Queue.Prepend(LastTrack));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -93,15 +93,16 @@ 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)
|
||||||
{
|
{
|
||||||
_ = args.Interaction.CreateResponseAsync(
|
Console.WriteLine(ex);
|
||||||
DSharpPlus.InteractionResponseType.ChannelMessageWithSource,
|
|
||||||
new DiscordInteractionResponseBuilder()
|
|
||||||
.WithContent($"An Error occurred during this Interaction {ex.Message}"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -87,9 +87,9 @@ namespace TomatenMusic
|
|||||||
.AddSingleton(
|
.AddSingleton(
|
||||||
new LavalinkNodeOptions
|
new LavalinkNodeOptions
|
||||||
{
|
{
|
||||||
RestUri = "http://116.202.92.16:2333",
|
RestUri = "http://127.0.0.1:2333",
|
||||||
Password = config.LavaLinkPassword,
|
Password = config.LavaLinkPassword,
|
||||||
WebSocketUri = "ws://116.202.92.16:2333",
|
WebSocketUri = "ws://127.0.0.1:2333",
|
||||||
AllowResuming = true
|
AllowResuming = true
|
||||||
|
|
||||||
})
|
})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user