mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev

Browse Source
This commit is contained in:
Kwoth 2016-07-29 18:42:47 +02:00
commit f32ff91226
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
NadekoBot/Modules/Music/MusicModule.cs
View File

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