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

music commandnames and aliases updated

Browse Source
This commit is contained in:
Master Kwoth 2016-06-18 04:11:55 +02:00
parent 0f6e718324
commit f41564cc00
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,8 +38,8 @@ namespace NadekoBot.Modules.Music
commands.ForEach(cmd => cmd.Init(cgb)); commands.ForEach(cmd => cmd.Init(cgb));
cgb.CreateCommand("n") cgb.CreateCommand("next")
.Alias("next") .Alias("n")
.Alias("skip") .Alias("skip")
.Description("Goes to the next song in the queue. You have to be in the same voice channel as the bot.\n**Usage**: `!m n`") .Description("Goes to the next song in the queue. You have to be in the same voice channel as the bot.\n**Usage**: `!m n`")
.Do(e => .Do(e =>
@ -50,8 +50,8 @@ namespace NadekoBot.Modules.Music
musicPlayer.Next(); musicPlayer.Next();
}); });
cgb.CreateCommand("s") cgb.CreateCommand("stop")
.Alias("stop") .Alias("s")
.Description("Stops the music and clears the playlist. Stays in the channel.\n**Usage**: `!m s`") .Description("Stops the music and clears the playlist. Stays in the channel.\n**Usage**: `!m s`")
.Do(async e => .Do(async e =>
{ {
@ -64,8 +64,8 @@ namespace NadekoBot.Modules.Music
}).ConfigureAwait(false); }).ConfigureAwait(false);
}); });
cgb.CreateCommand("d") cgb.CreateCommand("destroy")
.Alias("destroy") .Alias("d")
.Description("Completely stops the music and unbinds the bot from the channel. " + .Description("Completely stops the music and unbinds the bot from the channel. " +
"(may cause weird behaviour)\n**Usage**: `!m d`") "(may cause weird behaviour)\n**Usage**: `!m d`")
.Do(async e => .Do(async e =>
@ -79,8 +79,8 @@ namespace NadekoBot.Modules.Music
}).ConfigureAwait(false); }).ConfigureAwait(false);
}); });
cgb.CreateCommand("p") cgb.CreateCommand("pause")
.Alias("pause") .Alias("p")
.Description("Pauses or Unpauses the song.\n**Usage**: `!m p`") .Description("Pauses or Unpauses the song.\n**Usage**: `!m p`")
.Do(async e => .Do(async e =>
{ {
@ -95,7 +95,8 @@ namespace NadekoBot.Modules.Music
await e.Channel.SendMessage("🎵`Music Player unpaused.`").ConfigureAwait(false); await e.Channel.SendMessage("🎵`Music Player unpaused.`").ConfigureAwait(false);
}); });
cgb.CreateCommand("q") cgb.CreateCommand("queue")
.Alias("q")
.Alias("yq") .Alias("yq")
.Description("Queue a song using keywords or a link. Bot will join your voice channel." + .Description("Queue a song using keywords or a link. Bot will join your voice channel." +
"**You must be in a voice channel**.\n**Usage**: `!m q Dream Of Venice`") "**You must be in a voice channel**.\n**Usage**: `!m q Dream Of Venice`")
@ -110,8 +111,8 @@ namespace NadekoBot.Modules.Music
} }
}); });
cgb.CreateCommand("lq") cgb.CreateCommand("listqueue")
.Alias("ls").Alias("lp") .Alias("lq")
.Description("Lists up to 15 currently queued songs.\n**Usage**: `!m lq`") .Description("Lists up to 15 currently queued songs.\n**Usage**: `!m lq`")
.Parameter("page", ParameterType.Optional) .Parameter("page", ParameterType.Optional)
.Do(async e => .Do(async e =>
@ -148,8 +149,8 @@ namespace NadekoBot.Modules.Music
await e.Channel.SendMessage(toSend + string.Join("\n", musicPlayer.Playlist.Skip(startAt).Take(15).Select(v => $"`{number++}.` {v.PrettyName}"))).ConfigureAwait(false); await e.Channel.SendMessage(toSend + string.Join("\n", musicPlayer.Playlist.Skip(startAt).Take(15).Select(v => $"`{number++}.` {v.PrettyName}"))).ConfigureAwait(false);
}); });
cgb.CreateCommand("np") cgb.CreateCommand("nowplaying")
.Alias("playing") .Alias("np")
.Description("Shows the song currently playing.\n**Usage**: `!m np`") .Description("Shows the song currently playing.\n**Usage**: `!m np`")
.Do(async e => .Do(async e =>
{ {
@ -163,7 +164,8 @@ namespace NadekoBot.Modules.Music
$"{currentSong.PrettyCurrentTime()}").ConfigureAwait(false); $"{currentSong.PrettyCurrentTime()}").ConfigureAwait(false);
}); });
cgb.CreateCommand("vol") cgb.CreateCommand("volume")
.Alias("vol")
.Description("Sets the music volume 0-100%\n**Usage**: `!m vol 50`") .Description("Sets the music volume 0-100%\n**Usage**: `!m vol 50`")
.Parameter("val", ParameterType.Required) .Parameter("val", ParameterType.Required)
.Do(async e => .Do(async e =>
@ -184,8 +186,8 @@ namespace NadekoBot.Modules.Music
await e.Channel.SendMessage($"🎵 `Volume set to {volume}%`").ConfigureAwait(false); await e.Channel.SendMessage($"🎵 `Volume set to {volume}%`").ConfigureAwait(false);
}); });
cgb.CreateCommand("dv") cgb.CreateCommand("defvol")
.Alias("defvol") .Alias("dv")
.Description("Sets the default music volume when music playback is started (0-100)." + .Description("Sets the default music volume when music playback is started (0-100)." +
" Does not persist through restarts.\n**Usage**: `!m dv 80`") " Does not persist through restarts.\n**Usage**: `!m dv 80`")
.Parameter("val", ParameterType.Required) .Parameter("val", ParameterType.Required)
@ -202,7 +204,7 @@ namespace NadekoBot.Modules.Music
await e.Channel.SendMessage($"🎵 `Default volume set to {volume}%`").ConfigureAwait(false); await e.Channel.SendMessage($"🎵 `Default volume set to {volume}%`").ConfigureAwait(false);
}); });
cgb.CreateCommand("min").Alias("mute") cgb.CreateCommand("mute").Alias("min")
.Description("Sets the music volume to 0%\n**Usage**: `!m min`") .Description("Sets the music volume to 0%\n**Usage**: `!m min`")
.Do(e => .Do(e =>
{ {
@ -238,7 +240,8 @@ namespace NadekoBot.Modules.Music
musicPlayer.SetVolume(50); musicPlayer.SetVolume(50);
}); });
cgb.CreateCommand("sh") cgb.CreateCommand("shuffle")
.Alias("sh")
.Description("Shuffles the current playlist.\n**Usage**: `!m sh`") .Description("Shuffles the current playlist.\n**Usage**: `!m sh`")
.Do(async e => .Do(async e =>
{ {
@ -257,7 +260,8 @@ namespace NadekoBot.Modules.Music
await e.Channel.SendMessage("🎵 `Songs shuffled.`").ConfigureAwait(false); await e.Channel.SendMessage("🎵 `Songs shuffled.`").ConfigureAwait(false);
}); });
cgb.CreateCommand("pl") cgb.CreateCommand("playlist")
.Alias("pl")
.Description("Queues up to 50 songs from a youtube playlist specified by a link, or keywords.\n**Usage**: `!m pl playlist link or name`") .Description("Queues up to 50 songs from a youtube playlist specified by a link, or keywords.\n**Usage**: `!m pl playlist link or name`")
.Parameter("playlist", ParameterType.Unparsed) .Parameter("playlist", ParameterType.Unparsed)
.Do(async e => .Do(async e =>
@ -298,7 +302,8 @@ namespace NadekoBot.Modules.Music
await msg.Edit("🎵 `Playlist queue complete.`").ConfigureAwait(false); await msg.Edit("🎵 `Playlist queue complete.`").ConfigureAwait(false);
}); });
cgb.CreateCommand("lopl") cgb.CreateCommand("localplaylist")
.Alias("lopl")
.Description("Queues all songs from a directory. **Bot Owner Only!**\n**Usage**: `!m lopl C:/music/classical`") .Description("Queues all songs from a directory. **Bot Owner Only!**\n**Usage**: `!m lopl C:/music/classical`")
.Parameter("directory", ParameterType.Unparsed) .Parameter("directory", ParameterType.Unparsed)
.AddCheck(SimpleCheckers.OwnerOnly()) .AddCheck(SimpleCheckers.OwnerOnly())
@ -338,7 +343,8 @@ namespace NadekoBot.Modules.Music
} }
}); });
cgb.CreateCommand("lo") cgb.CreateCommand("local")
.Alias("lo")
.Description("Queues a local file by specifying a full path. **Bot Owner Only!**\n**Usage**: `!m lo C:/music/mysong.mp3`") .Description("Queues a local file by specifying a full path. **Bot Owner Only!**\n**Usage**: `!m lo C:/music/mysong.mp3`")
.Parameter("path", ParameterType.Unparsed) .Parameter("path", ParameterType.Unparsed)
.AddCheck(SimpleCheckers.OwnerOnly()) .AddCheck(SimpleCheckers.OwnerOnly())
@ -350,7 +356,8 @@ namespace NadekoBot.Modules.Music
await QueueSong(e.Channel, e.User.VoiceChannel, e.GetArg("path"), musicType: MusicType.Local).ConfigureAwait(false); await QueueSong(e.Channel, e.User.VoiceChannel, e.GetArg("path"), musicType: MusicType.Local).ConfigureAwait(false);
}); });
cgb.CreateCommand("mv") cgb.CreateCommand("move")
.Alias("mv")
.Description("Moves the bot to your voice channel. (works only if music is already playing)\n**Usage**: `!m mv`") .Description("Moves the bot to your voice channel. (works only if music is already playing)\n**Usage**: `!m mv`")
.Do(e => .Do(e =>
{ {
@ -410,8 +417,8 @@ namespace NadekoBot.Modules.Music
} }
}); });
cgb.CreateCommand("rcs") cgb.CreateCommand("repeatcursong")
.Alias("repeatcurrentsong") .Alias("rcs")
.Description("Toggles repeat of current song.\n**Usage**: `!m rcs`") .Description("Toggles repeat of current song.\n**Usage**: `!m rcs`")
.Do(async e => .Do(async e =>
{ {
@ -428,8 +435,8 @@ namespace NadekoBot.Modules.Music
.ConfigureAwait(false); .ConfigureAwait(false);
}); });
cgb.CreateCommand("rpl") cgb.CreateCommand("repeatplaylist")
.Alias("repeatplaylist") .Alias("rpl")
.Description("Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue).\n**Usage**: `!m rpl`") .Description("Toggles repeat of all songs in the queue (every song that finishes is added to the end of the queue).\n**Usage**: `!m rpl`")
.Do(async e => .Do(async e =>
{ {