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

Improved help greatly.

Browse Source 
Small fixes, improvements.
This commit is contained in:
Kwoth 2015-12-10 00:05:03 +01:00
parent 3f7c3da072
commit 00d2b75cce
4 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
NadekoBot/Commands/HelpCommand.cs
View File

@ -10,17 +10,24 @@ namespace NadekoBot
{ {
return async e => return async e =>
{ {
string helpstr = "Official repo: https://github.com/Kwoth/NadekoBot/"+Environment.NewLine; string helpstr = "Official repo: **github.com/Kwoth/NadekoBot/** \n";
string lastCategory = "";
foreach (var com in client.Commands().AllCommands) foreach (var com in client.Commands().AllCommands)
{ {
helpstr += "&###**#" + com.Category + "#**\n"; if (com.Category != lastCategory)
{
helpstr += "\n`----`**`" + com.Category + "`**`----`\n";
lastCategory = com.Category;
}
helpstr += PrintCommandHelp(com); helpstr += PrintCommandHelp(com);
} }
helpstr = helpstr.Replace(NadekoBot.botMention, "@BotName");
while (helpstr.Length > 2000) while (helpstr.Length > 2000)
{ {
var curstr = helpstr.Substring(0, 2000); var curstr = helpstr.Substring(0, 2000);
await client.SendPrivateMessage(e.User, curstr.Substring(0, curstr.LastIndexOf("&"))); await client.SendPrivateMessage(e.User, curstr.Substring(0, curstr.LastIndexOf("\n")+1));
helpstr = curstr.Substring(curstr.LastIndexOf("&")) + helpstr.Substring(2000); helpstr = curstr.Substring(curstr.LastIndexOf("\n")+1) + helpstr.Substring(2000);
} }
await client.SendPrivateMessage(e.User, helpstr); await client.SendPrivateMessage(e.User, helpstr);
}; };
@ -36,10 +43,10 @@ namespace NadekoBot
private string PrintCommandHelp(Command com) private string PrintCommandHelp(Command com)
{ {
var str = "`" + com.Text + "`\n"; var str = "`" + com.Text + "`";
foreach (var a in com.Aliases) foreach (var a in com.Aliases)
str += "`" + a + "`\n"; str += " [" + a + " ]";
str += "Description: " + com.Description + "\n"; str += " **Description:** " + com.Description + "\n";
return str; return str;
} }
} }

10
NadekoBot/Modules/Administration.cs
View File

