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

Compare commits

base: tueem:master
Branches Tags
tueem:master
tueem:dev
tueem:hotfix
tueem:features/panel
tueem:v0.11.1
tueem:v0.11.0
tueem:v0.10.5
tueem:v0.10.4
tueem:v0.10.3
tueem:v0.10.1
tueem:v0.10.0
tueem:v0.9.12
tueem:v0.9.10
tueem:v0.9.9
tueem:v0.9.7
tueem:v0.9.6
tueem:v0.9.5
tueem:v0.9.4
tueem:v0.9.3
tueem:v0.9.2
tueem:v0.9.1
tueem:v0.9.0
..
compare: tueem:v0.10.3
Branches Tags
tueem:dev
tueem:hotfix
tueem:master
tueem:features/panel
tueem:v0.11.1
tueem:v0.11.0
tueem:v0.10.5
tueem:v0.10.4
tueem:v0.10.3
tueem:v0.10.1
tueem:v0.10.0
tueem:v0.9.12
tueem:v0.9.10
tueem:v0.9.9
tueem:v0.9.7
tueem:v0.9.6
tueem:v0.9.5
tueem:v0.9.4
tueem:v0.9.3
tueem:v0.9.2
tueem:v0.9.1
tueem:v0.9.0

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

13 changed files with 66 additions and 69 deletions
Show Stats Expand all files Collapse all files

4
TomatenMusic/Services/TomatenMusicService.cs
View File

@ -46,9 +46,9 @@ namespace TomatenMusic_Api
if (e.Response.IsPlaylist)
{
if (e.Now)
await player.PlayNowAsync(e.Response.Playlist);
await player.PlayPlaylistNowAsync(e.Response.Playlist);
else
await player.PlayItemAsync(e.Response.Playlist);
await player.PlayPlaylistAsync(e.Response.Playlist);
}else
{
if (e.Now)

4
TomatenMusic/TomatenMusic.csproj
View File

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

4
TomatenMusicCore/Commands/PlayCommandGroup.cs
View File

@ -84,7 +84,7 @@ namespace TomatenMusic.Commands
if (response.IsPlaylist)
{
ILavalinkPlaylist playlist = response.Playlist;
await player.PlayNowAsync(playlist);
await player.PlayPlaylistNowAsync(playlist);
_ = ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Now Playing:").AddEmbed(
Common.AsEmbed(playlist)
@ -237,7 +237,7 @@ namespace TomatenMusic.Commands
if (response.IsPlaylist)
{
ILavalinkPlaylist playlist = response.Playlist;
await player.PlayItemAsync(playlist);
await player.PlayPlaylistAsync(playlist);
await ctx.EditResponseAsync(new DiscordWebhookBuilder().WithContent("Now Playing:").AddEmbed(
Common.AsEmbed(playlist)

2
TomatenMusicCore/Music/Entitites/FullTrackContext.cs
View File

@ -20,7 +20,7 @@ namespace TomatenMusic.Music.Entitites
public IEnumerable<string> YoutubeTags { get; set; }
public ulong YoutubeViews { get; set; }
public ulong YoutubeLikes { get; set; }
public Uri? YoutubeThumbnail { get; set; } = null;
public Uri YoutubeThumbnail { get; set; }
public DateTime YoutubeUploadDate { get; set; }
//
// Summary:

2
TomatenMusicCore/Music/Entitites/SpotifyPlaylist.cs
View File

@ -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();

2
TomatenMusicCore/Music/Entitites/TomatenMusicTrack.cs
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)
{
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))));

2
TomatenMusicCore/Music/Entitites/YoutubePlaylist.cs
View File

@ -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();

69
TomatenMusicCore/Music/GuildPlayer.cs
View File

@ -64,6 +64,26 @@ namespace TomatenMusic.Music
QueuePrompt.UpdateFor(GuildId);
}
public async Task PlayPlaylistAsync(ILavalinkPlaylist playlist)
{
EnsureNotDestroyed();
EnsureConnected();
_logger.LogInformation("Started playing Playlist {0} on Guild {1}", playlist.Title, (await GetGuildAsync()).Name);
QueuePrompt.UpdateFor(GuildId);
}
public async Task PlayPlaylistNowAsync(ILavalinkPlaylist playlist)
{
EnsureConnected();
EnsureNotDestroyed();
QueuePrompt.UpdateFor(GuildId);
}
public async Task RewindAsync()
{
EnsureNotDestroyed();
@ -89,19 +109,24 @@ namespace TomatenMusic.Music
MusicActionResponse response;
try
{
response = PlayerQueue.NextTrack(true, Autoplay);
response = PlayerQueue.(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 +184,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 +223,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 +246,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()

8
TomatenMusicCore/Music/PlayerQueue.cs
View File

@ -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);
}
}
}

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

@ -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) =>

4
TomatenMusicCore/TomatenMusicBot.cs
View File

@ -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
})

12
TomatenMusicCore/TomatenMusicCore.csproj
View File

@ -4,13 +4,17 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RestoreAdditionalProjectSources>
https://api.nuget.org/v3/index.json;
https://nuget.emzi0767.com/api/v3/index.json
</RestoreAdditionalProjectSources>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DSharpPlus" Version="4.2.0-nightly-01107" />
<PackageReference Include="DSharpPlus.Interactivity" Version="4.2.0-nightly-01107" />
<PackageReference Include="DSharpPlus.SlashCommands" Version="4.2.0-nightly-01107" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.57.0.2637" />
<PackageReference Include="DSharpPlus" Version="4.2.0-nightly-01101" />
<PackageReference Include="DSharpPlus.Interactivity" Version="4.2.0-nightly-01101" />
<PackageReference Include="DSharpPlus.SlashCommands" Version="4.2.0-nightly-01101" />
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.56.0.2630" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
<PackageReference Include="Lavalink4NET" Version="2.1.1" />
<PackageReference Include="Lavalink4NET.DSharpPlus" Version="2.1.1" />

4
TomatenMusicCore/Util/Common.cs
View File

@ -32,12 +32,10 @@ namespace TomatenMusic.Util
DiscordEmbedBuilder builder = new DiscordEmbedBuilder()
.WithTitle(track.Title)
.WithUrl(track.Source)
.WithImageUrl(context.YoutubeThumbnail)
.WithDescription(context.YoutubeDescription)
.AddField("Length", Common.GetTimestamp(track.Duration), true);
if (context.YoutubeThumbnail != null)
builder.WithImageUrl(context.YoutubeThumbnail);
if (context.IsFile)
{
builder.WithAuthor(track.Author);