Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
949958641e | ||
![]() |
cce7b69871 | ||
![]() |
6258c943c5 | ||
![]() |
0ab009451f |
@@ -1,5 +1,29 @@
|
|||||||
mode: ContinuousDelivery
|
mode: ContinuousDelivery
|
||||||
branches: {}
|
branches:
|
||||||
|
main:
|
||||||
|
regex: ^master$|^main$
|
||||||
|
mode: ContinuousDelivery
|
||||||
|
tag: ''
|
||||||
|
increment: None
|
||||||
|
prevent-increment-of-merged-branch-version: true
|
||||||
|
track-merge-target: false
|
||||||
|
source-branches: [ 'develop', 'release' ]
|
||||||
|
tracks-release-branches: false
|
||||||
|
is-release-branch: true
|
||||||
|
is-mainline: true
|
||||||
|
pre-release-weight: 55000
|
||||||
|
develop:
|
||||||
|
regex: ^dev(elop)?(ment)?$
|
||||||
|
mode: ContinuousDeployment
|
||||||
|
tag: pre
|
||||||
|
increment: None
|
||||||
|
prevent-increment-of-merged-branch-version: false
|
||||||
|
track-merge-target: true
|
||||||
|
source-branches: []
|
||||||
|
tracks-release-branches: true
|
||||||
|
is-release-branch: false
|
||||||
|
is-mainline: false
|
||||||
|
pre-release-weight: 0
|
||||||
ignore:
|
ignore:
|
||||||
sha: []
|
sha: []
|
||||||
merge-message-formats: {}
|
merge-message-formats: {}
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"TOKEN": "YOUR_BOT_TOKEN",
|
"TOKEN": " ",
|
||||||
"LavaLinkPassword": " ",
|
"LavaLinkPassword": " ",
|
||||||
"SpotifyClientId": " ",
|
"SpotifyClientId": " ",
|
||||||
"SpotifyClientSecret": " ",
|
"SpotifyClientSecret": " ",
|
||||||
"YoutubeApiKey": " "
|
"YoutubeApiKey": " "
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -41,6 +41,8 @@ namespace TomatenMusic.Music
|
|||||||
else
|
else
|
||||||
loadResult = await _audioService.LoadTracksAsync(query, SearchMode.YouTube);
|
loadResult = await _audioService.LoadTracksAsync(query, SearchMode.YouTube);
|
||||||
|
|
||||||
|
if (uri != null && uri.AbsolutePath.Contains("."))
|
||||||
|
return await SearchAsync(uri);
|
||||||
|
|
||||||
if (loadResult.LoadType == TrackLoadType.LoadFailed) throw new ArgumentException("Track loading failed");
|
if (loadResult.LoadType == TrackLoadType.LoadFailed) throw new ArgumentException("Track loading failed");
|
||||||
|
|
@@ -126,15 +126,10 @@ namespace TomatenMusic
|
|||||||
{
|
{
|
||||||
Services = ServiceProvider
|
Services = ServiceProvider
|
||||||
});
|
});
|
||||||
/*
|
|
||||||
slash.RegisterCommands<MusicCommands>(888493810554900491);
|
//slash.RegisterCommands<MusicCommands>(888493810554900491);
|
||||||
slash.RegisterCommands<PlayQueueGroup>(888493810554900491);
|
//slash.RegisterCommands<PlayQueueGroup>(888493810554900491);
|
||||||
slash.RegisterCommands<PlayNowGroup>(888493810554900491);
|
//slash.RegisterCommands<PlayNowGroup>(888493810554900491);
|
||||||
|
|
||||||
slash.RegisterCommands<MusicCommands>(835089895092387872);
|
|
||||||
slash.RegisterCommands<PlayQueueGroup>(835089895092387872);
|
|
||||||
slash.RegisterCommands<PlayNowGroup>(835089895092387872);
|
|
||||||
*/
|
|
||||||
|
|
||||||
slash.RegisterCommands<MusicCommands>();
|
slash.RegisterCommands<MusicCommands>();
|
||||||
slash.RegisterCommands<PlayQueueGroup>();
|
slash.RegisterCommands<PlayQueueGroup>();
|
||||||
|
@@ -258,17 +258,18 @@ namespace TomatenMusic.Util
|
|||||||
FullTrackContext context = (FullTrackContext)track.Context;
|
FullTrackContext context = (FullTrackContext)track.Context;
|
||||||
|
|
||||||
string progressBar = $"|{ProgressBar((int)player.Position.Position.TotalSeconds, (int)track.Duration.TotalSeconds)}|\n [{Common.GetTimestamp(player.Position.Position)}/{Common.GetTimestamp(track.Duration)}]";
|
string progressBar = $"|{ProgressBar((int)player.Position.Position.TotalSeconds, (int)track.Duration.TotalSeconds)}|\n [{Common.GetTimestamp(player.Position.Position)}/{Common.GetTimestamp(track.Duration)}]";
|
||||||
|
|
||||||
builder.WithAuthor(track.Author, context.YoutubeAuthorUri.ToString(), context.YoutubeAuthorThumbnail.ToString());
|
builder.WithAuthor(track.Author);
|
||||||
builder.WithTitle(track.Title);
|
builder.WithTitle(track.Title);
|
||||||
builder.WithUrl(context.YoutubeUri);
|
builder.WithUrl(track.Source);
|
||||||
builder.WithImageUrl(context.YoutubeThumbnail);
|
|
||||||
builder.WithColor(player.State == PlayerState.Paused ? DiscordColor.Orange : DiscordColor.Green);
|
builder.WithColor(player.State == PlayerState.Paused ? DiscordColor.Orange : DiscordColor.Green);
|
||||||
builder.AddField("Length", Common.GetTimestamp(track.Duration), true);
|
builder.AddField("Length", Common.GetTimestamp(track.Duration), true);
|
||||||
builder.AddField("Loop", player.PlayerQueue.LoopType.ToString(), true);
|
builder.AddField("Loop", player.PlayerQueue.LoopType.ToString(), true);
|
||||||
builder.AddField("Progress", progressBar, true);
|
builder.AddField("Progress", progressBar, true);
|
||||||
if (!context.IsFile)
|
if (!context.IsFile)
|
||||||
{
|
{
|
||||||
|
builder.WithAuthor(track.Author, context.YoutubeAuthorUri.ToString(), context.YoutubeAuthorThumbnail.ToString());
|
||||||
|
builder.WithImageUrl(context.YoutubeThumbnail);
|
||||||
builder.AddField("Views", $"{context.YoutubeViews:N0} Views", true);
|
builder.AddField("Views", $"{context.YoutubeViews:N0} Views", true);
|
||||||
builder.AddField("Rating", $"{context.YoutubeLikes:N0} 👍", true);
|
builder.AddField("Rating", $"{context.YoutubeLikes:N0} 👍", true);
|
||||||
builder.AddField("Upload Date", $"{context.YoutubeUploadDate.ToString("dd. MMMM, yyyy")}", true);
|
builder.AddField("Upload Date", $"{context.YoutubeUploadDate.ToString("dd. MMMM, yyyy")}", true);
|
||||||
|
Reference in New Issue
Block a user