From 2529ff6daef7eb387d2fce4c6df5a31029fd5bb2 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 11 Feb 2011 03:12:39 -0500 Subject: Made the help command description code more sane --- modules/extra/cs_appendtopic.cpp | 6 +----- modules/extra/cs_enforce.cpp | 6 +----- modules/extra/cs_entrymsg.cpp | 6 +----- modules/extra/cs_set_misc.cpp | 10 +++------- modules/extra/cs_tban.cpp | 6 +----- modules/extra/db_mysql.cpp | 6 +----- modules/extra/hs_request.cpp | 16 ++++------------ modules/extra/m_xmlrpc_main.cpp | 2 +- modules/extra/ns_set_misc.cpp | 12 ++++-------- 9 files changed, 17 insertions(+), 53 deletions(-) (limited to 'modules/extra') diff --git a/modules/extra/cs_appendtopic.cpp b/modules/extra/cs_appendtopic.cpp index c8c641876..e46c6654e 100644 --- a/modules/extra/cs_appendtopic.cpp +++ b/modules/extra/cs_appendtopic.cpp @@ -48,6 +48,7 @@ class CommandCSAppendTopic : public Command public: CommandCSAppendTopic() : Command("APPENDTOPIC", 2, 2) { + this->SetDesc("Add text to a channels topic"); } CommandReturn Execute(CommandSource &source, const std::vector ¶ms) @@ -100,11 +101,6 @@ class CommandCSAppendTopic : public Command { me->SendMessage(source, _("Syntax: APPENDTOPIC channel text")); } - - void OnServHelp(CommandSource &source) - { - me->SendMessage(source, _(" APPENDTOPIC Add text to a channels topic")); - } }; class CSAppendTopic : public Module diff --git a/modules/extra/cs_enforce.cpp b/modules/extra/cs_enforce.cpp index c5a2ee590..93873fe3c 100644 --- a/modules/extra/cs_enforce.cpp +++ b/modules/extra/cs_enforce.cpp @@ -123,6 +123,7 @@ class CommandCSEnforce : public Command public: CommandCSEnforce() : Command("ENFORCE", 1, 2) { + this->SetDesc("Enforce various channel modes and set options"); } CommandReturn Execute(CommandSource &source, const std::vector ¶ms) @@ -207,11 +208,6 @@ class CommandCSEnforce : public Command { me->SendMessage(source, _("Syntax: \002ENFORCE \037channel\037 [\037what\037]\002")); } - - void OnServHelp(CommandSource &source) - { - me->SendMessage(source, _(" ENFORCE Enforce various channel modes and set options")); - } }; class CSEnforce : public Module diff --git a/modules/extra/cs_entrymsg.cpp b/modules/extra/cs_entrymsg.cpp index 25cef4e78..b6b7fd66d 100644 --- a/modules/extra/cs_entrymsg.cpp +++ b/modules/extra/cs_entrymsg.cpp @@ -99,6 +99,7 @@ class CommandEntryMessage : public Command public: CommandEntryMessage(const Anope::string &cname) : Command(cname, 2, 3) { + this->SetDesc("Manage the channel's entry messages"); } CommandReturn Execute(CommandSource &source, const std::vector ¶ms) @@ -150,11 +151,6 @@ class CommandEntryMessage : public Command "Controls what messages will be sent to users when they join the channel.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" ENTRYMSG Manage the channel's entrymsgs")); - } }; class CSEntryMessage : public Module diff --git a/modules/extra/cs_set_misc.cpp b/modules/extra/cs_set_misc.cpp index e91f32860..301112769 100644 --- a/modules/extra/cs_set_misc.cpp +++ b/modules/extra/cs_set_misc.cpp @@ -16,8 +16,9 @@ class CommandCSSetMisc : public Command { Anope::string Desc; public: - CommandCSSetMisc(const Anope::string &cname, const Anope::string &desc, const Anope::string &cpermission = "") : Command(cname, 1, 2, cpermission), Desc(desc) + CommandCSSetMisc(const Anope::string &cname, const Anope::string &cdesc, const Anope::string &cpermission = "") : Command(cname, 1, 2, cpermission), Desc(cdesc) { + this->SetDesc(cdesc); } CommandReturn Execute(CommandSource &source, const std::vector ¶ms) @@ -43,17 +44,12 @@ class CommandCSSetMisc : public Command { SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(" %-10s %s", this->name.c_str(), this->Desc.c_str()); - } }; class CommandCSSASetMisc : public CommandCSSetMisc { public: - CommandCSSASetMisc(const Anope::string &cname, const Anope::string &desc) : CommandCSSetMisc(cname, desc, "chanserv/saset/" + cname) + CommandCSSASetMisc(const Anope::string &cname, const Anope::string &cdesc) : CommandCSSetMisc(cname, cdesc, "chanserv/saset/" + cname) { } diff --git a/modules/extra/cs_tban.cpp b/modules/extra/cs_tban.cpp index 6e54da6be..873a0cfee 100644 --- a/modules/extra/cs_tban.cpp +++ b/modules/extra/cs_tban.cpp @@ -56,6 +56,7 @@ class CommandCSTBan : public Command public: CommandCSTBan() : Command("TBAN", 3, 3) { + this->SetDesc("Bans the user for a given length of time"); } CommandReturn Execute(CommandSource &source, const std::vector ¶ms) @@ -100,11 +101,6 @@ class CommandCSTBan : public Command { me->SendMessage(source, _("Syntax: TBAN channel nick time")); } - - void OnServHelp(CommandSource &source) - { - me->SendMessage(source, _(" TBAN Bans the user for a given length of time")); - } }; class CSTBan : public Module diff --git a/modules/extra/db_mysql.cpp b/modules/extra/db_mysql.cpp index 833e547a2..d9b4d543a 100644 --- a/modules/extra/db_mysql.cpp +++ b/modules/extra/db_mysql.cpp @@ -123,6 +123,7 @@ class CommandSQLSync : public Command public: CommandSQLSync() : Command("SQLSYNC", 0, 0, "operserv/sqlsync") { + this->SetDesc("Import your databases to SQL"); } CommandReturn Execute(CommandSource &source, const std::vector ¶ms); @@ -136,11 +137,6 @@ class CommandSQLSync : public Command "import your databases into SQL.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SQLSYNC Import your databases to SQL")); - } }; class MySQLInterface : public SQLInterface diff --git a/modules/extra/hs_request.cpp b/modules/extra/hs_request.cpp index 3a1237328..0dd3e707b 100644 --- a/modules/extra/hs_request.cpp +++ b/modules/extra/hs_request.cpp @@ -47,6 +47,7 @@ class CommandHSRequest : public Command public: CommandHSRequest() : Command("REQUEST", 1, 1) { + this->SetDesc("Request a vHost for your nick"); } CommandReturn Execute(CommandSource &source, const std::vector ¶ms) @@ -126,11 +127,6 @@ class CommandHSRequest : public Command { me->SendMessage(source, _("Syntax: \002REQUEST \037vhost\037\002")); } - - void OnServHelp(CommandSource &source) - { - me->SendMessage(source, _(" REQUEST Request a vHost for your nick")); - } }; class CommandHSActivate : public Command @@ -138,6 +134,7 @@ class CommandHSActivate : public Command public: CommandHSActivate() : Command("ACTIVATE", 1, 1, "hostserv/set") { + this->SetDesc("Approve the requested vHost of a user"); } CommandReturn Execute(CommandSource &source, const std::vector ¶ms) @@ -187,13 +184,6 @@ class CommandHSActivate : public Command { me->SendMessage(source, _("Syntax: \002ACTIVATE \037nick\037\002")); } - - void OnServHelp(CommandSource &source) - { - me->SendMessage(source, _(" ACTIVATE Approve the requested vHost of a user\n" - " REJECT Reject the requested vHost of a user\n" - " WAITING Convenience command for LIST +req")); - } }; class CommandHSReject : public Command @@ -201,6 +191,7 @@ class CommandHSReject : public Command public: CommandHSReject() : Command("REJECT", 1, 2, "hostserv/set") { + this->SetDesc("Reject the requested vHost of a user"); } CommandReturn Execute(CommandSource &source, const std::vector ¶ms) @@ -295,6 +286,7 @@ class CommandHSWaiting : public HSListBase public: CommandHSWaiting() : HSListBase("WAITING", 0, 0) { + this->SetDesc("Convenience command for LIST +req"); } CommandReturn Execute(CommandSource &source, const std::vector ¶ms) diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/extra/m_xmlrpc_main.cpp index 8d4cdf56e..b33e9555e 100644 --- a/modules/extra/m_xmlrpc_main.cpp +++ b/modules/extra/m_xmlrpc_main.cpp @@ -14,7 +14,7 @@ class XMLRPCUser : public User this->server = Me; } - void SendMessage(BotInfo *, const Anope::string &msg) + void SendMessage(BotInfo *, Anope::string msg) { this->out += msg + "\n"; } diff --git a/modules/extra/ns_set_misc.cpp b/modules/extra/ns_set_misc.cpp index 72b4ba5e9..767077e53 100644 --- a/modules/extra/ns_set_misc.cpp +++ b/modules/extra/ns_set_misc.cpp @@ -19,8 +19,9 @@ class CommandNSSetMisc : public Command Anope::string Desc; public: - CommandNSSetMisc(const Anope::string &cname, const Anope::string &desc, const Anope::string &cpermission = "") : Command(cname, 1, 2, cpermission), Desc(desc) + CommandNSSetMisc(const Anope::string &cname, const Anope::string &cdesc, const Anope::string &cpermission = "") : Command(cname, 1, 2, cpermission), Desc(cdesc) { + this->SetDesc(cdesc); } CommandReturn Execute(CommandSource &source, const std::vector ¶ms) @@ -47,17 +48,12 @@ class CommandNSSetMisc : public Command { SyntaxError(source, "SET", LanguageString::NICK_SET_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(" %-10s %s", this->name.c_str(), this->Desc.c_str()); - } }; class CommandNSSASetMisc : public CommandNSSetMisc { public: - CommandNSSASetMisc(const Anope::string &cname, const Anope::string &desc) : CommandNSSetMisc(cname, desc, "nickserv/saset/" + cname) + CommandNSSASetMisc(const Anope::string &cname, const Anope::string &cdesc) : CommandNSSetMisc(cname, cdesc, "nickserv/saset/" + cname) { } @@ -75,7 +71,7 @@ class NSSetMisc : public Module Anope::string Desc; bool ShowHidden; - CommandInfo(const Anope::string &name, const Anope::string &desc, bool showhidden) : Name(name), Desc(desc), ShowHidden(showhidden) { } + CommandInfo(const Anope::string &name, const Anope::string &cdesc, bool showhidden) : Name(name), Desc(cdesc), ShowHidden(showhidden) { } }; std::map Commands; -- cgit