Revert "Revert "getlink takes optional param now""
This reverts commit e2195f5f66
.
This commit is contained in:
parent
e2195f5f66
commit
34755aaf6e
@ -756,16 +756,35 @@ namespace NadekoBot.Modules.Music
|
|||||||
|
|
||||||
cgb.CreateCommand(Prefix + "getlink")
|
cgb.CreateCommand(Prefix + "getlink")
|
||||||
.Alias(Prefix + "gl")
|
.Alias(Prefix + "gl")
|
||||||
.Description("Shows a link to the currently playing song.")
|
.Description("Shows a link to the song in the queue by index, or the currently playing song by default.")
|
||||||
|
.Parameter("index", ParameterType.Optional)
|
||||||
.Do(async e =>
|
.Do(async e =>
|
||||||
{
|
{
|
||||||
MusicPlayer musicPlayer;
|
MusicPlayer musicPlayer;
|
||||||
if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
|
if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
|
||||||
return;
|
return;
|
||||||
var curSong = musicPlayer.CurrentSong;
|
int index;
|
||||||
if (curSong == null)
|
string arg = e.GetArg("index")?.Trim();
|
||||||
return;
|
if (!string.IsNullOrEmpty(arg) && int.TryParse(arg, out index))
|
||||||
await e.Channel.SendMessage($"🎶`Current song:` <{curSong.SongInfo.Query}>").ConfigureAwait(false);
|
{
|
||||||
|
|
||||||
|
var selSong = musicPlayer.Playlist.DefaultIfEmpty(null).ElementAtOrDefault(index - 1);
|
||||||
|
if (selSong == null)
|
||||||
|
{
|
||||||
|
await e.Channel.SendMessage("Could not select song, likely wrong index");
|
||||||
|
|
||||||
|
} else
|
||||||
|
{
|
||||||
|
await e.Channel.SendMessage($"🎶`Selected song {selSong.SongInfo.Title}:` <{selSong.SongInfo.Query}>").ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
{
|
||||||
|
var curSong = musicPlayer.CurrentSong;
|
||||||
|
if (curSong == null)
|
||||||
|
return;
|
||||||
|
await e.Channel.SendMessage($"🎶`Current song:` <{curSong.SongInfo.Query}>").ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
cgb.CreateCommand(Prefix + "autoplay")
|
cgb.CreateCommand(Prefix + "autoplay")
|
||||||
|
BIN
NadekoBot/bin/Debug/data/musicdata/1469797859.64474
Normal file
BIN
NadekoBot/bin/Debug/data/musicdata/1469797859.64474
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user