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

Merge branch 'master' into features/panel

Browse Source
This commit is contained in:
EkiciLP 2022-04-15 13:42:38 +02:00
commit f14eb8a263
5 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TomatenMusic/TomatenMusic.csproj
View File

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

41
TomatenMusicCore/Music/GuildPlayer.cs
View File

@ -89,17 +89,12 @@ namespace TomatenMusic.Music
MusicActionResponse response; MusicActionResponse response;
try try
{ {
response = PlayerQueue.NextTrack(true); response = PlayerQueue.NextTrack(true, Autoplay);
}catch (Exception ex) }catch (Exception ex)
{ {
if (Autoplay) 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; return;
} }
throw ex; throw ex;
@ -164,10 +159,16 @@ namespace TomatenMusic.Music
if (channel.Type == ChannelType.Stage) 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"); stageInstance = await channel.CreateStageInstanceAsync("Music");
}
await stageInstance.Channel.UpdateCurrentUserVoiceStateAsync(false); await stageInstance.Channel.UpdateCurrentUserVoiceStateAsync(false);
} }
@ -203,7 +204,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 +226,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 +235,21 @@ namespace TomatenMusic.Music
} }
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.PlayNow(this, withoutQueuePrepend: true);
QueuePrompt.UpdateFor(GuildId);
}
public async Task<DiscordChannel> GetChannelAsync() public async Task<DiscordChannel> GetChannelAsync()
{ {
EnsureConnected(); EnsureConnected();

8
TomatenMusicCore/Music/PlayerQueue.cs
View File

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

17
TomatenMusicCore/Prompt/Implementation/QueuePrompt.cs
View File

@ -98,7 +98,10 @@ namespace TomatenMusic.Prompt.Implementation
await Player.RewindAsync(); await Player.RewindAsync();
}catch (Exception ex) }catch (Exception ex)
{ {
_ = args.Interaction.CreateResponseAsync(
DSharpPlus.InteractionResponseType.ChannelMessageWithSource,
new DiscordInteractionResponseBuilder()
.WithContent($"An Error occurred during this Interaction {ex.Message}"));
} }
} }
} }
@ -131,8 +134,18 @@ 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
{
await Player.SkipAsync();
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); System.Timers.Timer timer = new System.Timers.Timer(800);
timer.Elapsed += (s, args) => timer.Elapsed += (s, args) =>

12
TomatenMusicCore/TomatenMusicCore.csproj
View File

@ -4,17 +4,13 @@
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RestoreAdditionalProjectSources>
https://api.nuget.org/v3/index.json;
https://nuget.emzi0767.com/api/v3/index.json
</RestoreAdditionalProjectSources>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <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="HtmlAgilityPack" Version="1.11.42" />
<PackageReference Include="Lavalink4NET" Version="2.1.1" /> <PackageReference Include="Lavalink4NET" Version="2.1.1" />
<PackageReference Include="Lavalink4NET.DSharpPlus" Version="2.1.1" /> <PackageReference Include="Lavalink4NET.DSharpPlus" Version="2.1.1" />