tueem/TomatenMusic-V2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Bot throwing an error when tryimg to autoplay tracks from non youtube sources

Browse Source
This commit is contained in:
EkiciLP 2022-04-14 12:13:39 +02:00
parent fcd376bdcb
commit 47bffbff7f
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
TomatenMusicCore/Music/GuildPlayer.cs
View File

@ -203,7 +203,6 @@ namespace TomatenMusic.Music
public async override Task OnTrackEndAsync(TrackEndEventArgs eventArgs) public async override Task OnTrackEndAsync(TrackEndEventArgs eventArgs)
{ {
DisconnectOnStop = false; DisconnectOnStop = false;
YoutubeService youtube = TomatenMusicBot.ServiceProvider.GetRequiredService<YoutubeService>();
var oldTrack = CurrentTrack; var oldTrack = CurrentTrack;
if (eventArgs.Reason != TrackEndReason.Finished) if (eventArgs.Reason != TrackEndReason.Finished)
@ -226,12 +225,8 @@ namespace TomatenMusic.Music
return; 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); await base.OnTrackEndAsync(eventArgs);
PlayerQueue.LastTrack = newTrack; _ = OnAutoPlay(oldTrack);
await newTrack.Play(this);
QueuePrompt.UpdateFor(GuildId);
} }
} }
@ -239,6 +234,21 @@ namespace TomatenMusic.Music
} }
public async Task OnAutoPlay(LavalinkTrack oldTrack)
{
YoutubeService youtube = TomatenMusicBot.ServiceProvider.GetRequiredService<YoutubeService>();
TomatenMusicTrack newTrack;
if (oldTrack.Source != "YouTube" )
newTrack = await youtube.GetRelatedTrackAsync(PlayerQueue.PlayedTracks.First(x => x.Source == "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);
QueuePrompt.UpdateFor(GuildId);
}
public async Task<DiscordChannel> GetChannelAsync() public async Task<DiscordChannel> GetChannelAsync()
{ {
EnsureConnected(); EnsureConnected();