@ -86,7 +86,7 @@ namespace NadekoBot.Modules
} }
}); });
cgb.CreateCommand(".r").Alias(".role").Alias(".cr").Alias(".createrole") cgb.CreateCommand(".r").Alias(".role").Alias(".cr")
.Description("Creates a role with a given name, and color.\n*Both the user and the bot must have the sufficient permissions.*") .Description("Creates a role with a given name, and color.\n*Both the user and the bot must have the sufficient permissions.*")
.Parameter("role_name",Discord.Commands.ParameterType.Required) .Parameter("role_name",Discord.Commands.ParameterType.Required)
.Parameter("role_color",Discord.Commands.ParameterType.Optional) .Parameter("role_color",Discord.Commands.ParameterType.Optional)
@ -161,7 +161,7 @@ namespace NadekoBot.Modules
} }
}); });
cgb.CreateCommand(".rvch").Alias(".removevoicechannel") cgb.CreateCommand(".rvch")
.Description("Removes a voice channel with a given name.\n*Both the user and the bot must have the sufficient permissions.*") .Description("Removes a voice channel with a given name.\n*Both the user and the bot must have the sufficient permissions.*")
.Parameter("channel_name", Discord.Commands.ParameterType.Required) .Parameter("channel_name", Discord.Commands.ParameterType.Required)
.Do(async e => .Do(async e =>
@ -180,7 +180,7 @@ namespace NadekoBot.Modules
} }
}); });
cgb.CreateCommand(".vch").Alias(".cvch").Alias(".createvoicechannel") cgb.CreateCommand(".vch").Alias(".cvch")
.Description("Creates a new voice channel with a given name.\n*Both the user and the bot must have the sufficient permissions.*") .Description("Creates a new voice channel with a given name.\n*Both the user and the bot must have the sufficient permissions.*")
.Parameter("channel_name", Discord.Commands.ParameterType.Required) .Parameter("channel_name", Discord.Commands.ParameterType.Required)
.Do(async e => .Do(async e =>
@ -199,7 +199,7 @@ namespace NadekoBot.Modules
} }
}); });
cgb.CreateCommand(".rch").Alias(".rtch").Alias(".removetextchannel").Alias(".removechannel") cgb.CreateCommand(".rch").Alias(".rtch")
.Description("Removes a text channel with a given name.\n*Both the user and the bot must have the sufficient permissions.*") .Description("Removes a text channel with a given name.\n*Both the user and the bot must have the sufficient permissions.*")
.Parameter("channel_name", Discord.Commands.ParameterType.Required) .Parameter("channel_name", Discord.Commands.ParameterType.Required)
.Do(async e => .Do(async e =>
@ -218,7 +218,7 @@ namespace NadekoBot.Modules
} }
}); });
cgb.CreateCommand(".ch").Alias(".tch").Alias(".createchannel").Alias(".createtextchannel") cgb.CreateCommand(".ch").Alias(".tch")
.Description("Creates a new text channel with a given name.\n*Both the user and the bot must have the sufficient permissions.*") .Description("Creates a new text channel with a given name.\n*Both the user and the bot must have the sufficient permissions.*")
.Parameter("channel_name", Discord.Commands.ParameterType.Required) .Parameter("channel_name", Discord.Commands.ParameterType.Required)
.Do(async e => .Do(async e =>

26
NadekoBot/Modules/Conversations.cs
View File

@ -25,7 +25,7 @@ namespace NadekoBot.Modules
private CommandBuilder CreateCommand(CommandGroupBuilder cbg, string txt) private CommandBuilder CreateCommand(CommandGroupBuilder cbg, string txt)
{ {
CommandBuilder cb = cbg.CreateCommand(txt); CommandBuilder cb = cbg.CreateCommand(txt);
return AliasCommand(cb, txt); return cb;
} }
private CommandBuilder AliasCommand(CommandBuilder cb, string txt) private CommandBuilder AliasCommand(CommandBuilder cb, string txt)
@ -112,7 +112,7 @@ namespace NadekoBot.Modules
CreateCommand(cgb, "insult") CreateCommand(cgb, "insult")
.Parameter("mention", ParameterType.Required) .Parameter("mention", ParameterType.Required)
.Description("Only works for owner. Insults @X person.\nUsage: @NadekoBot insult @X.") .Description("Only works for owner. Insults @X person.\n**Usage**: @NadekoBot insult @X.")
.Do(async e => .Do(async e =>
{ {
List<string> insults = new List<string> { " you are a poop.", " you jerk.", " i will eat you when i get my powers back." }; List<string> insults = new List<string> { " you are a poop.", " you jerk.", " i will eat you when i get my powers back." };
@ -133,7 +133,7 @@ namespace NadekoBot.Modules
}); });
CreateCommand(cgb, "praise") CreateCommand(cgb, "praise")
.Description("Only works for owner. Praises @X person.\nUsage: @NadekoBot insult @X.") .Description("Only works for owner. Praises @X person.\n**Usage**: @NadekoBot praise @X.")
.Parameter("mention", ParameterType.Required) .Parameter("mention", ParameterType.Required)
.Do(async e => .Do(async e =>
{ {
@ -171,7 +171,7 @@ namespace NadekoBot.Modules
cgb.CreateCommand("are you there") cgb.CreateCommand("are you there")
.Description("Checks if nadeko is operational.") .Description("Checks if nadeko is operational.")
.Alias(new string[] { "!", "?", "??", "???", "!!", "!!!" }) .Alias(new string[] { "!", "?" })
.Do(SayYes()); .Do(SayYes());
CreateCommand(cgb, "draw") CreateCommand(cgb, "draw")
@ -190,7 +190,7 @@ namespace NadekoBot.Modules
await client.SendMessage(e.Channel, str); await client.SendMessage(e.Channel, str);
}); });
CreateCommand(cgb, "fire") CreateCommand(cgb, "fire")
.Description("Shows a unicode fire message. Optional parameter [x] tells her how many times to repeat the fire.\nUsage: @NadekoBot fire [x]") .Description("Shows a unicode fire message. Optional parameter [x] tells her how many times to repeat the fire.\n**Usage**: @NadekoBot fire [x]")
.Parameter("times", ParameterType.Optional) .Parameter("times", ParameterType.Optional)
.Do(async e => .Do(async e =>
{ {
@ -211,7 +211,7 @@ namespace NadekoBot.Modules
}); });
CreateCommand(cgb, "rip") CreateCommand(cgb, "rip")
.Description("Shows a grave image.Optional parameter [@X] instructs her to put X's name on the grave.\nUsage: @NadekoBot rip [@X]") .Description("Shows a grave image.Optional parameter [@X] instructs her to put X's name on the grave.\n**Usage**: @NadekoBot rip [@X]")
.Parameter("all", ParameterType.Unparsed) .Parameter("all", ParameterType.Unparsed)
.Do(async e => .Do(async e =>
{ {
@ -248,7 +248,7 @@ namespace NadekoBot.Modules
}); });
cgb.CreateCommand("i") cgb.CreateCommand("i")
.Description("Pulls a first image using a search parameter.\nUsage: @NadekoBot img Multiword_search_parameter") .Description("Pulls a first image using a search parameter.\n**Usage**: @NadekoBot img Multiword_search_parameter")
.Alias("img") .Alias("img")
.Parameter("all", ParameterType.Unparsed) .Parameter("all", ParameterType.Unparsed)
.Do(async e => .Do(async e =>
@ -269,7 +269,7 @@ namespace NadekoBot.Modules
}); });
cgb.CreateCommand("ir") cgb.CreateCommand("ir")
.Description("Pulls a random image using a search parameter.\nUsage: @NadekoBot img Multiword_search_parameter") .Description("Pulls a random image using a search parameter.\n**Usage**: @NadekoBot img Multiword_search_parameter")
.Alias("imgrandom") .Alias("imgrandom")
.Parameter("all", ParameterType.Unparsed) .Parameter("all", ParameterType.Unparsed)
.Do(async e => .Do(async e =>
@ -345,7 +345,7 @@ namespace NadekoBot.Modules
}); });
CreateCommand(cgb, "bb") CreateCommand(cgb, "bb")
.Description("Says bye to someone.\nUsage: @NadekoBot bb @X") .Description("Says bye to someone. **Usage**: @NadekoBot bb @X")
.Parameter("ppl", ParameterType.Unparsed) .Parameter("ppl", ParameterType.Unparsed)
.Do(async e => .Do(async e =>
{ {
@ -358,7 +358,7 @@ namespace NadekoBot.Modules
}); });
AliasCommand(CreateCommand(cgb, "req"), "request") AliasCommand(CreateCommand(cgb, "req"), "request")
.Description("Requests a feature for nadeko.\nUsage: @NadekoBot req Mutliword_feature_request") .Description("Requests a feature for nadeko.\n**Usage**: @NadekoBot req new_feature")
.Parameter("all", ParameterType.Unparsed) .Parameter("all", ParameterType.Unparsed)
.Do(async e => .Do(async e =>
{ {
@ -462,7 +462,7 @@ namespace NadekoBot.Modules
}); });
CreateCommand(cgb, "call") CreateCommand(cgb, "call")
.Description("Useless. Writes calling @X to chat.\nUsage: @NadekoBot call @X ") .Description("Useless. Writes calling @X to chat.\n**Usage**: @NadekoBot call @X ")
.Parameter("who", ParameterType.Required) .Parameter("who", ParameterType.Required)
.Do(async e => .Do(async e =>
{ {
@ -481,6 +481,7 @@ namespace NadekoBot.Modules
await client.EditProfile("", null, null, null, ms, ImageType.Png); await client.EditProfile("", null, null, null, ms, ImageType.Png);
} }
await client.SendMessage(e.Channel, "*hides*");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -489,7 +490,7 @@ namespace NadekoBot.Modules
}); });
CreateCommand(cgb, "unhide") CreateCommand(cgb, "unhide")
.Description("Hides nadeko in plain sight!11!!") .Description("Unhides nadeko in plain sight!1!!1")
.Do(async e => .Do(async e =>
{ {
try try
@ -501,6 +502,7 @@ namespace NadekoBot.Modules
await client.EditProfile("", null, null, null,ms, ImageType.Jpeg); await client.EditProfile("", null, null, null,ms, ImageType.Jpeg);
} }
await client.SendMessage(e.Channel, "*unhides*");
} }
catch (Exception ex) catch (Exception ex)
{ {

1
NadekoBot/Modules/Searches.cs
View File

@ -30,6 +30,7 @@ namespace NadekoBot.Modules
{ {
cgb.CreateCommand("~av") cgb.CreateCommand("~av")
.Parameter("mention", Discord.Commands.ParameterType.Required) .Parameter("mention", Discord.Commands.ParameterType.Required)
.Description("Shows a mentioned person's avatar. **Usage**: ~av @X")
.Do(async e => .Do(async e =>
{ {
if (e.Message.MentionedUsers.Count() == 0) { if (e.Message.MentionedUsers.Count() == 0) {