diff options
148 files changed, 215 insertions, 939 deletions
diff --git a/include/commands.h b/include/commands.h index 2b3120f29..a2d6643fe 100644 --- a/include/commands.h +++ b/include/commands.h @@ -79,6 +79,8 @@ struct CoreExport CommandSource */ class CoreExport Command : public Flags<CommandFlag> { + Anope::string desc; + public: /* Maximum paramaters accepted by this command */ size_t MaxParams; @@ -104,6 +106,10 @@ class CoreExport Command : public Flags<CommandFlag> virtual ~Command(); + protected: + void SetDesc(const Anope::string &d); + + public: /** Execute this command. * @param source The source * @param params Command parameters diff --git a/include/users.h b/include/users.h index 091cecc5e..667293a3f 100644 --- a/include/users.h +++ b/include/users.h @@ -156,7 +156,7 @@ class CoreExport User : public Extensible * @param ... any number of parameters */ void SendMessage(BotInfo *source, const char *fmt, ...); - virtual void SendMessage(BotInfo *source, const Anope::string &msg); + virtual void SendMessage(BotInfo *source, Anope::string msg); /** Collide a nick * See the comment in users.cpp diff --git a/modules/core/bs_act.cpp b/modules/core/bs_act.cpp index b29e99fac..0b2402f90 100644 --- a/modules/core/bs_act.cpp +++ b/modules/core/bs_act.cpp @@ -18,6 +18,7 @@ class CommandBSAct : public Command public: CommandBSAct() : Command("ACT", 2, 2) { + this->SetDesc("Makes the bot do the equivalent of a \"/me\" command"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -70,11 +71,6 @@ class CommandBSAct : public Command "on the given channel using the given text.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" ACT Makes the bot do the equivalent of a \"/me\" command")); - } }; class BSAct : public Module diff --git a/modules/core/bs_assign.cpp b/modules/core/bs_assign.cpp index 4a32c4330..65e5ff2ea 100644 --- a/modules/core/bs_assign.cpp +++ b/modules/core/bs_assign.cpp @@ -18,6 +18,7 @@ class CommandBSAssign : public Command public: CommandBSAssign() : Command("ASSIGN", 2, 2) { + this->SetDesc("Assigns a bot to a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -80,11 +81,6 @@ class CommandBSAssign : public Command { SyntaxError(source, "ASSIGN", _("ASSIGN \037chan\037 \037nick\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" ASSIGN Assigns a bot to a channel")); - } }; class BSAssign : public Module diff --git a/modules/core/bs_badwords.cpp b/modules/core/bs_badwords.cpp index 4bbced7e5..dd87ba41d 100644 --- a/modules/core/bs_badwords.cpp +++ b/modules/core/bs_badwords.cpp @@ -227,6 +227,7 @@ class CommandBSBadwords : public Command public: CommandBSBadwords() : Command("BADWORDS", 2, 3) { + this->SetDesc("Maintains bad words list"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -311,11 +312,6 @@ class CommandBSBadwords : public Command { SyntaxError(source, "BADWORDS", _("BADWORDS \037channel\037 {ADD|DEL|LIST|CLEAR} [\037word\037 | \037entry-list\037] [SINGLE|START|END]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" BADWORDS Maintains bad words list")); - } }; class BSBadwords : public Module diff --git a/modules/core/bs_bot.cpp b/modules/core/bs_bot.cpp index a2fa32f0b..60dc5afaa 100644 --- a/modules/core/bs_bot.cpp +++ b/modules/core/bs_bot.cpp @@ -304,6 +304,7 @@ class CommandBSBot : public Command CommandBSBot() : Command("BOT", 1, 6) { this->SetFlag(CFLAG_STRIP_CHANNEL); + this->SetDesc("Maintains network bot list"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -410,11 +411,6 @@ class CommandBSBot : public Command "\002BOT CHANGE \037oldnick\037 \037newnick\037 [\037user\037 [\037host\037 [\037real\037]]]\002\n" "\002BOT DEL \037nick\037\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" BOT Maintains network bot list")); - } }; class BSBot : public Module diff --git a/modules/core/bs_botlist.cpp b/modules/core/bs_botlist.cpp index 5166e4365..86a306451 100644 --- a/modules/core/bs_botlist.cpp +++ b/modules/core/bs_botlist.cpp @@ -18,6 +18,7 @@ class CommandBSBotList : public Command public: CommandBSBotList() : Command("BOTLIST", 0, 0) { + this->SetDesc("Lists available bots"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -70,11 +71,6 @@ class CommandBSBotList : public Command "Lists all available bots on this network.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" BOTLIST Lists available bots")); - } }; class BSBotList : public Module diff --git a/modules/core/bs_info.cpp b/modules/core/bs_info.cpp index 157b24d9c..48f09bc19 100644 --- a/modules/core/bs_info.cpp +++ b/modules/core/bs_info.cpp @@ -43,6 +43,7 @@ class CommandBSInfo : public Command CommandBSInfo() : Command("INFO", 1, 1) { this->SetFlag(CFLAG_STRIP_CHANNEL); + this->SetDesc("Allows you to see BotServ information about a channel or a bot"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -234,11 +235,6 @@ class CommandBSInfo : public Command { SyntaxError(source, "INFO", _("INFO {\037chan\037 | \037nick\037}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" INFO Allows you to see BotServ information about a channel or a bot")); - } }; class BSInfo : public Module diff --git a/modules/core/bs_kick.cpp b/modules/core/bs_kick.cpp index fbb6924eb..680ccc3d9 100644 --- a/modules/core/bs_kick.cpp +++ b/modules/core/bs_kick.cpp @@ -19,6 +19,7 @@ class CommandBSKick : public Command public: CommandBSKick() : Command("KICK", 3, 6) { + this->SetDesc("Configures kickers"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -574,11 +575,6 @@ class CommandBSKick : public Command { SyntaxError(source, "KICK", _("KICK \037channel\037 \037option\037 {\037ON|\037} [\037settings\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" KICK Configures kickers")); - } }; class BSKick : public Module diff --git a/modules/core/bs_say.cpp b/modules/core/bs_say.cpp index 015ac036e..3d8f64577 100644 --- a/modules/core/bs_say.cpp +++ b/modules/core/bs_say.cpp @@ -18,6 +18,7 @@ class CommandBSSay : public Command public: CommandBSSay() : Command("SAY", 2, 2) { + this->SetDesc("Makes the bot say the given text on the given channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -72,11 +73,6 @@ class CommandBSSay : public Command { SyntaxError(source, "SAY", _("SAY \037channel\037 \037text\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SAY Makes the bot say the given text on the given channel")); - } }; class BSSay : public Module diff --git a/modules/core/bs_set.cpp b/modules/core/bs_set.cpp index f05cf9930..3e9bf13a0 100644 --- a/modules/core/bs_set.cpp +++ b/modules/core/bs_set.cpp @@ -19,6 +19,7 @@ class CommandBSSet : public Command CommandBSSet() : Command("SET", 3, 3) { this->SetFlag(CFLAG_STRIP_CHANNEL); + this->SetDesc("Configures bot options"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -295,11 +296,6 @@ class CommandBSSet : public Command { SyntaxError(source, "SET", _("SET \037(channel | bot)\037 \037option\037 \037settings\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SET Configures bot options")); - } }; class BSSet : public Module diff --git a/modules/core/bs_unassign.cpp b/modules/core/bs_unassign.cpp index 40a67d9a9..f7201c905 100644 --- a/modules/core/bs_unassign.cpp +++ b/modules/core/bs_unassign.cpp @@ -18,6 +18,7 @@ class CommandBSUnassign : public Command public: CommandBSUnassign() : Command("UNASSIGN", 1, 1) { + this->SetDesc("Unassigns a bot from a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -62,11 +63,6 @@ class CommandBSUnassign : public Command { SyntaxError(source, "UNASSIGN", _("UNASSIGN \037chan\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" UNASSIGN Unassigns a bot from a channel")); - } }; class BSUnassign : public Module diff --git a/modules/core/cs_access.cpp b/modules/core/cs_access.cpp index 3811ffbfd..b119fb9d7 100644 --- a/modules/core/cs_access.cpp +++ b/modules/core/cs_access.cpp @@ -393,6 +393,7 @@ class CommandCSAccess : public Command public: CommandCSAccess() : Command("ACCESS", 2, 4) { + this->SetDesc("Modify the list of privileged users"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -668,6 +669,7 @@ class CommandCSLevels : public Command public: CommandCSLevels() : Command("LEVELS", 2, 4) { + this->SetDesc("Redefine the meanings of access levels"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -752,12 +754,6 @@ class CommandCSLevels : public Command { SyntaxError(source, "LEVELS", _("LEVELS \037channel\037 {SET | DIS[ABLE] | LIST | RESET} [\037item\037 [\037level\037]]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" ACCESS Modify the list of privileged users")); - source.Reply(_(" LEVELS Redefine the meanings of access levels")); - } }; class CSAccess : public Module diff --git a/modules/core/cs_akick.cpp b/modules/core/cs_akick.cpp index 637ab0b08..e3ebeeb2a 100644 --- a/modules/core/cs_akick.cpp +++ b/modules/core/cs_akick.cpp @@ -475,6 +475,7 @@ class CommandCSAKick : public Command public: CommandCSAKick() : Command("AKICK", 2, 4) { + this->SetDesc("Maintain the AutoKick list"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -558,11 +559,6 @@ class CommandCSAKick : public Command { SyntaxError(source, "AKICK", _("AKICK \037channel\037 {ADD | DEL | LIST | VIEW | ENFORCE | CLEAR} [\037nick-or-usermask\037] [\037reason\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" AKICK Maintain the AutoKick list")); - } }; class CSAKick : public Module diff --git a/modules/core/cs_ban.cpp b/modules/core/cs_ban.cpp index 9d2291771..8f85a0a48 100644 --- a/modules/core/cs_ban.cpp +++ b/modules/core/cs_ban.cpp @@ -18,6 +18,7 @@ class CommandCSBan : public Command public: CommandCSBan(const Anope::string &cname) : Command("BAN", 2, 3) { + this->SetDesc("Bans a selected nick on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -89,11 +90,6 @@ class CommandCSBan : public Command { SyntaxError(source, "BAN", _("BAN \037#channel\037 \037nick\037 [\037reason\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" BAN Bans a selected nick on a channel")); - } }; class CSBan : public Module diff --git a/modules/core/cs_clearusers.cpp b/modules/core/cs_clearusers.cpp index ed58bacdf..ef82240fc 100644 --- a/modules/core/cs_clearusers.cpp +++ b/modules/core/cs_clearusers.cpp @@ -18,6 +18,7 @@ class CommandCSClearUsers : public Command public: CommandCSClearUsers() : Command("CLEARUSERS", 1, 1) { + this->SetDesc("Tells ChanServ to clear (kick) all users on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -64,11 +65,6 @@ class CommandCSClearUsers : public Command { SyntaxError(source, "CLEAR", _("CLEARUSERS \037channel\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" CLEARUSERS Tells ChanServ to clear (kick) all users on a channel")); - } }; class CSClearUsers : public Module diff --git a/modules/core/cs_clone.cpp b/modules/core/cs_clone.cpp index 9222819fe..2e0759807 100644 --- a/modules/core/cs_clone.cpp +++ b/modules/core/cs_clone.cpp @@ -18,6 +18,7 @@ class CommandCSClone : public Command public: CommandCSClone() : Command("CLONE", 2, 3) { + this->SetDesc("Copy all settings from one channel to another"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -164,11 +165,6 @@ public: { SyntaxError(source, "CLONE", _("CLONE \037channel\037 \037target\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" CLONE Copy all settings from one channel to another")); - } }; class CSClone : public Module diff --git a/modules/core/cs_drop.cpp b/modules/core/cs_drop.cpp index af01b9726..3b10a95f8 100644 --- a/modules/core/cs_drop.cpp +++ b/modules/core/cs_drop.cpp @@ -20,6 +20,7 @@ class CommandCSDrop : public Command { this->SetFlag(CFLAG_ALLOW_FORBIDDEN); this->SetFlag(CFLAG_ALLOW_SUSPENDED); + this->SetDesc("Cancel the registration of a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -99,11 +100,6 @@ class CommandCSDrop : public Command { SyntaxError(source, "DROP", _("DROP \037channel\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DROP Cancel the registration of a channel")); - } }; class CSDrop : public Module diff --git a/modules/core/cs_forbid.cpp b/modules/core/cs_forbid.cpp index 3fc054a73..d4dc42c68 100644 --- a/modules/core/cs_forbid.cpp +++ b/modules/core/cs_forbid.cpp @@ -19,6 +19,7 @@ class CommandCSForbid : public Command CommandCSForbid() : Command("FORBID", 1, 2, "chanserv/forbid") { this->SetFlag(CFLAG_ALLOW_UNREGISTEREDCHANNEL); + this->SetDesc("Prevent a channel from being used"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -110,11 +111,6 @@ class CommandCSForbid : public Command { SyntaxError(source, "FORBID", _("FORBID \037channel\037 [\037reason\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" FORBID Prevent a channel from being used")); - } }; class CSForbid : public Module diff --git a/modules/core/cs_getkey.cpp b/modules/core/cs_getkey.cpp index 0842d2caf..a5a84616c 100644 --- a/modules/core/cs_getkey.cpp +++ b/modules/core/cs_getkey.cpp @@ -18,6 +18,7 @@ class CommandCSGetKey : public Command public: CommandCSGetKey() : Command("GETKEY", 1, 1) { + this->SetDesc("Returns the key of the given channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -59,11 +60,6 @@ class CommandCSGetKey : public Command { SyntaxError(source, "GETKEY", _("GETKEY \037channel\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" GETKEY Returns the key of the given channel")); - } }; class CSGetKey : public Module diff --git a/modules/core/cs_info.cpp b/modules/core/cs_info.cpp index b7b4ffacd..6ba34f3a5 100644 --- a/modules/core/cs_info.cpp +++ b/modules/core/cs_info.cpp @@ -32,6 +32,7 @@ class CommandCSInfo : public Command this->SetFlag(CFLAG_ALLOW_UNREGISTERED); this->SetFlag(CFLAG_ALLOW_SUSPENDED); this->SetFlag(CFLAG_ALLOW_FORBIDDEN); + this->SetDesc("Lists information about the named registered channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -129,11 +130,6 @@ class CommandCSInfo : public Command { SyntaxError(source, "INFO", _("INFO \037channel\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" INFO Lists information about the named registered channel")); - } }; class CSInfo : public Module diff --git a/modules/core/cs_invite.cpp b/modules/core/cs_invite.cpp index 5b588824b..986d5c5ea 100644 --- a/modules/core/cs_invite.cpp +++ b/modules/core/cs_invite.cpp @@ -18,6 +18,7 @@ class CommandCSInvite : public Command public: CommandCSInvite() : Command("INVITE", 1, 3) { + this->SetDesc("Tells ChanServ to invite you into a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -83,11 +84,6 @@ class CommandCSInvite : public Command { SyntaxError(source, "INVITE", _("INVITE \037channel\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" INVITE Tells ChanServ to invite you into a channel")); - } }; class CSInvite : public Module diff --git a/modules/core/cs_kick.cpp b/modules/core/cs_kick.cpp index 5f89d6b16..3e37b4b41 100644 --- a/modules/core/cs_kick.cpp +++ b/modules/core/cs_kick.cpp @@ -18,6 +18,7 @@ class CommandCSKick : public Command public: CommandCSKick() : Command("KICK", 2, 3) { + this->SetDesc("Kicks a selected nick from a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -75,11 +76,6 @@ class CommandCSKick : public Command { SyntaxError(source, "KICK", _("KICK \037#channel\037 \037nick\037 [\037reason\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" KICK Kicks a selected nick from a channel")); - } }; class CSKick : public Module diff --git a/modules/core/cs_list.cpp b/modules/core/cs_list.cpp index bc1a8f47a..a330b5edd 100644 --- a/modules/core/cs_list.cpp +++ b/modules/core/cs_list.cpp @@ -16,10 +16,11 @@ class CommandCSList : public Command { -public: + public: CommandCSList() : Command("LIST", 1, 2) { this->SetFlag(CFLAG_STRIP_CHANNEL); + this->SetDesc("Lists all registered channels matching the given pattern"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -134,11 +135,6 @@ public: { SyntaxError(source, "LIST", LanguageString::NICK_LIST_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" LIST Lists all registered channels matching the given pattern")); - } }; class CSList : public Module diff --git a/modules/core/cs_mode.cpp b/modules/core/cs_mode.cpp index dce1d4206..a295c6d3d 100644 --- a/modules/core/cs_mode.cpp +++ b/modules/core/cs_mode.cpp @@ -255,6 +255,7 @@ class CommandCSMode : public Command public: CommandCSMode() : Command("MODE", 3, 4) { + this->SetDesc("Control modes and mode locks on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -306,11 +307,6 @@ class CommandCSMode : public Command { SyntaxError(source, "MODE", _("MODE \037channel\037 {LOCK|SET} [\037modes\037 | {ADD|DEL|LIST} [\037what\037]]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" MODE Control modes and mode locks on a channel")); - } }; class CSMode : public Module diff --git a/modules/core/cs_modes.cpp b/modules/core/cs_modes.cpp index 91748b941..b7ddc3971 100644 --- a/modules/core/cs_modes.cpp +++ b/modules/core/cs_modes.cpp @@ -90,6 +90,7 @@ class CommandCSOp : public CommandModeBase public: CommandCSOp() : CommandModeBase("OP") { + this->SetDesc("Gives Op status to a selected nick on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -116,11 +117,6 @@ class CommandCSOp : public CommandModeBase { SyntaxError(source, "OP", _("OP [\037#channel\037] [\037nick\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" OP Gives Op status to a selected nick on a channel")); - } }; class CommandCSDeOp : public CommandModeBase @@ -128,6 +124,7 @@ class CommandCSDeOp : public CommandModeBase public: CommandCSDeOp() : CommandModeBase("DEOP") { + this->SetDesc("Deops a selected nick on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -154,11 +151,6 @@ class CommandCSDeOp : public CommandModeBase { SyntaxError(source, "DEOP", _("DEOP [\037#channel\037] [\037nick\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DEOP Deops a selected nick on a channel")); - } }; class CommandCSVoice : public CommandModeBase @@ -166,6 +158,7 @@ class CommandCSVoice : public CommandModeBase public: CommandCSVoice() : CommandModeBase("VOICE") { + this->SetDesc("Voices a selected nick on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -193,11 +186,6 @@ class CommandCSVoice : public CommandModeBase { SyntaxError(source, "VOICE", _("VOICE [\037#channel\037] [\037nick\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" VOICE Voices a selected nick on a channel")); - } }; class CommandCSDeVoice : public CommandModeBase @@ -205,6 +193,7 @@ class CommandCSDeVoice : public CommandModeBase public: CommandCSDeVoice() : CommandModeBase("DEVOICE") { + this->SetDesc("Devoices a selected nick on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -232,11 +221,6 @@ class CommandCSDeVoice : public CommandModeBase { SyntaxError(source, "DEVOICE", _("DEVOICE [\037#channel\037] [\037nick\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DEVOICE Devoices a selected nick on a channel")); - } }; class CommandCSHalfOp : public CommandModeBase @@ -244,6 +228,7 @@ class CommandCSHalfOp : public CommandModeBase public: CommandCSHalfOp() : CommandModeBase("HALFOP") { + this->SetDesc("Halfops a selected nick on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -273,11 +258,6 @@ class CommandCSHalfOp : public CommandModeBase { SyntaxError(source, "HALFOP", _("HALFOP [\037#channel\037] [\037nick\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" HALFOP Halfops a selected nick on a channel")); - } }; class CommandCSDeHalfOp : public CommandModeBase @@ -285,6 +265,7 @@ class CommandCSDeHalfOp : public CommandModeBase public: CommandCSDeHalfOp() : CommandModeBase("DEHALFOP") { + this->SetDesc("Dehalfops a selected nick on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -315,11 +296,6 @@ class CommandCSDeHalfOp : public CommandModeBase { SyntaxError(source, "DEHALFOP", _("DEHALFOP [\037#channel\037] [\037nick\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DEHALFOP Dehalfops a selected nick on a channel")); - } }; class CommandCSProtect : public CommandModeBase @@ -327,6 +303,7 @@ class CommandCSProtect : public CommandModeBase public: CommandCSProtect() : CommandModeBase("PROTECT") { + this->SetDesc("Protects a selected nick on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -356,11 +333,6 @@ class CommandCSProtect : public CommandModeBase { SyntaxError(source, "PROTECT", _("PROTECT [\037#channel\037] [\037nick\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" PROTECT Protects a selected nick on a channel")); - } }; class CommandCSDeProtect : public CommandModeBase @@ -368,6 +340,7 @@ class CommandCSDeProtect : public CommandModeBase public: CommandCSDeProtect() : CommandModeBase("DEPROTECT") { + this->SetDesc("Deprotects a selected nick on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -396,11 +369,6 @@ class CommandCSDeProtect : public CommandModeBase { SyntaxError(source, "DEPROTECT", _("DEROTECT [\037#channel\037] [\037nick\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DEPROTECT Deprotects a selected nick on a channel")); - } }; class CommandCSOwner : public CommandModeBase @@ -408,6 +376,7 @@ class CommandCSOwner : public CommandModeBase public: CommandCSOwner() : CommandModeBase("OWNER") { + this->SetDesc("Gives you owner status on channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -436,11 +405,6 @@ class CommandCSOwner : public CommandModeBase { SyntaxError(source, "OWNER", _("OWNER [\037#channel\037] [\037nick\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" OWNER Gives you owner status on channel")); - } }; class CommandCSDeOwner : public CommandModeBase @@ -448,6 +412,7 @@ class CommandCSDeOwner : public CommandModeBase public: CommandCSDeOwner() : CommandModeBase("DEOWNER") { + this->SetDesc("Removes your owner status on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -476,11 +441,6 @@ class CommandCSDeOwner : public CommandModeBase { SyntaxError(source, "DEOWNER", _("DEOWNER [\037#channel\037] [\037nick\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DEOWNER Removes your owner status on a channel")); - } }; class CSModes : public Module diff --git a/modules/core/cs_register.cpp b/modules/core/cs_register.cpp index 8968be739..ebcc76811 100644 --- a/modules/core/cs_register.cpp +++ b/modules/core/cs_register.cpp @@ -19,12 +19,13 @@ class CommandCSRegister : public Command CommandCSRegister() : Command("REGISTER", 2, 2) { this->SetFlag(CFLAG_ALLOW_UNREGISTEREDCHANNEL); + this->SetDesc("Register a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) { const Anope::string &chan = params[0]; - const Anope::string &desc = params[1]; + const Anope::string &chdesc = params[1]; User *u = source.u; ChannelInfo *ci = source.ci; @@ -52,7 +53,7 @@ class CommandCSRegister : public Command { ci = new ChannelInfo(chan); ci->founder = u->Account(); - ci->desc = desc; + ci->desc = chdesc; if (c && !c->topic.empty()) { @@ -126,11 +127,6 @@ class CommandCSRegister : public Command { SyntaxError(source, "REGISTER", _("REGISTER \037channel\037 \037description\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" REGISTER Register a channel")); - } }; class CSRegister : public Module diff --git a/modules/core/cs_saset.cpp b/modules/core/cs_saset.cpp index 6dcec0f56..50a6f0bc9 100644 --- a/modules/core/cs_saset.cpp +++ b/modules/core/cs_saset.cpp @@ -21,6 +21,7 @@ class CommandCSSASet : public Command public: CommandCSSASet() : Command("SASET", 2, 3) { + this->SetDesc("Forcefully set channel options and information"); } ~CommandCSSASet() @@ -97,11 +98,6 @@ class CommandCSSASet : public Command SyntaxError(source, "SASET", LanguageString::CHAN_SASET_SYNTAX); } - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SASET Forcefully set channel options and information")); - } - bool AddSubcommand(Module *creator, Command *c) { c->module = creator; diff --git a/modules/core/cs_saset_noexpire.cpp b/modules/core/cs_saset_noexpire.cpp index 0c769ad08..5edf0f3c2 100644 --- a/modules/core/cs_saset_noexpire.cpp +++ b/modules/core/cs_saset_noexpire.cpp @@ -18,6 +18,7 @@ class CommandCSSASetNoexpire : public Command public: CommandCSSASetNoexpire() : Command("NOEXPIRE", 2, 2, "chanserv/saset/noexpire") { + this->SetDesc("Prevent the channel from expiring"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -55,11 +56,6 @@ class CommandCSSASetNoexpire : public Command { SyntaxError(source, "SET NOEXPIRE", _("SET \037channel\037 NOEXPIRE {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" NOEXPIRE Prevent the channel from expiring")); - } }; class CSSetNoexpire : public Module diff --git a/modules/core/cs_set.cpp b/modules/core/cs_set.cpp index 560a5a1e2..55817d219 100644 --- a/modules/core/cs_set.cpp +++ b/modules/core/cs_set.cpp @@ -21,6 +21,7 @@ class CommandCSSet : public Command public: CommandCSSet() : Command("SET", 2, 3) { + this->SetDesc("Set channel options and information"); } ~CommandCSSet() @@ -101,11 +102,6 @@ class CommandCSSet : public Command SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX); } - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SET Set channel options and information")); - } - bool AddSubcommand(Module *creator, Command *c) { c->module = creator; diff --git a/modules/core/cs_set_bantype.cpp b/modules/core/cs_set_bantype.cpp index 01c07148f..d509bffe9 100644 --- a/modules/core/cs_set_bantype.cpp +++ b/modules/core/cs_set_bantype.cpp @@ -18,6 +18,7 @@ class CommandCSSetBanType : public Command public: CommandCSSetBanType(const Anope::string &cpermission = "") : Command("BANTYPE", 2, 2, cpermission) { + this->SetDesc("Set how Services make bans on the channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -60,11 +61,6 @@ class CommandCSSetBanType : public Command // XXX SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" BANTYPE Set how Services make bans on the channel")); - } }; class CommandCSSASetBanType : public CommandCSSetBanType diff --git a/modules/core/cs_set_description.cpp b/modules/core/cs_set_description.cpp index aee4144d9..c0a7a5093 100644 --- a/modules/core/cs_set_description.cpp +++ b/modules/core/cs_set_description.cpp @@ -18,6 +18,7 @@ class CommandCSSetDescription : public Command public: CommandCSSetDescription(const Anope::string &cpermission = "") : Command("DESC", 2, 2, cpermission) { + this->SetDesc("Set the channel description"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -47,11 +48,6 @@ class CommandCSSetDescription : public Command // XXX SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DESC Set the channel description")); - } }; class CommandCSSASetDescription : public CommandCSSetDescription diff --git a/modules/core/cs_set_founder.cpp b/modules/core/cs_set_founder.cpp index 130117ff4..a9ba31291 100644 --- a/modules/core/cs_set_founder.cpp +++ b/modules/core/cs_set_founder.cpp @@ -18,6 +18,7 @@ class CommandCSSetFounder : public Command public: CommandCSSetFounder(const Anope::string &cpermission = "") : Command("FOUNDER", 2, 2, cpermission) { + this->SetDesc("Set the founder of a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -83,11 +84,6 @@ class CommandCSSetFounder : public Command // XXX SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" FOUNDER Set the founder of a channel")); - } }; class CommandCSSASetFounder : public CommandCSSetFounder diff --git a/modules/core/cs_set_keeptopic.cpp b/modules/core/cs_set_keeptopic.cpp index 3d697e499..cde54b1e0 100644 --- a/modules/core/cs_set_keeptopic.cpp +++ b/modules/core/cs_set_keeptopic.cpp @@ -18,6 +18,7 @@ class CommandCSSetKeepTopic : public Command public: CommandCSSetKeepTopic(const Anope::string &cpermission = "") : Command("KEEPTOPIC", 2, 2, cpermission) { + this->SetDesc("Retain topic when channel is not in use"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -58,11 +59,6 @@ class CommandCSSetKeepTopic : public Command { SyntaxError(source, "SET KEEPTOPIC", _("SET \037channel\037 KEEPTOPIC {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" KEEPTOPIC Retain topic when channel is not in use")); - } }; class CommandCSSASetKeepTopic : public CommandCSSetKeepTopic diff --git a/modules/core/cs_set_opnotice.cpp b/modules/core/cs_set_opnotice.cpp index 535001919..b001a69be 100644 --- a/modules/core/cs_set_opnotice.cpp +++ b/modules/core/cs_set_opnotice.cpp @@ -18,6 +18,7 @@ class CommandCSSetOpNotice : public Command public: CommandCSSetOpNotice(const Anope::string &cpermission = "") : Command("OPNOTICE", 2, 2, cpermission) { + this->SetDesc("Send a notice when OP/DEOP commands are used"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -57,11 +58,6 @@ class CommandCSSetOpNotice : public Command { SyntaxError(source, "SET OPNOTICE", _("SET \037channel\037 OPNOTICE {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" OPNOTICE Send a notice when OP/DEOP commands are used")); - } }; class CommandCSSASetOpNotice : public CommandCSSetOpNotice diff --git a/modules/core/cs_set_peace.cpp b/modules/core/cs_set_peace.cpp index 11cf545a1..321b297bd 100644 --- a/modules/core/cs_set_peace.cpp +++ b/modules/core/cs_set_peace.cpp @@ -18,6 +18,7 @@ class CommandCSSetPeace : public Command public: CommandCSSetPeace(const Anope::string &cpermission = "") : Command("PEACE", 2, 2, cpermission) { + this->SetDesc("Regulate the use of critical commands"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -57,11 +58,6 @@ class CommandCSSetPeace : public Command { SyntaxError(source, "SET PEACE", _("SET \037channel\037 PEACE {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" PEACE Regulate the use of critical commands"), "SET"); - } }; class CommandCSSASetPeace : public CommandCSSetPeace diff --git a/modules/core/cs_set_persist.cpp b/modules/core/cs_set_persist.cpp index 0c3ef2b97..5abc9d528 100644 --- a/modules/core/cs_set_persist.cpp +++ b/modules/core/cs_set_persist.cpp @@ -18,6 +18,7 @@ class CommandCSSetPersist : public Command public: CommandCSSetPersist(const Anope::string &cpermission = "") : Command("PERSIST", 2, 2, cpermission) { + this->SetDesc("Set the channel as permanent"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -129,11 +130,6 @@ class CommandCSSetPersist : public Command { SyntaxError(source, "SET PERSIST", _("SET \037channel\037 PERSIST {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" PERSIST Set the channel as permanent")); - } }; class CommandCSSASetPersist : public CommandCSSetPersist diff --git a/modules/core/cs_set_private.cpp b/modules/core/cs_set_private.cpp index 1f8f98fdc..a7c891597 100644 --- a/modules/core/cs_set_private.cpp +++ b/modules/core/cs_set_private.cpp @@ -18,6 +18,7 @@ class CommandCSSetPrivate : public Command public: CommandCSSetPrivate(const Anope::string &cpermission = "") : Command("PRIVATE", 2, 2, cpermission) { + this->SetDesc("Hide channel from LIST command"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -56,11 +57,6 @@ class CommandCSSetPrivate : public Command { SyntaxError(source, "SET PRIVATE", _("SET \037channel\037 PRIVATE {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" PRIVATE Hide channel from LIST command")); - } }; class CommandCSSASetPrivate : public CommandCSSetPrivate diff --git a/modules/core/cs_set_restricted.cpp b/modules/core/cs_set_restricted.cpp index 646a42241..e294b0552 100644 --- a/modules/core/cs_set_restricted.cpp +++ b/modules/core/cs_set_restricted.cpp @@ -17,6 +17,7 @@ class CommandCSSetRestricted : public Command public: CommandCSSetRestricted(const Anope::string &cpermission = "") : Command("RESTRICTED", 2, 2, cpermission) { + this->SetDesc("Restrict access to the channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -59,11 +60,6 @@ class CommandCSSetRestricted : public Command { SyntaxError(source, "SET RESTRICTED", _("SET \037channel\037 RESTRICTED {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" RESTRICTED Restrict access to the channel")); - } }; class CommandCSSASetRestricted : public CommandCSSetRestricted diff --git a/modules/core/cs_set_secure.cpp b/modules/core/cs_set_secure.cpp index 1aea9f887..4a5867617 100644 --- a/modules/core/cs_set_secure.cpp +++ b/modules/core/cs_set_secure.cpp @@ -18,6 +18,7 @@ class CommandCSSetSecure : public Command public: CommandCSSetSecure(const Anope::string &cpermission = "") : Command("SECURE", 2, 2, cpermission) { + this->SetDesc("Activate " + ChanServ->nick + "'s security features"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -58,11 +59,6 @@ class CommandCSSetSecure : public Command { SyntaxError(source, "SET SECURE", _("SET \037channel\037 SECURE {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SECURE Activate %s security features"), ChanServ->nick.c_str()); - } }; class CommandCSSASetSecure : public CommandCSSetSecure diff --git a/modules/core/cs_set_securefounder.cpp b/modules/core/cs_set_securefounder.cpp index 85c587adf..c90d7d20c 100644 --- a/modules/core/cs_set_securefounder.cpp +++ b/modules/core/cs_set_securefounder.cpp @@ -18,6 +18,7 @@ class CommandCSSetSecureFounder : public Command public: CommandCSSetSecureFounder(const Anope::string &cpermission = "") : Command("SECUREFOUNDER", 2, 2, cpermission) { + this->SetDesc("Stricter control of channel founder status"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -65,11 +66,6 @@ class CommandCSSetSecureFounder : public Command { SyntaxError(source, "SET SECUREFOUNDER", _("SET \037channel\037 SECUREFOUNDER {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SECUREFOUNDER Stricter control of channel founder status")); - } }; class CommandCSSASetSecureFounder : public CommandCSSetSecureFounder diff --git a/modules/core/cs_set_secureops.cpp b/modules/core/cs_set_secureops.cpp index d4e8f5e22..672e1aea0 100644 --- a/modules/core/cs_set_secureops.cpp +++ b/modules/core/cs_set_secureops.cpp @@ -18,6 +18,7 @@ class CommandCSSetSecureOps : public Command public: CommandCSSetSecureOps(const Anope::string &cpermission = "") : Command("SECUREOPS", 2, 2, cpermission) { + this->SetDesc("Stricter control of chanop status"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -56,11 +57,6 @@ class CommandCSSetSecureOps : public Command { SyntaxError(source, "SET SECUREOPS", _("SET \037channel\037 SECUREOPS {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SECUREOPS Stricter control of chanop status")); - } }; class CommandCSSASetSecureOps : public CommandCSSetSecureOps diff --git a/modules/core/cs_set_signkick.cpp b/modules/core/cs_set_signkick.cpp index a3b0e0ea3..6ddd292b9 100644 --- a/modules/core/cs_set_signkick.cpp +++ b/modules/core/cs_set_signkick.cpp @@ -18,6 +18,7 @@ class CommandCSSetSignKick : public Command public: CommandCSSetSignKick(const Anope::string &cpermission = "") : Command("SIGNKICK", 2, 2, cpermission) { + this->SetDesc("Sign kicks that are done with KICK command"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -71,11 +72,6 @@ class CommandCSSetSignKick : public Command { SyntaxError(source, "SET SIGNKICK", _("SET \037channel\037 SIGNKICK {ON | LEVEL | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SIGNKICK Sign kicks that are done with KICK command")); - } }; class CommandCSSASetSignKick : public CommandCSSetSignKick diff --git a/modules/core/cs_set_successor.cpp b/modules/core/cs_set_successor.cpp index 38a885830..ad0b57fea 100644 --- a/modules/core/cs_set_successor.cpp +++ b/modules/core/cs_set_successor.cpp @@ -18,6 +18,7 @@ class CommandCSSetSuccessor : public Command public: CommandCSSetSuccessor(const Anope::string &cpermission = "") : Command("SUCCESSOR", 1, 2, cpermission) { + this->SetDesc("Set the successor for a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -90,11 +91,6 @@ class CommandCSSetSuccessor : public Command // XXX SyntaxError(source, "SET", LanguageString::CHAN_SET_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SUCCESSOR Set the successor for a channel")); - } }; class CommandCSSASetSuccessor : public CommandCSSetSuccessor diff --git a/modules/core/cs_set_topiclock.cpp b/modules/core/cs_set_topiclock.cpp index 5ffb05b1d..e943d190b 100644 --- a/modules/core/cs_set_topiclock.cpp +++ b/modules/core/cs_set_topiclock.cpp @@ -18,6 +18,7 @@ class CommandCSSetTopicLock : public Command public: CommandCSSetTopicLock(const Anope::string &cpermission = "") : Command("TOPICLOCK", 2, 2, cpermission) { + this->SetDesc("Topic can only be changed with TOPIC"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -57,11 +58,6 @@ class CommandCSSetTopicLock : public Command { SyntaxError(source, "SET", _("SET \037channel\037 TOPICLOCK {ON | OFF}"));; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" TOPICLOCK Topic can only be changed with TOPIC")); - } }; class CommandCSSASetTopicLock : public CommandCSSetTopicLock diff --git a/modules/core/cs_set_xop.cpp b/modules/core/cs_set_xop.cpp index 4829b2e45..dbb5731f2 100644 --- a/modules/core/cs_set_xop.cpp +++ b/modules/core/cs_set_xop.cpp @@ -19,6 +19,7 @@ class CommandCSSetXOP : public Command public: CommandCSSetXOP(const Anope::string &cpermission = "") : Command("XOP", 2, 2, cpermission) { + this->SetDesc("Toggle the user privilege system"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -111,11 +112,6 @@ class CommandCSSetXOP : public Command { SyntaxError(source, "SET XOP", _("SET \037channel\037 XOP {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" XOP Toggle the user privilege system")); - } }; class CommandCSSASetXOP : public CommandCSSetXOP diff --git a/modules/core/cs_status.cpp b/modules/core/cs_status.cpp index d1c469022..84c9e4a82 100644 --- a/modules/core/cs_status.cpp +++ b/modules/core/cs_status.cpp @@ -18,6 +18,7 @@ class CommandCSStatus : public Command public: CommandCSStatus() : Command("STATUS", 2, 2, "chanserv/status") { + this->SetDesc("Returns the current access level of a user on a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -53,11 +54,6 @@ class CommandCSStatus : public Command { SyntaxError(source, "STATUS", _("STATUS \037channel\037 \037item\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" STATUS Returns the current access level of a user on a channel")); - } }; class CSStatus : public Module diff --git a/modules/core/cs_suspend.cpp b/modules/core/cs_suspend.cpp index 9b4a06272..bce98c205 100644 --- a/modules/core/cs_suspend.cpp +++ b/modules/core/cs_suspend.cpp @@ -17,7 +17,8 @@ class CommandCSSuspend : public Command { public: CommandCSSuspend() : Command("SUSPEND", 1, 2, "chanserv/suspend") - { + { + this->SetDesc("Prevent a channel from being used preserving channel data and settings"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -90,13 +91,6 @@ class CommandCSSuspend : public Command { SyntaxError(source, "SUSPEND", Config->ForceForbidReason ? _("SUSPEND \037channel\037 \037reason\037") : _("SUSPEND \037channel\037 \037freason\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SUSPEND Prevent a channel from being used preserving\n" - " channel data and settings")); - - } }; class CommandCSUnSuspend : public Command @@ -105,6 +99,7 @@ class CommandCSUnSuspend : public Command CommandCSUnSuspend() : Command("UNSUSPEND", 1, 1, "chanserv/suspend") { this->SetFlag(CFLAG_ALLOW_SUSPENDED); + this->SetDesc("Releases a suspended channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -151,11 +146,6 @@ class CommandCSUnSuspend : public Command { SyntaxError(source, "UNSUSPEND", _("UNSUSPEND \037channel\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" UNSUSPEND Releases a suspended channel")); - } }; class CSSuspend : public Module diff --git a/modules/core/cs_topic.cpp b/modules/core/cs_topic.cpp index 47c2b4aae..a470713d4 100644 --- a/modules/core/cs_topic.cpp +++ b/modules/core/cs_topic.cpp @@ -18,6 +18,7 @@ class CommandCSTopic : public Command public: CommandCSTopic() : Command("TOPIC", 1, 2) { + this->SetDesc("Manipulate the topic of the specified channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -65,11 +66,6 @@ class CommandCSTopic : public Command { SyntaxError(source, "TOPIC", _("TOPIC \037channel\037 [\037topic\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" TOPIC Manipulate the topic of the specified channel")); - } }; class CSTopic : public Module diff --git a/modules/core/cs_unban.cpp b/modules/core/cs_unban.cpp index 91db12350..32f88b8bd 100644 --- a/modules/core/cs_unban.cpp +++ b/modules/core/cs_unban.cpp @@ -18,6 +18,7 @@ class CommandCSUnban : public Command public: CommandCSUnban() : Command("UNBAN", 1, 2) { + this->SetDesc("Remove all bans preventing a user from entering a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -73,11 +74,6 @@ class CommandCSUnban : public Command { SyntaxError(source, "UNBAN", _("UNBAN \037channel\037 [\037nick\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" UNBAN Remove all bans preventing a user from entering a channel")); - } }; class CSUnban : public Module diff --git a/modules/core/cs_xop.cpp b/modules/core/cs_xop.cpp index 0df9713db..066e19471 100644 --- a/modules/core/cs_xop.cpp +++ b/modules/core/cs_xop.cpp @@ -396,8 +396,6 @@ class XOPBase : public Command virtual bool OnHelp(CommandSource &source, const Anope::string &subcommand) = 0; virtual void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) = 0; - - virtual void OnServHelp(CommandSource &source) = 0; }; class CommandCSQOP : public XOPBase @@ -405,6 +403,7 @@ class CommandCSQOP : public XOPBase public: CommandCSQOP() : XOPBase("QOP") { + this->SetDesc("Modify the list of QOP users"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -458,11 +457,6 @@ class CommandCSQOP : public XOPBase { SyntaxError(source, "QOP", _("QOP \037channel\037 {ADD|DEL|LIST|CLEAR} [\037nick\037 | \037entry-list\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" QOP Modify the list of QOP users")); - } }; class CommandCSAOP : public XOPBase @@ -470,6 +464,7 @@ class CommandCSAOP : public XOPBase public: CommandCSAOP() : XOPBase("AOP") { + this->SetDesc("Modify the list of AOP users"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -517,7 +512,6 @@ class CommandCSAOP : public XOPBase "\002%R%s HELP ACCESS\002 for information about the access list,\n" "and \002%R%s HELP SET XOP\002 to know how to toggle between \n" "the access list and xOP list systems."), ChanServ->nick.c_str(), ChanServ->nick.c_str()); - /* CHAN_HELP_HOP */ return true; } @@ -525,11 +519,6 @@ class CommandCSAOP : public XOPBase { SyntaxError(source, "AOP", _("AOP \037channel\037 {ADD|DEL|LIST|CLEAR} [\037nick\037 | \037entry-list\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" AOP Modify the list of AOP users")); - } }; class CommandCSHOP : public XOPBase @@ -537,6 +526,7 @@ class CommandCSHOP : public XOPBase public: CommandCSHOP() : XOPBase("HOP") { + this->SetDesc("Maintains the HOP (HalfOP) list for a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -589,11 +579,6 @@ class CommandCSHOP : public XOPBase { SyntaxError(source, "HOP", _("HOP \037channel\037 {ADD|DEL|LIST|CLEAR} [\037nick\037 | \037entry-list\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" HOP Maintains the HOP (HalfOP) list for a channel")); - } }; class CommandCSSOP : public XOPBase @@ -601,6 +586,7 @@ class CommandCSSOP : public XOPBase public: CommandCSSOP() : XOPBase("SOP") { + this->SetDesc("Modify the list of SOP users"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -654,11 +640,6 @@ class CommandCSSOP : public XOPBase { SyntaxError(source, "SOP", _("SOP \037channel\037 {ADD|DEL|LIST|CLEAR} [\037nick\037 | \037entry-list\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SOP Modify the list of SOP users")); - } }; class CommandCSVOP : public XOPBase @@ -666,6 +647,7 @@ class CommandCSVOP : public XOPBase public: CommandCSVOP() : XOPBase("VOP") { + this->SetDesc("Maintains the VOP (VOicePeople) list for a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -718,11 +700,6 @@ class CommandCSVOP : public XOPBase { SyntaxError(source, "VOP", _("VOP \037channel\037 {ADD|DEL|LIST|CLEAR} [\037nick\037 | \037entry-list\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" VOP Maintains the VOP (VOicePeople) list for a channel")); - } }; class CSXOP : public Module diff --git a/modules/core/hs_del.cpp b/modules/core/hs_del.cpp index 627680119..1503ca014 100644 --- a/modules/core/hs_del.cpp +++ b/modules/core/hs_del.cpp @@ -18,6 +18,7 @@ class CommandHSDel : public Command public: CommandHSDel() : Command("DEL", 1, 1, "hostserv/del") { + this->SetDesc("Delete the vhost of another user"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -55,11 +56,6 @@ class CommandHSDel : public Command { SyntaxError(source, "DEL", _("DEL \002<nick>\002.")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DEL Delete the vhost of another user")); - } }; class HSDel : public Module diff --git a/modules/core/hs_delall.cpp b/modules/core/hs_delall.cpp index 03455a146..c641f05b2 100644 --- a/modules/core/hs_delall.cpp +++ b/modules/core/hs_delall.cpp @@ -18,6 +18,7 @@ class CommandHSDelAll : public Command public: CommandHSDelAll() : Command("DELALL", 1, 1, "hostserv/del") { + this->SetDesc("Delete the vhost for all nicks in a group"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -60,11 +61,6 @@ class CommandHSDelAll : public Command { SyntaxError(source, "DELALL", _("DELALL <nick>\002.")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DELALL Delete the vhost for all nicks in a group")); - } }; class HSDelAll : public Module diff --git a/modules/core/hs_group.cpp b/modules/core/hs_group.cpp index abcb82e72..270ea8bfe 100644 --- a/modules/core/hs_group.cpp +++ b/modules/core/hs_group.cpp @@ -18,6 +18,7 @@ class CommandHSGroup : public Command public: CommandHSGroup() : Command("GROUP", 0, 0) { + this->SetDesc("Syncs the vhost for all nicks in a group"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -47,11 +48,6 @@ class CommandHSGroup : public Command "group.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" GROUP Syncs the vhost for all nicks in a group")); - } }; class HSGroup : public Module diff --git a/modules/core/hs_list.cpp b/modules/core/hs_list.cpp index 585e0d7f9..4bc9bbd91 100644 --- a/modules/core/hs_list.cpp +++ b/modules/core/hs_list.cpp @@ -18,6 +18,7 @@ class CommandHSList : public Command public: CommandHSList() : Command("LIST", 0, 1, "hostserv/list") { + this->SetDesc("Displays one or more vhost entries."); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -115,11 +116,6 @@ class CommandHSList : public Command "number of items to display to a operator at any 1 time.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" LIST Displays one or more vhost entries.")); - } }; class HSList : public Module diff --git a/modules/core/hs_off.cpp b/modules/core/hs_off.cpp index d61beca1f..6459c81ee 100644 --- a/modules/core/hs_off.cpp +++ b/modules/core/hs_off.cpp @@ -18,6 +18,7 @@ class CommandHSOff : public Command public: CommandHSOff() : Command("OFF", 0, 0) { + this->SetDesc("Deactivates your assigned vhost"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -45,11 +46,6 @@ class CommandHSOff : public Command "on you will see your real IP address.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" OFF Deactivates your assigned vhost")); - } }; class HSOff : public Module diff --git a/modules/core/hs_on.cpp b/modules/core/hs_on.cpp index 72bdfa45b..f8a227590 100644 --- a/modules/core/hs_on.cpp +++ b/modules/core/hs_on.cpp @@ -18,6 +18,7 @@ class CommandHSOn : public Command public: CommandHSOn() : Command("ON", 0, 0) { + this->SetDesc("Activates your assigned vhost"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -55,11 +56,6 @@ class CommandHSOn : public Command "on you will see the vhost instead of your real IP address.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" ON Activates your assigned vhost")); - } }; class HSOn : public Module diff --git a/modules/core/hs_set.cpp b/modules/core/hs_set.cpp index f4fcfb58a..6dfbfbab4 100644 --- a/modules/core/hs_set.cpp +++ b/modules/core/hs_set.cpp @@ -18,6 +18,7 @@ class CommandHSSet : public Command public: CommandHSSet() : Command("SET", 2, 2, "hostserv/set") { + this->SetDesc("Set the vhost of another user"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -109,11 +110,6 @@ class CommandHSSet : public Command { SyntaxError(source, "SET", _("SET \002<nick>\002 \002<hostmask>\002.")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SET Set the vhost of another user")); - } }; class HSSet : public Module diff --git a/modules/core/hs_setall.cpp b/modules/core/hs_setall.cpp index c5c2d777d..20d160b9d 100644 --- a/modules/core/hs_setall.cpp +++ b/modules/core/hs_setall.cpp @@ -18,6 +18,7 @@ class CommandHSSetAll : public Command public: CommandHSSetAll() : Command("SETALL", 2, 2, "hostserv/set") { + this->SetDesc("Set the vhost for all nicks in a group"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -116,11 +117,6 @@ class CommandHSSetAll : public Command { SyntaxError(source, "SETALL", _("SETALL \002<nick>\002 \002<hostmask>\002.")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SETALL Set the vhost for all nicks in a group")); - } }; class HSSetAll : public Module diff --git a/modules/core/ms_cancel.cpp b/modules/core/ms_cancel.cpp index dc32624a5..b143943de 100644 --- a/modules/core/ms_cancel.cpp +++ b/modules/core/ms_cancel.cpp @@ -20,6 +20,7 @@ class CommandMSCancel : public Command public: CommandMSCancel() : Command("CANCEL", 1, 1) { + this->SetDesc("Cancel last memo you sent"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -67,11 +68,6 @@ class CommandMSCancel : public Command { SyntaxError(source, "CANCEL", _("CANCEL {\037nick\037 | \037channel\037}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" CANCEL Cancel last memo you sent")); - } }; class MSCancel : public Module diff --git a/modules/core/ms_check.cpp b/modules/core/ms_check.cpp index 60e1d7182..f06055a75 100644 --- a/modules/core/ms_check.cpp +++ b/modules/core/ms_check.cpp @@ -18,6 +18,7 @@ class CommandMSCheck : public Command public: CommandMSCheck() : Command("CHECK", 1, 1) { + this->SetDesc("Checks if last memo to a nick was read"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -79,11 +80,6 @@ class CommandMSCheck : public Command { SyntaxError(source, "CHECK", _("CHECK \037nickname\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" CHECK Checks if last memo to a nick was read")); - } }; class MSCheck : public Module diff --git a/modules/core/ms_del.cpp b/modules/core/ms_del.cpp index 668d3c418..3a06eba7f 100644 --- a/modules/core/ms_del.cpp +++ b/modules/core/ms_del.cpp @@ -43,6 +43,7 @@ class CommandMSDel : public Command public: CommandMSDel() : Command("DEL", 0, 2) { + this->SetDesc("Delete a memo or memos"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -147,11 +148,6 @@ class CommandMSDel : public Command { SyntaxError(source, "DEL", _("DEL [\037channel\037] {\037num\037 | \037list\037 | ALL}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DEL Delete a memo or memos")); - } }; class MSDel : public Module diff --git a/modules/core/ms_ignore.cpp b/modules/core/ms_ignore.cpp index 647219833..c7f083457 100644 --- a/modules/core/ms_ignore.cpp +++ b/modules/core/ms_ignore.cpp @@ -18,6 +18,7 @@ class CommandMSIgnore : public Command public: CommandMSIgnore() : Command("IGNORE", 1, 3) { + this->SetDesc("Manage your memo ignore list"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -98,11 +99,6 @@ class CommandMSIgnore : public Command { SyntaxError(source, "IGNORE", _("IGNORE [\037channel\037] {\002ADD|DEL|\002} [\037entry\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" IGNORE Manage your memo ignore list")); - } }; class MSIgnore : public Module diff --git a/modules/core/ms_info.cpp b/modules/core/ms_info.cpp index 1d34073d9..922caeb7a 100644 --- a/modules/core/ms_info.cpp +++ b/modules/core/ms_info.cpp @@ -18,6 +18,7 @@ class CommandMSInfo : public Command public: CommandMSInfo() : Command("INFO", 0, 1) { + this->SetDesc("Displays information about your memos"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -211,11 +212,6 @@ class CommandMSInfo : public Command return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" INFO Displays information about your memos")); - } }; class MSInfo : public Module diff --git a/modules/core/ms_list.cpp b/modules/core/ms_list.cpp index d00e9bd27..fa1264a83 100644 --- a/modules/core/ms_list.cpp +++ b/modules/core/ms_list.cpp @@ -55,6 +55,7 @@ class CommandMSList : public Command public: CommandMSList() : Command("LIST", 0, 2) { + this->SetDesc("List your memos"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -159,11 +160,6 @@ class CommandMSList : public Command { SyntaxError(source, "LIST", _("LIST [\037channel\037] [\037list\037 | NEW]")); } - - void OnServCommand(CommandSource &source) - { - source.Reply(_(" LIST List your memos")); - } }; class MSList : public Module diff --git a/modules/core/ms_read.cpp b/modules/core/ms_read.cpp index 181b376f1..0c9be0a61 100644 --- a/modules/core/ms_read.cpp +++ b/modules/core/ms_read.cpp @@ -51,6 +51,7 @@ class CommandMSRead : public Command public: CommandMSRead() : Command("READ", 1, 2) { + this->SetDesc("Read a memo or memos"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -144,11 +145,6 @@ class CommandMSRead : public Command { SyntaxError(source, "READ", _("READ [\037channel\037] {\037list\037 | LAST | NEW}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" READ Read a memo or memos")); - } }; class MSRead : public Module diff --git a/modules/core/ms_rsend.cpp b/modules/core/ms_rsend.cpp index 3fec2f8b7..48b908022 100644 --- a/modules/core/ms_rsend.cpp +++ b/modules/core/ms_rsend.cpp @@ -18,6 +18,7 @@ class CommandMSRSend : public Command public: CommandMSRSend() : Command("RSEND", 2, 2) { + this->SetDesc("Sends a memo and requests a read receipt"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -74,11 +75,6 @@ class CommandMSRSend : public Command { SyntaxError(source, "RSEND", _("RSEND {\037nick\037 | \037channel\037} \037memo-text\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" RSEND Sends a memo and requests a read receipt")); - } }; class MSRSend : public Module diff --git a/modules/core/ms_send.cpp b/modules/core/ms_send.cpp index f368138e6..03022a210 100644 --- a/modules/core/ms_send.cpp +++ b/modules/core/ms_send.cpp @@ -18,6 +18,7 @@ class CommandMSSend : public Command public: CommandMSSend() : Command("SEND", 2, 2) { + this->SetDesc("Send a memo to a nick or channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -43,11 +44,6 @@ class CommandMSSend : public Command { SyntaxError(source, "SEND", LanguageString::MEMO_SEND_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SEND Send a memo to a nick or channel")); - } }; class MSSend : public Module diff --git a/modules/core/ms_sendall.cpp b/modules/core/ms_sendall.cpp index 1d2a703c3..b6517b31d 100644 --- a/modules/core/ms_sendall.cpp +++ b/modules/core/ms_sendall.cpp @@ -18,6 +18,7 @@ class CommandMSSendAll : public Command public: CommandMSSendAll() : Command("SENDALL", 1, 1, "memoserv/sendall") { + this->SetDesc("Send a memo to all registered users"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -56,11 +57,6 @@ class CommandMSSendAll : public Command { SyntaxError(source, "SENDALL", _("SENDALL \037memo-text\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SENDALL Send a memo to all registered users")); - } }; class MSSendAll : public Module diff --git a/modules/core/ms_set.cpp b/modules/core/ms_set.cpp index 6fef15c2b..9899ee362 100644 --- a/modules/core/ms_set.cpp +++ b/modules/core/ms_set.cpp @@ -201,6 +201,7 @@ class CommandMSSet : public Command public: CommandMSSet() : Command("SET", 2, 5) { + this->SetDesc("Set options related to memos"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -294,11 +295,6 @@ class CommandMSSet : public Command { SyntaxError(source, "SET", LanguageString::NICK_SET_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SET Set options related to memos")); - } }; class MSSet : public Module diff --git a/modules/core/ms_staff.cpp b/modules/core/ms_staff.cpp index a1c232870..22c379151 100644 --- a/modules/core/ms_staff.cpp +++ b/modules/core/ms_staff.cpp @@ -18,6 +18,7 @@ class CommandMSStaff : public Command public: CommandMSStaff() : Command("STAFF", 1, 1, "memoserv/staff") { + this->SetDesc("Send a memo to all opers/admins"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -54,11 +55,6 @@ class CommandMSStaff : public Command { SyntaxError(source, "STAFF", _("STAFF \037memo-text\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" STAFF Send a memo to all opers/admins")); - } }; class MSStaff : public Module diff --git a/modules/core/ns_access.cpp b/modules/core/ns_access.cpp index 5f28a9271..d79f189ca 100644 --- a/modules/core/ns_access.cpp +++ b/modules/core/ns_access.cpp @@ -117,6 +117,7 @@ class CommandNSAccess : public Command public: CommandNSAccess() : Command("ACCESS", 1, 3) { + this->SetDesc("Modify the list of authorized addresses"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -179,11 +180,6 @@ class CommandNSAccess : public Command { SyntaxError(source, "ACCESS", _("ACCESS {ADD | DEL | LIST} [\037mask\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" ACCESS Modify the list of authorized addresses")); - } }; class NSAccess : public Module diff --git a/modules/core/ns_ajoin.cpp b/modules/core/ns_ajoin.cpp index db1d0f960..0b1a78fb8 100644 --- a/modules/core/ns_ajoin.cpp +++ b/modules/core/ns_ajoin.cpp @@ -73,6 +73,7 @@ class CommandNSAJoin : public Command public: CommandNSAJoin() : Command("AJOIN", 1, 3) { + this->SetDesc("Manage your auto join list"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -104,11 +105,6 @@ class CommandNSAJoin : public Command { SyntaxError(source, "AJOIN", _("AJOIN {ADD | DEL | LIST} [\037channel\037] [\037key\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" AJOIN Manage your auto join list")); - } }; class NSAJoin : public Module diff --git a/modules/core/ns_alist.cpp b/modules/core/ns_alist.cpp index 4c4fe3eca..c77d277f4 100644 --- a/modules/core/ns_alist.cpp +++ b/modules/core/ns_alist.cpp @@ -18,6 +18,7 @@ class CommandNSAList : public Command public: CommandNSAList() : Command("ALIST", 0, 2) { + this->SetDesc("List channels you have access on"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -162,11 +163,6 @@ class CommandNSAList : public Command return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" ALIST List channels you have access on")); - } }; class NSAList : public Module diff --git a/modules/core/ns_drop.cpp b/modules/core/ns_drop.cpp index 7fd85e0f9..cc407e1b2 100644 --- a/modules/core/ns_drop.cpp +++ b/modules/core/ns_drop.cpp @@ -19,6 +19,7 @@ class CommandNSDrop : public Command CommandNSDrop() : Command("DROP", 0, 1) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Cancel the registration of a nickname"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -146,11 +147,6 @@ class CommandNSDrop : public Command return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DROP Cancel the registration of a nickname")); - } }; class NSDrop : public Module diff --git a/modules/core/ns_forbid.cpp b/modules/core/ns_forbid.cpp index d88b9a9e9..15bd2ee7a 100644 --- a/modules/core/ns_forbid.cpp +++ b/modules/core/ns_forbid.cpp @@ -18,6 +18,7 @@ class CommandNSForbid : public Command public: CommandNSForbid() : Command("FORBID", 1, 2, "nickserv/forbid") { + this->SetDesc("Prevents a nickname from being registered"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -99,11 +100,6 @@ class CommandNSForbid : public Command { SyntaxError(source, "FORBID", Config->ForceForbidReason ? _("FORBID \037nickname\037 \037reason\037") : _("FORBID \037nickname\037 [\037reason\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" FORBID Prevents a nickname from being registered")); - } }; class NSForbid : public Module diff --git a/modules/core/ns_getemail.cpp b/modules/core/ns_getemail.cpp index 91a5bb2b1..3b0d69a91 100644 --- a/modules/core/ns_getemail.cpp +++ b/modules/core/ns_getemail.cpp @@ -22,6 +22,7 @@ class CommandNSGetEMail : public Command public: CommandNSGetEMail() : Command("GETEMAIL", 1, 1, "nickserv/getemail") { + this->SetDesc("Matches and returns all users that registered using given email"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -66,11 +67,6 @@ class CommandNSGetEMail : public Command { SyntaxError(source, "GETMAIL", _("GETEMAIL \002user@email-host\002 No WildCards!!")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" GETEMAIL Matches and returns all users that registered using given email")); - } }; class NSGetEMail : public Module diff --git a/modules/core/ns_getpass.cpp b/modules/core/ns_getpass.cpp index 7c6c14785..cd79512fb 100644 --- a/modules/core/ns_getpass.cpp +++ b/modules/core/ns_getpass.cpp @@ -18,6 +18,7 @@ class CommandNSGetPass : public Command public: CommandNSGetPass() : Command("GETPASS", 1, 1, "nickserv/getpass") { + this->SetDesc("Retrieve the password for a nickname"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -74,11 +75,6 @@ class CommandNSGetPass : public Command { SyntaxError(source, "GETPASS", _("GETPASS \037nickname\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" GETPASS Retrieve the password for a nickname")); - } }; class NSGetPass : public Module diff --git a/modules/core/ns_ghost.cpp b/modules/core/ns_ghost.cpp index 9bffa5b3c..f25785b76 100644 --- a/modules/core/ns_ghost.cpp +++ b/modules/core/ns_ghost.cpp @@ -19,6 +19,7 @@ class CommandNSGhost : public Command CommandNSGhost() : Command("GHOST", 1, 2) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Disconnects a \"ghost\" IRC session using your nick"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -90,11 +91,6 @@ class CommandNSGhost : public Command { SyntaxError(source, "GHOST", _("GHOST \037nickname\037 [\037password\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" GHOST Disconnects a \"ghost\" IRC session using your nick")); - } }; class NSGhost : public Module diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp index 987a7e163..8509c88f5 100644 --- a/modules/core/ns_group.cpp +++ b/modules/core/ns_group.cpp @@ -19,6 +19,7 @@ class CommandNSGroup : public Command CommandNSGroup() : Command("GROUP", 2, 2) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Join a group"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -173,11 +174,6 @@ class CommandNSGroup : public Command { SyntaxError(source, "GROUP", _("\037target\037 \037password\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" GROUP Join a group")); - } }; class CommandNSUngroup : public Command @@ -185,6 +181,7 @@ class CommandNSUngroup : public Command public: CommandNSUngroup() : Command("UNGROUP", 0, 1) { + this->SetDesc("Remove a nick from a group"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -242,11 +239,6 @@ class CommandNSUngroup : public Command "nick in your group.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" UNGROUP Remove a nick from a group")); - } }; class CommandNSGList : public Command @@ -254,6 +246,7 @@ class CommandNSGList : public Command public: CommandNSGList() : Command("GLIST", 0, 1) { + this->SetDesc("Lists all nicknames in your group"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -300,11 +293,6 @@ class CommandNSGList : public Command return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" GLIST Lists all nicknames in your group")); - } }; class NSGroup : public Module diff --git a/modules/core/ns_identify.cpp b/modules/core/ns_identify.cpp index 640644d6e..c9446ade5 100644 --- a/modules/core/ns_identify.cpp +++ b/modules/core/ns_identify.cpp @@ -19,6 +19,7 @@ class CommandNSIdentify : public Command CommandNSIdentify() : Command("IDENTIFY", 1, 2) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Identify yourself with your password"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -118,11 +119,6 @@ class CommandNSIdentify : public Command { SyntaxError(source, "IDENTIFY", _("IDENTIFY [account] \037password\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" IDENTIFY Identify yourself with your password")); - } }; class NSIdentify : public Module diff --git a/modules/core/ns_info.cpp b/modules/core/ns_info.cpp index 63e92391f..c804b4cf8 100644 --- a/modules/core/ns_info.cpp +++ b/modules/core/ns_info.cpp @@ -31,6 +31,7 @@ class CommandNSInfo : public Command CommandNSInfo() : Command("INFO", 1, 2) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Displays information about a given nickname"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -161,11 +162,6 @@ class CommandNSInfo : public Command { SyntaxError(source, "INFO", _("INFO \037nick\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" INFO Displays information about a given nickname")); - } }; class NSInfo : public Module diff --git a/modules/core/ns_list.cpp b/modules/core/ns_list.cpp index a97536867..7350a471c 100644 --- a/modules/core/ns_list.cpp +++ b/modules/core/ns_list.cpp @@ -19,6 +19,7 @@ class CommandNSList : public Command public: CommandNSList() : Command("LIST", 1, 2) { + this->SetDesc("List all registered nicknames that match a given pattern"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -220,11 +221,6 @@ class CommandNSList : public Command else SyntaxError(source, "LIST", LanguageString::NICK_LIST_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" LIST List all registered nicknames that match a given pattern")); - } }; class NSList : public Module diff --git a/modules/core/ns_logout.cpp b/modules/core/ns_logout.cpp index 81ccc841d..ef375f2bb 100644 --- a/modules/core/ns_logout.cpp +++ b/modules/core/ns_logout.cpp @@ -18,6 +18,7 @@ class CommandNSLogout : public Command public: CommandNSLogout() : Command("LOGOUT", 0, 2) { + this->SetDesc("Reverses the effect of the IDENTIFY command"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -89,11 +90,6 @@ class CommandNSLogout : public Command { SyntaxError(source, "LOGOUT", _("LOGOUT")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" LOGOUT Reverses the effect of the IDENTIFY command")); - } }; class NSLogout : public Module diff --git a/modules/core/ns_recover.cpp b/modules/core/ns_recover.cpp index 66cc06c5d..0cc76cfae 100644 --- a/modules/core/ns_recover.cpp +++ b/modules/core/ns_recover.cpp @@ -19,6 +19,7 @@ class CommandNSRecover : public Command CommandNSRecover() : Command("RECOVER", 1, 2) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Kill another user who has taken your nick"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -119,11 +120,6 @@ class CommandNSRecover : public Command { SyntaxError(source, "RECOVER", _("RECOVER \037nickname\037 [\037password\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" RECOVER Kill another user who has taken your nick")); - } }; class NSRecover : public Module diff --git a/modules/core/ns_register.cpp b/modules/core/ns_register.cpp index b7d0712a2..00baadc9f 100644 --- a/modules/core/ns_register.cpp +++ b/modules/core/ns_register.cpp @@ -135,6 +135,7 @@ class CommandNSConfirm : public Command CommandNSConfirm(const Anope::string &cmdn, int min, int max) : Command(cmdn, min, max) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Confirm a nickserv auth code"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -167,11 +168,6 @@ class CommandNSConfirm : public Command { source.Reply(LanguageString::NICK_CONFIRM_INVALID); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" CONFIRM Confirm a nickserv auth code")); - } }; class CommandNSRegister : public CommandNSConfirm @@ -180,6 +176,7 @@ class CommandNSRegister : public CommandNSConfirm CommandNSRegister() : CommandNSConfirm("REGISTER", 1, 2) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Register a nickname"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -353,11 +350,6 @@ class CommandNSRegister : public CommandNSConfirm else SyntaxError(source, "REGISTER", _("\037password\037 [\037email\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" REGISTER Register a nickname")); - } }; class CommandNSResend : public Command @@ -366,6 +358,7 @@ class CommandNSResend : public Command CommandNSResend() : Command("RESEND", 0, 0) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Resend a nickserv auth code"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -405,11 +398,6 @@ class CommandNSResend : public Command "to the e-mail address of the user whom is performing it.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" RESEND Resend a nickserv auth code")); - } }; class NSRegister : public Module diff --git a/modules/core/ns_release.cpp b/modules/core/ns_release.cpp index 4c8e47b08..088f0dade 100644 --- a/modules/core/ns_release.cpp +++ b/modules/core/ns_release.cpp @@ -19,6 +19,7 @@ class CommandNSRelease : public Command CommandNSRelease() : Command("RELEASE", 1, 2) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Regain custody of your nick after RECOVER"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -95,11 +96,6 @@ class CommandNSRelease : public Command { SyntaxError(source, "RELEASE", _("RELEASE \037nickname\037 [\037password\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" RELEASE Regain custody of your nick after RECOVER")); - } }; class NSRelease : public Module diff --git a/modules/core/ns_resetpass.cpp b/modules/core/ns_resetpass.cpp index 7b5473122..07b918125 100644 --- a/modules/core/ns_resetpass.cpp +++ b/modules/core/ns_resetpass.cpp @@ -21,6 +21,7 @@ class CommandNSResetPass : public Command CommandNSResetPass() : Command("RESETPASS", 1, 1) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Helps you reset lost passwords"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -58,11 +59,6 @@ class CommandNSResetPass : public Command { SyntaxError(source, "RESETPASS", _("RESETPASS \037nickname\037\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" RESETPASS Helps you reset lost passwords")); - } }; class NSResetPass : public Module diff --git a/modules/core/ns_saset.cpp b/modules/core/ns_saset.cpp index 8c809b7c4..a484e8b04 100644 --- a/modules/core/ns_saset.cpp +++ b/modules/core/ns_saset.cpp @@ -21,6 +21,7 @@ class CommandNSSASet : public Command public: CommandNSSASet() : Command("SASET", 2, 4) { + this->SetDesc("Set SET-options on another nickname"); } ~CommandNSSASet() @@ -100,11 +101,6 @@ class CommandNSSASet : public Command SyntaxError(source, "SASET", LanguageString::NICK_SASET_SYNTAX); } - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SASET Set SET-options on another nickname")); - } - bool AddSubcommand(Module *creator, Command *c) { c->module = creator; @@ -133,6 +129,7 @@ class CommandNSSASetDisplay : public Command public: CommandNSSASetDisplay() : Command("DISPLAY", 2, 2, "nickserv/saset/display") { + this->SetDesc("Set the display of the group in Services"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -168,11 +165,6 @@ class CommandNSSASetDisplay : public Command // XXX SyntaxError(source, "SASET", LanguageString::NICK_SASET_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DISPLAY Set the display of the group in Services")); - } }; class CommandNSSASetPassword : public Command @@ -180,6 +172,7 @@ class CommandNSSASetPassword : public Command public: CommandNSSASetPassword() : Command("PASSWORD", 2, 2, "nickserv/saset/password") { + this->SetDesc("Set the nickname password"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -239,11 +232,6 @@ class CommandNSSASetPassword : public Command { SyntaxError(source, "SASET", LanguageString::NICK_SASET_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" PASSWORD Set the nickname password")); - } }; class NSSASet : public Module diff --git a/modules/core/ns_saset_noexpire.cpp b/modules/core/ns_saset_noexpire.cpp index bc7103aae..941214b90 100644 --- a/modules/core/ns_saset_noexpire.cpp +++ b/modules/core/ns_saset_noexpire.cpp @@ -18,6 +18,7 @@ class CommandNSSASetNoexpire : public Command public: CommandNSSASetNoexpire() : Command("NOEXPIRE", 1, 2, "nickserv/saset/noexpire") { + this->SetDesc("Prevent the nickname from expiring"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -57,11 +58,6 @@ class CommandNSSASetNoexpire : public Command { SyntaxError(source, "SASET NOEXPIRE", _("SASET \037nickname\037 NOEXPIRE {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" NOEXPIRE Prevent the nickname from expiring")); - } }; class NSSASetNoexpire : public Module diff --git a/modules/core/ns_sendpass.cpp b/modules/core/ns_sendpass.cpp index d232f8f16..40d9dd00d 100644 --- a/modules/core/ns_sendpass.cpp +++ b/modules/core/ns_sendpass.cpp @@ -21,6 +21,7 @@ class CommandNSSendPass : public Command CommandNSSendPass() : Command("SENDPASS", 1, 1) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Forgot your password? Try this"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -69,11 +70,6 @@ class CommandNSSendPass : public Command { SyntaxError(source, "SENDPASS", _("SENDPASS \037nickname\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SENDPASS Forgot your password? Try this")); - } }; class NSSendPass : public Module diff --git a/modules/core/ns_set.cpp b/modules/core/ns_set.cpp index e398868ed..3bd9a0eae 100644 --- a/modules/core/ns_set.cpp +++ b/modules/core/ns_set.cpp @@ -21,6 +21,7 @@ class CommandNSSet : public Command public: CommandNSSet() : Command("SET", 1, 3) { + this->SetDesc("Set options, including kill protection"); } ~CommandNSSet() @@ -97,11 +98,6 @@ class CommandNSSet : public Command SyntaxError(source, "SET", LanguageString::NICK_SET_SYNTAX); } - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SET Set options, including kill protection")); - } - bool AddSubcommand(Module *creator, Command *c) { c->module = creator; @@ -130,6 +126,7 @@ class CommandNSSetDisplay : public Command public: CommandNSSetDisplay() : Command("DISPLAY", 1) { + this->SetDesc("Set the display of your group in Services"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -162,11 +159,6 @@ class CommandNSSetDisplay : public Command // XXX SyntaxError(source, "SET", LanguageString::NICK_SET_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DISPLAY Set the display of your group in Services")); - } }; class CommandNSSetPassword : public Command @@ -174,6 +166,7 @@ class CommandNSSetPassword : public Command public: CommandNSSetPassword() : Command("PASSWORD", 1) { + this->SetDesc("Set your nickname password"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -224,11 +217,6 @@ class CommandNSSetPassword : public Command // XXX SyntaxError(source, "SET", LanguageString::NICK_SET_SYNTAX); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" PASSWORD Set your nickname password")); - } }; class NSSet : public Module diff --git a/modules/core/ns_set_autoop.cpp b/modules/core/ns_set_autoop.cpp index a7fc9f9fa..5eed03ee0 100644 --- a/modules/core/ns_set_autoop.cpp +++ b/modules/core/ns_set_autoop.cpp @@ -18,6 +18,7 @@ class CommandNSSetAutoOp : public Command public: CommandNSSetAutoOp(const Anope::string &spermission = "") : Command("AUTOOP", 1, 2, spermission) { + this->SetDesc("Should services op you automatically."); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -58,11 +59,6 @@ class CommandNSSetAutoOp : public Command { SyntaxError(source, "SET AUTOOP", _("SET AUTOOP {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" AUTOOP Should services op you automatically. ")); - } }; class CommandNSSASetAutoOp : public CommandNSSetAutoOp @@ -86,11 +82,6 @@ class CommandNSSASetAutoOp : public CommandNSSetAutoOp { SyntaxError(source, "SET AUTOOP", _("SASET \037nickname\037 AUTOOP {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" AUTOOP Turn autoop on or off")); - } }; class NSSetAutoOp : public Module diff --git a/modules/core/ns_set_email.cpp b/modules/core/ns_set_email.cpp index 41aa84e31..900ff9ec3 100644 --- a/modules/core/ns_set_email.cpp +++ b/modules/core/ns_set_email.cpp @@ -18,6 +18,7 @@ class CommandNSSetEmail : public Command public: CommandNSSetEmail(const Anope::string &spermission = "") : Command("EMAIL", 1, 2, spermission) { + this->SetDesc("Associate an E-mail address with your nickname"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -69,11 +70,6 @@ class CommandNSSetEmail : public Command "information on the nickname with the \002INFO\002 command.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" EMAIL Associate an E-mail address with your nickname")); - } }; class CommandNSSASetEmail : public CommandNSSetEmail @@ -90,11 +86,6 @@ class CommandNSSASetEmail : public CommandNSSetEmail "Associates the given E-mail address with the nickname.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" EMAIL Associate an E-mail address with the nickname")); - } }; class NSSetEmail : public Module diff --git a/modules/core/ns_set_greet.cpp b/modules/core/ns_set_greet.cpp index d0c0bdcd9..ab0c29fdf 100644 --- a/modules/core/ns_set_greet.cpp +++ b/modules/core/ns_set_greet.cpp @@ -18,6 +18,7 @@ class CommandNSSetGreet : public Command public: CommandNSSetGreet(const Anope::string &spermission = "") : Command("GREET", 1, 2, spermission) { + this->SetDesc("Associate a greet message with your nickname"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -53,11 +54,6 @@ class CommandNSSetGreet : public Command "access on it.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" GREET Associate a greet message with your nickname")); - } }; class CommandNSSASetGreet : public CommandNSSetGreet @@ -77,11 +73,6 @@ class CommandNSSASetGreet : public CommandNSSetGreet "access on it.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" GREET Associate a greet message with the nickname")); - } }; class NSSetGreet : public Module diff --git a/modules/core/ns_set_hide.cpp b/modules/core/ns_set_hide.cpp index b915d6b53..db40d281b 100644 --- a/modules/core/ns_set_hide.cpp +++ b/modules/core/ns_set_hide.cpp @@ -18,6 +18,7 @@ class CommandNSSetHide : public Command public: CommandNSSetHide(const Anope::string &spermission = "") : Command("HIDE", 2, 3, spermission) { + this->SetDesc("Hide certain pieces of nickname information"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -97,11 +98,6 @@ class CommandNSSetHide : public Command { SyntaxError(source, "SET HIDE", _("SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" HIDE Hide certain pieces of nickname information")); - } }; class CommandNSSASetHide : public CommandNSSetHide @@ -129,11 +125,6 @@ class CommandNSSASetHide : public CommandNSSetHide { SyntaxError(source, "SASET HIDE", _("SASET NICK_SASET_HIDE_SYNTAX37nicknameNICK_SASET_HIDE_SYNTAX37 HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" HIDE Hide certain pieces of nickname information")); - } }; class NSSetHide : public Module diff --git a/modules/core/ns_set_kill.cpp b/modules/core/ns_set_kill.cpp index a9ca2eaa5..176d152ba 100644 --- a/modules/core/ns_set_kill.cpp +++ b/modules/core/ns_set_kill.cpp @@ -18,6 +18,7 @@ class CommandNSSetKill : public Command public: CommandNSSetKill(const Anope::string &spermission = "") : Command("KILL", 2, 3, spermission) { + this->SetDesc("Turn protection on or off"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -92,11 +93,6 @@ class CommandNSSetKill : public Command { SyntaxError(source, "SET KILL", Config->NSAllowKillImmed ? _("SET KILL {ON | QUICK | IMMED | OFF}") : _("SET KILL {ON | QUICK | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" KILL Turn protection on or off")); - } }; class CommandNSSASetKill : public CommandNSSetKill @@ -129,11 +125,6 @@ class CommandNSSASetKill : public CommandNSSetKill { SyntaxError(source, "SASET KILL", Config->NSAllowKillImmed ? _("SASET \037nickname\037 KILL {ON | QUICK | IMMED | OFF}") : _("SASET \037nickname\037 KILL {ON | QUICK | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" KILL Turn protection on or off")); - } }; class NSSetKill : public Module diff --git a/modules/core/ns_set_language.cpp b/modules/core/ns_set_language.cpp index 20ce5f558..58f9a8329 100644 --- a/modules/core/ns_set_language.cpp +++ b/modules/core/ns_set_language.cpp @@ -18,6 +18,7 @@ class CommandNSSetLanguage : public Command public: CommandNSSetLanguage(const Anope::string &spermission = "") : Command("LANGUAGE", 2, 2, spermission) { + this->SetDesc("Set the language Services will use when messaging you"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -75,13 +76,6 @@ class CommandNSSetLanguage : public Command { SyntaxError(source, "SET LANGUAGE", _("SET LANGUAGE \037language\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" LANGUAGE Set the language Services will use when\n" - " sending messages to you")); - - } }; class CommandNSSASetLanguage : public CommandNSSetLanguage @@ -106,16 +100,6 @@ class CommandNSSASetLanguage : public CommandNSSetLanguage { SyntaxError(source, "SASET LANGUAGE", _("SASET \037nickname\037 LANGUAGE \037number\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_("Syntax: \002SASET \037nickname\037 LANGUAGE \037language\037\002\n" - " \n" - "Changes the language Services uses when sending messages to\n" - "\037nickname\037 (for example, when responding to a command he sends).\n" - "\037language\037 should be chosen from a list of supported languages\n" - "that you can get by typing \002%R%s HELP SET LANGUAGE\002."), NickServ->nick.c_str()); - } }; class NSSetLanguage : public Module diff --git a/modules/core/ns_set_message.cpp b/modules/core/ns_set_message.cpp index fc14e067d..0348076b0 100644 --- a/modules/core/ns_set_message.cpp +++ b/modules/core/ns_set_message.cpp @@ -18,6 +18,7 @@ class CommandNSSetMessage : public Command public: CommandNSSetMessage(const Anope::string &spermission = "") : Command("MSG", 2, 2, spermission) { + this->SetDesc("Change the communication method of Services"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -65,11 +66,6 @@ class CommandNSSetMessage : public Command { SyntaxError(source, "SET MSG", _("SET MSG {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" MSG Change the communication method of Services")); - } }; class CommandNSSASetMessage : public CommandNSSetMessage @@ -93,11 +89,6 @@ class CommandNSSASetMessage : public CommandNSSetMessage { SyntaxError(source, "SASET MSG", _("SASAET \037nickname\037 PRIVATE {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" MSG Change the communication method of Services")); - } }; class NSSetMessage : public Module diff --git a/modules/core/ns_set_private.cpp b/modules/core/ns_set_private.cpp index db879eb21..dd9175d40 100644 --- a/modules/core/ns_set_private.cpp +++ b/modules/core/ns_set_private.cpp @@ -18,6 +18,7 @@ class CommandNSSetPrivate : public Command public: CommandNSSetPrivate(const Anope::string &spermission = "") : Command("PRIVATE", 2, 2, spermission) { + this->SetDesc("Prevent the nickname from appearing in a \002%R" + NickServ->nick + " LIST\002"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -62,11 +63,6 @@ class CommandNSSetPrivate : public Command { SyntaxError(source, "SET PRIVATE", _("SET PRIVATE {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" PRIVATE Prevent the nickname from appearing in a \002%R%s LIST\002"), ChanServ->nick.c_str()); - } }; class CommandNSSASetPrivate : public CommandNSSetPrivate @@ -93,10 +89,6 @@ class CommandNSSASetPrivate : public CommandNSSetPrivate { SyntaxError(source, "SASET PRIVATE", _("SASET \037nickname\037 PRIVATE {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - } }; class NSSetPrivate : public Module diff --git a/modules/core/ns_set_secure.cpp b/modules/core/ns_set_secure.cpp index b15ed0d22..182292d23 100644 --- a/modules/core/ns_set_secure.cpp +++ b/modules/core/ns_set_secure.cpp @@ -18,6 +18,7 @@ class CommandNSSetSecure : public Command public: CommandNSSetSecure(const Anope::string &cpermission = "") : Command("SECURE", 2, 2, cpermission) { + this->SetDesc("Turn nickname security on or off"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -63,11 +64,6 @@ class CommandNSSetSecure : public Command { SyntaxError(source, "SET SECURE", _("SET SECURE {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SECURE Turn nickname security on or off")); - } }; class CommandNSSASetSecure : public CommandNSSetSecure @@ -95,11 +91,6 @@ class CommandNSSASetSecure : public CommandNSSetSecure { SyntaxError(source, "SASET SECURE", _("SASET \037nickname\037 SECURE {ON | OFF}")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SECURE Turn nickname security on or off")); - } }; class NSSetSecure : public Module diff --git a/modules/core/ns_status.cpp b/modules/core/ns_status.cpp index 5584d957d..817060151 100644 --- a/modules/core/ns_status.cpp +++ b/modules/core/ns_status.cpp @@ -19,6 +19,7 @@ class CommandNSStatus : public Command CommandNSStatus() : Command("STATUS", 0, 16) { this->SetFlag(CFLAG_ALLOW_UNREGISTERED); + this->SetDesc("Returns the owner status of the given nickname"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -73,11 +74,6 @@ class CommandNSStatus : public Command "will be returned.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" STATUS Returns the owner status of the given nickname")); - } }; class NSStatus : public Module diff --git a/modules/core/ns_suspend.cpp b/modules/core/ns_suspend.cpp index 70a8ea122..a4e7dc785 100644 --- a/modules/core/ns_suspend.cpp +++ b/modules/core/ns_suspend.cpp @@ -18,6 +18,7 @@ class CommandNSSuspend : public Command public: CommandNSSuspend() : Command("SUSPEND", 2, 2, "nickserv/suspend") { + this->SetDesc("Suspend a given nick"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -97,11 +98,6 @@ class CommandNSSuspend : public Command { SyntaxError(source, "SUSPEND", _("SUSPEND nickname reason")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SUSPEND Suspend a given nick")); - } }; class CommandNSUnSuspend : public Command @@ -109,6 +105,7 @@ class CommandNSUnSuspend : public Command public: CommandNSUnSuspend() : Command("UNSUSPEND", 1, 1, "nickserv/suspend") { + this->SetDesc("Unsuspend a given nick"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -165,11 +162,6 @@ class CommandNSUnSuspend : public Command { SyntaxError(source, "UNSUSPEND", _("UNSUSPEND nickname")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" UNSUSPEND Unsuspend a given nick")); - } }; class NSSuspend : public Module diff --git a/modules/core/ns_update.cpp b/modules/core/ns_update.cpp index 6ddf7cdb5..14050f786 100644 --- a/modules/core/ns_update.cpp +++ b/modules/core/ns_update.cpp @@ -18,6 +18,7 @@ class CommandNSUpdate : public Command public: CommandNSUpdate() : Command("UPDATE", 0, 0) { + this->SetDesc("Updates your current status, i.e. it checks for new memos"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -47,11 +48,6 @@ class CommandNSUpdate : public Command "your userflags (lastseentime, etc).")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" UPDATE Updates your current status, i.e. it checks for new memos")); - } }; class NSUpdate : public Module diff --git a/modules/core/os_akill.cpp b/modules/core/os_akill.cpp index 499fd380d..63c6c3700 100644 --- a/modules/core/os_akill.cpp +++ b/modules/core/os_akill.cpp @@ -380,6 +380,7 @@ class CommandOSAKill : public Command public: CommandOSAKill() : Command("AKILL", 1, 4, "operserv/akill") { + this->SetDesc("Manipulate the AKILL list"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -453,11 +454,6 @@ class CommandOSAKill : public Command { SyntaxError(source, "AKILL", _("AKILL {ADD | DEL | LIST | VIEW | CLEAR} [[+\037expiry\037] {\037nick\037 | \037mask\037 | \037entry-list\037} [\037reason\037]]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" AKILL Manipulate the AKILL list")); - } }; class OSAKill : public Module diff --git a/modules/core/os_chankill.cpp b/modules/core/os_chankill.cpp index 6fffd8827..6fa4fdeae 100644 --- a/modules/core/os_chankill.cpp +++ b/modules/core/os_chankill.cpp @@ -18,6 +18,7 @@ class CommandOSChanKill : public Command public: CommandOSChanKill() : Command("CHANKILL", 2, 3, "operserv/chankill") { + this->SetDesc("AKILL all users on a specific channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -98,11 +99,6 @@ class CommandOSChanKill : public Command { SyntaxError(source, "CHANKILL", _("CHANKILL [+\037expiry\037] {\037#channel\037} [\037reason\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" CHANKILL AKILL all users on a specific channel")); - } }; class OSChanKill : public Module diff --git a/modules/core/os_chanlist.cpp b/modules/core/os_chanlist.cpp index dbf36e44c..0e1fafdf3 100644 --- a/modules/core/os_chanlist.cpp +++ b/modules/core/os_chanlist.cpp @@ -18,6 +18,7 @@ class CommandOSChanList : public Command public: CommandOSChanList() : Command("CHANLIST", 0, 2) { + this->SetDesc("Lists all channel records"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -86,11 +87,6 @@ class CommandOSChanList : public Command "+p mode.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" CHANLIST Lists all channel records")); - } }; class OSChanList : public Module diff --git a/modules/core/os_defcon.cpp b/modules/core/os_defcon.cpp index 645f6fc39..ac75d6669 100644 --- a/modules/core/os_defcon.cpp +++ b/modules/core/os_defcon.cpp @@ -57,6 +57,7 @@ class CommandOSDefcon : public Command public: CommandOSDefcon() : Command("DEFCON", 1, 1, "operserv/defcon") { + this->SetDesc("Manipulate the DefCon system"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -133,11 +134,6 @@ class CommandOSDefcon : public Command { SyntaxError(source, "DEFCON", _("DEFCON [\0021\002|\0022\002|\0023\002|\0024\002|\0025\002]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" DEFCON Manipulate the DefCon system")); - } }; class OSDefcon : public Module diff --git a/modules/core/os_global.cpp b/modules/core/os_global.cpp index 5d8bb39e4..7803ec776 100644 --- a/modules/core/os_global.cpp +++ b/modules/core/os_global.cpp @@ -18,6 +18,7 @@ class CommandOSGlobal : public Command public: CommandOSGlobal() : Command("GLOBAL", 1, 1, "operserv/global") { + this->SetDesc("Send a message to all users"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -44,11 +45,6 @@ class CommandOSGlobal : public Command { SyntaxError(source, "GLOBAL", _("GLOBAL \037message\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" GLOBAL Send a message to all users")); - } }; class OSGlobal : public Module diff --git a/modules/core/os_ignore.cpp b/modules/core/os_ignore.cpp index bf5538dd9..5c8883cfe 100644 --- a/modules/core/os_ignore.cpp +++ b/modules/core/os_ignore.cpp @@ -235,6 +235,7 @@ class CommandOSIgnore : public Command public: CommandOSIgnore() : Command("IGNORE", 1, 4, "operserv/ignore") { + this->SetDesc("Modify the Services ignore list"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -278,11 +279,6 @@ class CommandOSIgnore : public Command { SyntaxError(source, "IGNORE", _("IGNORE {ADD|DEL|LIST|CLEAR} [\037time\037] [\037nick\037] [\037reason\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" IGNORE Modify the Services ignore list")); - } }; class OSIgnore : public Module diff --git a/modules/core/os_jupe.cpp b/modules/core/os_jupe.cpp index 5220bd04c..90f8e9821 100644 --- a/modules/core/os_jupe.cpp +++ b/modules/core/os_jupe.cpp @@ -18,6 +18,7 @@ class CommandOSJupe : public Command public: CommandOSJupe() : Command("JUPE", 1, 2, "operserv/jupe") { + this->SetDesc("\"Jupiter\" a server"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -64,11 +65,6 @@ class CommandOSJupe : public Command { SyntaxError(source, "JUPE", _("JUPE \037servername\037 [\037reason\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" JUPE \"Jupiter\" a server")); - } }; class OSJupe : public Module diff --git a/modules/core/os_kick.cpp b/modules/core/os_kick.cpp index c299f1bd8..cf93ada17 100644 --- a/modules/core/os_kick.cpp +++ b/modules/core/os_kick.cpp @@ -18,6 +18,7 @@ class CommandOSKick : public Command public: CommandOSKick() : Command("KICK", 3, 3, "operserv/kick") { + this->SetDesc("Kick a user from a channel"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -68,11 +69,6 @@ class CommandOSKick : public Command { SyntaxError(source, "KICK", _("KICK \037channel\037 \037user\037 \037reason\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" KICK Kick a user from a channel")); - } }; class OSKick : public Module diff --git a/modules/core/os_mode.cpp b/modules/core/os_mode.cpp index ab2378052..5b2bb051a 100644 --- a/modules/core/os_mode.cpp +++ b/modules/core/os_mode.cpp @@ -18,6 +18,7 @@ class CommandOSMode : public Command public: CommandOSMode() : Command("MODE", 2, 2, "operserv/mode") { + this->SetDesc("Change a channel's modes"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -55,11 +56,6 @@ class CommandOSMode : public Command { SyntaxError(source, "MODE", _("MODE \037channel\037 \037modes\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" MODE Change a channel's modes")); - } }; class OSMode : public Module diff --git a/modules/core/os_modinfo.cpp b/modules/core/os_modinfo.cpp index 9ee5b65fd..734a80ffe 100644 --- a/modules/core/os_modinfo.cpp +++ b/modules/core/os_modinfo.cpp @@ -40,6 +40,7 @@ class CommandOSModInfo : public Command public: CommandOSModInfo() : Command("MODINFO", 1, 1) { + this->SetDesc("Info about a loaded module"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -76,11 +77,6 @@ class CommandOSModInfo : public Command { SyntaxError(source, "MODINFO", _("MODINFO \037FileName\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" MODINFO Info about a loaded module")); - } }; class OSModInfo : public Module diff --git a/modules/core/os_modlist.cpp b/modules/core/os_modlist.cpp index 3a70e631a..b5a11d39b 100644 --- a/modules/core/os_modlist.cpp +++ b/modules/core/os_modlist.cpp @@ -18,6 +18,7 @@ class CommandOSModList : public Command public: CommandOSModList() : Command("MODLIST", 0, 1, "operserv/modlist") { + this->SetDesc("List loaded modules"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -212,11 +213,6 @@ class CommandOSModList : public Command "Lists all currently loaded modules.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" MODLIST List loaded modules")); - } }; class OSModList : public Module diff --git a/modules/core/os_modload.cpp b/modules/core/os_modload.cpp index c655df683..80052b635 100644 --- a/modules/core/os_modload.cpp +++ b/modules/core/os_modload.cpp @@ -18,6 +18,7 @@ class CommandOSModLoad : public Command public: CommandOSModLoad() : Command("MODLOAD", 1, 1, "operserv/modload") { + this->SetDesc("Load a module"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -64,11 +65,6 @@ class CommandOSModLoad : public Command { SyntaxError(source, "MODLOAD", _("MODLOAD \037FileName\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" MODLOAD Load a module")); - } }; class OSModLoad : public Module diff --git a/modules/core/os_modreload.cpp b/modules/core/os_modreload.cpp index 10a4e1b07..e26516e01 100644 --- a/modules/core/os_modreload.cpp +++ b/modules/core/os_modreload.cpp @@ -18,6 +18,7 @@ class CommandOSModReLoad : public Command public: CommandOSModReLoad() : Command("MODRELOAD", 1, 1, "operserv/modload") { + this->SetDesc("Reload a module"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -90,11 +91,6 @@ class CommandOSModReLoad : public Command { SyntaxError(source, "MODLOAD", _("MODRELOAD \037FileName\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" MODRELOAD Reload a module")); - } }; class OSModReLoad : public Module diff --git a/modules/core/os_modunload.cpp b/modules/core/os_modunload.cpp index 9dc3f8d39..8815bd2e1 100644 --- a/modules/core/os_modunload.cpp +++ b/modules/core/os_modunload.cpp @@ -18,6 +18,7 @@ class CommandOSModUnLoad : public Command public: CommandOSModUnLoad() : Command("MODUNLOAD", 1, 1, "operserv/modload") { + this->SetDesc("Un-Load a module"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -72,11 +73,6 @@ class CommandOSModUnLoad : public Command { SyntaxError(source, "MODUNLOAD", _("MODUNLOAD \037FileName\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" MODUNLOAD Un-Load a module")); - } }; class OSModUnLoad : public Module diff --git a/modules/core/os_news.cpp b/modules/core/os_news.cpp index f822e8e4b..1ab5a838c 100644 --- a/modules/core/os_news.cpp +++ b/modules/core/os_news.cpp @@ -294,6 +294,7 @@ class CommandOSLogonNews : public NewsBase public: CommandOSLogonNews() : NewsBase("LOGONNEWS") { + this->SetDesc("Define messages to be shown to users at logon"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -322,11 +323,6 @@ class CommandOSLogonNews : public NewsBase { SyntaxError(source, "LOGONNEWS", _("LOGONNEWS {ADD|DEL|LIST} [\037text\037|\037num\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" LOGONNEWS Define messages to be shown to users at logon")); - } }; class CommandOSOperNews : public NewsBase @@ -334,6 +330,7 @@ class CommandOSOperNews : public NewsBase public: CommandOSOperNews() : NewsBase("OPERNEWS") { + this->SetDesc("Define messages to be shown to users who oper"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -362,11 +359,6 @@ class CommandOSOperNews : public NewsBase { SyntaxError(source, "OPERNEWS", _("OPERNEWS {ADD|DEL|LIST} [\037text\037|\037num\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" OPERNEWS Define messages to be shown to users who oper")); - } }; class CommandOSRandomNews : public NewsBase @@ -374,6 +366,7 @@ class CommandOSRandomNews : public NewsBase public: CommandOSRandomNews() : NewsBase("RANDOMNEWS") { + this->SetDesc("Define messages to be randomly shown to users at logon"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -399,12 +392,6 @@ class CommandOSRandomNews : public NewsBase { SyntaxError(source, "RANDOMNEWS", _("RANDOMNEWS {ADD|DEL|LIST} [\037text\037|\037num\037]\002")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" RANDOMNEWS Define messages to be randomly shown to users \n" - " at logon")); - } }; class OSNews : public Module diff --git a/modules/core/os_noop.cpp b/modules/core/os_noop.cpp index ae6d1fda7..18615b9c2 100644 --- a/modules/core/os_noop.cpp +++ b/modules/core/os_noop.cpp @@ -18,6 +18,7 @@ class CommandOSNOOP : public Command public: CommandOSNOOP() : Command("NOOP", 2, 2, "operserv/noop") { + this->SetDesc("Temporarily remove all O:lines of a server remotely"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -79,12 +80,6 @@ class CommandOSNOOP : public Command { SyntaxError(source, "NOOP", _("NOOP {SET|REVOKE} \037server\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" NOOP Temporarily remove all O:lines of a server \n" - " remotely")); - } }; class OSNOOP : public Module diff --git a/modules/core/os_oline.cpp b/modules/core/os_oline.cpp index 833bf6ab9..6fc8903ac 100644 --- a/modules/core/os_oline.cpp +++ b/modules/core/os_oline.cpp @@ -18,6 +18,7 @@ class CommandOSOLine : public Command public: CommandOSOLine() : Command("OLINE", 2, 2, "operserv/oline") { + this->SetDesc("Give Operflags to a certain user"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -64,11 +65,6 @@ class CommandOSOLine : public Command { SyntaxError(source, "OLINE", _("OLINE \037nick\037 \037flags\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" OLINE Give Operflags to a certain user")); - } }; class OSOLine : public Module diff --git a/modules/core/os_quit.cpp b/modules/core/os_quit.cpp index c06236bd1..79501b43e 100644 --- a/modules/core/os_quit.cpp +++ b/modules/core/os_quit.cpp @@ -19,6 +19,7 @@ class CommandOSQuit : public Command public: CommandOSQuit() : Command("QUIT", 0, 0, "operserv/quit") { + this->SetDesc("Terminate the Services program with no save"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -43,11 +44,6 @@ class CommandOSQuit : public Command "\002SHUTDOWN\002 command.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" QUIT Terminate the Services program with no save")); - } }; class OSQuit : public Module diff --git a/modules/core/os_reload.cpp b/modules/core/os_reload.cpp index f1ec14949..0a3e26ccc 100644 --- a/modules/core/os_reload.cpp +++ b/modules/core/os_reload.cpp @@ -18,6 +18,7 @@ class CommandOSReload : public Command public: CommandOSReload() : Command("RELOAD", 0, 0, "operserv/reload") { + this->SetDesc("Reload services' configuration file"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -47,11 +48,6 @@ class CommandOSReload : public Command "session limitation, etc.)")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" RELOAD Reload services' configuration file")); - } }; class OSReload : public Module diff --git a/modules/core/os_restart.cpp b/modules/core/os_restart.cpp index e0c2bde45..f8580c577 100644 --- a/modules/core/os_restart.cpp +++ b/modules/core/os_restart.cpp @@ -18,6 +18,7 @@ class CommandOSRestart : public Command public: CommandOSRestart() : Command("RESTART", 0, 0, "operserv/restart") { + this->SetDesc("Save databases and restart Services"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -27,7 +28,6 @@ class CommandOSRestart : public Command if (Config->GlobalOnCycle) oper_global("", "%s", Config->GlobalOnCycleMessage.c_str()); - /* raise(SIGHUP); */ do_restart_services(); return MOD_CONT; } @@ -40,11 +40,6 @@ class CommandOSRestart : public Command "(i.e. exit and immediately re-run the executable).")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" RESTART Save databases and restart Services")); - } }; class OSRestart : public Module diff --git a/modules/core/os_session.cpp b/modules/core/os_session.cpp index 835607f45..6d1d0a0b2 100644 --- a/modules/core/os_session.cpp +++ b/modules/core/os_session.cpp @@ -169,6 +169,7 @@ class CommandOSSession : public Command public: CommandOSSession() : Command("SESSION", 2, 2, "operserv/session") { + this->SetDesc("View the list of host sessions"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -214,11 +215,6 @@ class CommandOSSession : public Command { SyntaxError(source, "SESSION", _("SESSION LIST \037limit\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SESSION View the list of host sessions")); - } }; class CommandOSException : public Command @@ -438,6 +434,7 @@ class CommandOSException : public Command public: CommandOSException() : Command("EXCEPTION", 1, 5) { + this->SetDesc("Modify the session-limit exception list"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -513,11 +510,6 @@ class CommandOSException : public Command { SyntaxError(source, "EXCEPTION", _("EXCEPTION {ADD | DEL | MOVE | LIST | VIEW} [\037params\037]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" EXCEPTION Modify the session-limit exception list")); - } }; class OSSession : public Module diff --git a/modules/core/os_set.cpp b/modules/core/os_set.cpp index e606c0a1d..4de90ac53 100644 --- a/modules/core/os_set.cpp +++ b/modules/core/os_set.cpp @@ -170,6 +170,7 @@ class CommandOSSet : public Command public: CommandOSSet() : Command("SET", 1, 2, "operserv/set") { + this->SetDesc("Set various global Services options"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -242,11 +243,6 @@ class CommandOSSet : public Command { SyntaxError(source, "SET", _("SET \037option\037 \037setting\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SET Set various global Services options")); - } }; class OSSet : public Module diff --git a/modules/core/os_shutdown.cpp b/modules/core/os_shutdown.cpp index 7f15d5169..8e4958c1c 100644 --- a/modules/core/os_shutdown.cpp +++ b/modules/core/os_shutdown.cpp @@ -18,6 +18,7 @@ class CommandOSShutdown : public Command public: CommandOSShutdown() : Command("SHUTDOWN", 0, 0, "operserv/shutdown") { + this->SetDesc("Terminate services with save"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -38,11 +39,6 @@ class CommandOSShutdown : public Command "Causes Services to save all databases and then shut down.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SHUTDOWN Terminate the Services program with save")); - } }; class OSShutdown : public Module diff --git a/modules/core/os_snline.cpp b/modules/core/os_snline.cpp index 97d1911d7..c36d8bf63 100644 --- a/modules/core/os_snline.cpp +++ b/modules/core/os_snline.cpp @@ -395,6 +395,7 @@ class CommandOSSNLine : public Command public: CommandOSSNLine() : Command("SNLINE", 1, 3, "operserv/snline") { + this->SetDesc("Manipulate the SNLINE list"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -469,11 +470,6 @@ class CommandOSSNLine : public Command { SyntaxError(source, "SNLINE", _("SNLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+\037expiry\037] {\037mask\037 | \037entry-list\037}[:\037reason\037]]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SNLINE Manipulate the SNLINE list")); - } }; class OSSNLine : public Module diff --git a/modules/core/os_sqline.cpp b/modules/core/os_sqline.cpp index 4117ebf57..16ff9bd12 100644 --- a/modules/core/os_sqline.cpp +++ b/modules/core/os_sqline.cpp @@ -375,6 +375,7 @@ class CommandOSSQLine : public Command public: CommandOSSQLine() : Command("SQLINE", 1, 4, "operserv/sqline") { + this->SetDesc("Manipulate the SQLINE list"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -449,11 +450,6 @@ class CommandOSSQLine : public Command { SyntaxError(source, "SQLINE", _("SQLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+\037expiry\037] {\037nick\037 | \037mask\037 | \037entry-list\037} [\037reason\037]]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SQLINE Manipulate the SQLINE list")); - } }; class OSSQLine : public Module diff --git a/modules/core/os_staff.cpp b/modules/core/os_staff.cpp index 1f6b60eb3..e1e5d6942 100644 --- a/modules/core/os_staff.cpp +++ b/modules/core/os_staff.cpp @@ -18,6 +18,7 @@ class CommandOSStaff : public Command public: CommandOSStaff() : Command("STAFF", 0, 0, "operserv/staff") { + this->SetDesc("Display Services staff and online status"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -57,11 +58,6 @@ class CommandOSStaff : public Command "and on-line status.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" STAFF Display Services staff and online status")); - } }; class OSStaff : public Module diff --git a/modules/core/os_stats.cpp b/modules/core/os_stats.cpp index 96d0bcb75..a3898949f 100644 --- a/modules/core/os_stats.cpp +++ b/modules/core/os_stats.cpp @@ -229,6 +229,7 @@ class CommandOSStats : public Command public: CommandOSStats() : Command("STATS", 0, 1, "operserv/stats") { + this->SetDesc("Show status of Services and network"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -283,11 +284,6 @@ class CommandOSStats : public Command "everything you'd see with \002MEMORY\002 and \002UPLINK\002 options.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" STATS Show status of Services and network")); - } }; class OSStats : public Module diff --git a/modules/core/os_svsnick.cpp b/modules/core/os_svsnick.cpp index 30a06310a..00200a29d 100644 --- a/modules/core/os_svsnick.cpp +++ b/modules/core/os_svsnick.cpp @@ -18,6 +18,7 @@ class CommandOSSVSNick : public Command public: CommandOSSVSNick() : Command("SVSNICK", 2, 2, "operserv/svsnick") { + this->SetDesc("Forcefully change a user's nickname"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -77,11 +78,6 @@ class CommandOSSVSNick : public Command { SyntaxError(source, "SVSNICK", _("SVSNICK \037nick\037 \037newnick\037 ")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SVSNICK Forcefully change a user's nickname")); - } }; class OSSVSNick : public Module diff --git a/modules/core/os_szline.cpp b/modules/core/os_szline.cpp index 5cc219291..23ed98aa6 100644 --- a/modules/core/os_szline.cpp +++ b/modules/core/os_szline.cpp @@ -377,6 +377,7 @@ class CommandOSSZLine : public Command public: CommandOSSZLine() : Command("SZLINE", 1, 4, "operserv/szline") { + this->SetDesc("Manipulate the SZLINE list"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -449,11 +450,6 @@ class CommandOSSZLine : public Command { SyntaxError(source, "SZLINE", _("SZLINE {ADD | DEL | LIST | VIEW | CLEAR} [[+\037expiry\037] {\037nick\037 | \037mask\037 | \037entry-list\037} [\037reason\037]]")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" SZLINE Manipulate the SZLINE list")); - } }; class OSSZLine : public Module diff --git a/modules/core/os_umode.cpp b/modules/core/os_umode.cpp index 046ec670b..1e1720455 100644 --- a/modules/core/os_umode.cpp +++ b/modules/core/os_umode.cpp @@ -18,6 +18,7 @@ class CommandOSUMode : public Command public: CommandOSUMode() : Command("UMODE", 2, 2, "operserv/umode") { + this->SetDesc("Change a user's modes"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -66,11 +67,6 @@ class CommandOSUMode : public Command { SyntaxError(source, "UMODE", _("UMODE \037nick\037 \037modes\037")); } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" UMODE Change a user's modes")); - } }; class OSUMode : public Module diff --git a/modules/core/os_update.cpp b/modules/core/os_update.cpp index 1ea6d090b..a1e5bcae8 100644 --- a/modules/core/os_update.cpp +++ b/modules/core/os_update.cpp @@ -18,6 +18,7 @@ class CommandOSUpdate : public Command public: CommandOSUpdate() : Command("UPDATE", 0, 0, "operserv/update") { + this->SetDesc("Force the Services databases to be updated immediately"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -35,12 +36,6 @@ class CommandOSUpdate : public Command "send the command.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" UPDATE Force the Services databases to be\n" - " updated on disk immediately")); - } }; class OSUpdate : public Module diff --git a/modules/core/os_userlist.cpp b/modules/core/os_userlist.cpp index a4dac7a41..fd171dff7 100644 --- a/modules/core/os_userlist.cpp +++ b/modules/core/os_userlist.cpp @@ -18,6 +18,7 @@ class CommandOSUserList : public Command public: CommandOSUserList() : Command("USERLIST", 0, 2) { + this->SetDesc("Lists all user records"); } CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -87,11 +88,6 @@ class CommandOSUserList : public Command "with the +i flag will be listed.")); return true; } - - void OnServHelp(CommandSource &source) - { - source.Reply(_(" USERLIST Lists all user records")); - } }; class OSUserList : public Module 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<Anope::string> ¶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<Anope::string> ¶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<Anope::string> ¶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<Anope::string> ¶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<Anope::string> ¶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<Anope::string> ¶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<Anope::string> ¶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<Anope::string> ¶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<Anope::string> ¶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<Anope::string> ¶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<Anope::string> ¶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<Anope::string, CommandInfo *> Commands; diff --git a/src/command.cpp b/src/command.cpp index 398f4249c..ddf9a6622 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -64,7 +64,15 @@ Command::~Command() this->module->DelCommand(this->service, this); } -void Command::OnServHelp(CommandSource &source) { } +void Command::SetDesc(const Anope::string &d) +{ + this->desc = d; +} + +void Command::OnServHelp(CommandSource &source) +{ + source.Reply(" %-14s %s", this->name.c_str(), _(this->desc.c_str())); +} bool Command::OnHelp(CommandSource &source, const Anope::string &subcommand) { return false; } diff --git a/src/language.cpp b/src/language.cpp index 7256ebbbf..01ff01f81 100644 --- a/src/language.cpp +++ b/src/language.cpp @@ -95,14 +95,7 @@ const char *anope_gettext(const char *string) setlocale(LC_ALL, ""); #endif - Anope::string translated = translated_string ? translated_string : ""; - - if (Config->UseStrictPrivMsg) - translated = translated.replace_all_cs("%R", "/"); - else - translated = translated.replace_all_cs("%R", "/msg "); - - return translated.c_str(); + return translated_string != NULL ? translated_string : ""; } #else void PushLanguage(const Anope::string &, Anope::string) @@ -115,12 +108,7 @@ void PopLanguage() const char *anope_gettext(const char *string) { - Anope::string translated = string ? string : ""; - if (Config->UseStrictPrivMsg) - translated = translated.replace_all_cs("%R", "/"); - else - translated = translated.replace_all_cs("%R", "/msg "); - return translated.c_str(); + return string != NULL ? string : ""; } #endif diff --git a/src/users.cpp b/src/users.cpp index 9f1cc8404..fa69b928a 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -234,17 +234,27 @@ void User::SendMessage(BotInfo *source, const char *fmt, ...) } } -void User::SendMessage(BotInfo *source, const Anope::string &msg) +void User::SendMessage(BotInfo *source, Anope::string msg) { + if (Config->UseStrictPrivMsg) + msg = msg.replace_all_cs("%R", "/"); + else + msg = msg.replace_all_cs("%R", "/msg "); + /* Send privmsg instead of notice if: * - UsePrivmsg is enabled * - The user is not registered and NSDefMsg is enabled * - The user is registered and has set /ns set msg on */ - if (Config->UsePrivmsg && ((!this->nc && Config->NSDefFlags.HasFlag(NI_MSG)) || (this->nc && this->nc->HasFlag(NI_MSG)))) - ircdproto->SendPrivmsg(source, this->nick, "%s", msg.c_str()); - else - ircdproto->SendNotice(source, this->nick, "%s", msg.c_str()); + sepstream sep(msg, '\n'); + Anope::string tok; + while (sep.GetToken(tok)) + { + if (Config->UsePrivmsg && ((!this->nc && Config->NSDefFlags.HasFlag(NI_MSG)) || (this->nc && this->nc->HasFlag(NI_MSG)))) + ircdproto->SendPrivmsg(source, this->nick, "%s", tok.c_str()); + else + ircdproto->SendNotice(source, this->nick, "%s", tok.c_str()); + } } /** Collides a nick. |