From 2529ff6daef7eb387d2fce4c6df5a31029fd5bb2 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 11 Feb 2011 03:12:39 -0500 Subject: Made the help command description code more sane --- modules/core/bs_act.cpp | 6 +--- modules/core/bs_assign.cpp | 6 +--- modules/core/bs_badwords.cpp | 6 +--- modules/core/bs_bot.cpp | 6 +--- modules/core/bs_botlist.cpp | 6 +--- modules/core/bs_info.cpp | 6 +--- modules/core/bs_kick.cpp | 6 +--- modules/core/bs_say.cpp | 6 +--- modules/core/bs_set.cpp | 6 +--- modules/core/bs_unassign.cpp | 6 +--- modules/core/cs_access.cpp | 8 ++--- modules/core/cs_akick.cpp | 6 +--- modules/core/cs_ban.cpp | 6 +--- modules/core/cs_clearusers.cpp | 6 +--- modules/core/cs_clone.cpp | 6 +--- modules/core/cs_drop.cpp | 6 +--- modules/core/cs_forbid.cpp | 6 +--- modules/core/cs_getkey.cpp | 6 +--- modules/core/cs_info.cpp | 6 +--- modules/core/cs_invite.cpp | 6 +--- modules/core/cs_kick.cpp | 6 +--- modules/core/cs_list.cpp | 8 ++--- modules/core/cs_mode.cpp | 6 +--- modules/core/cs_modes.cpp | 60 ++++++----------------------------- modules/core/cs_register.cpp | 10 ++---- modules/core/cs_saset.cpp | 6 +--- modules/core/cs_saset_noexpire.cpp | 6 +--- modules/core/cs_set.cpp | 6 +--- modules/core/cs_set_bantype.cpp | 6 +--- modules/core/cs_set_description.cpp | 6 +--- modules/core/cs_set_founder.cpp | 6 +--- modules/core/cs_set_keeptopic.cpp | 6 +--- modules/core/cs_set_opnotice.cpp | 6 +--- modules/core/cs_set_peace.cpp | 6 +--- modules/core/cs_set_persist.cpp | 6 +--- modules/core/cs_set_private.cpp | 6 +--- modules/core/cs_set_restricted.cpp | 6 +--- modules/core/cs_set_secure.cpp | 6 +--- modules/core/cs_set_securefounder.cpp | 6 +--- modules/core/cs_set_secureops.cpp | 6 +--- modules/core/cs_set_signkick.cpp | 6 +--- modules/core/cs_set_successor.cpp | 6 +--- modules/core/cs_set_topiclock.cpp | 6 +--- modules/core/cs_set_xop.cpp | 6 +--- modules/core/cs_status.cpp | 6 +--- modules/core/cs_suspend.cpp | 16 ++-------- modules/core/cs_topic.cpp | 6 +--- modules/core/cs_unban.cpp | 6 +--- modules/core/cs_xop.cpp | 33 +++---------------- modules/core/hs_del.cpp | 6 +--- modules/core/hs_delall.cpp | 6 +--- modules/core/hs_group.cpp | 6 +--- modules/core/hs_list.cpp | 6 +--- modules/core/hs_off.cpp | 6 +--- modules/core/hs_on.cpp | 6 +--- modules/core/hs_set.cpp | 6 +--- modules/core/hs_setall.cpp | 6 +--- modules/core/ms_cancel.cpp | 6 +--- modules/core/ms_check.cpp | 6 +--- modules/core/ms_del.cpp | 6 +--- modules/core/ms_ignore.cpp | 6 +--- modules/core/ms_info.cpp | 6 +--- modules/core/ms_list.cpp | 6 +--- modules/core/ms_read.cpp | 6 +--- modules/core/ms_rsend.cpp | 6 +--- modules/core/ms_send.cpp | 6 +--- modules/core/ms_sendall.cpp | 6 +--- modules/core/ms_set.cpp | 6 +--- modules/core/ms_staff.cpp | 6 +--- modules/core/ns_access.cpp | 6 +--- modules/core/ns_ajoin.cpp | 6 +--- modules/core/ns_alist.cpp | 6 +--- modules/core/ns_drop.cpp | 6 +--- modules/core/ns_forbid.cpp | 6 +--- modules/core/ns_getemail.cpp | 6 +--- modules/core/ns_getpass.cpp | 6 +--- modules/core/ns_ghost.cpp | 6 +--- modules/core/ns_group.cpp | 18 ++--------- modules/core/ns_identify.cpp | 6 +--- modules/core/ns_info.cpp | 6 +--- modules/core/ns_list.cpp | 6 +--- modules/core/ns_logout.cpp | 6 +--- modules/core/ns_recover.cpp | 6 +--- modules/core/ns_register.cpp | 18 ++--------- modules/core/ns_release.cpp | 6 +--- modules/core/ns_resetpass.cpp | 6 +--- modules/core/ns_saset.cpp | 18 ++--------- modules/core/ns_saset_noexpire.cpp | 6 +--- modules/core/ns_sendpass.cpp | 6 +--- modules/core/ns_set.cpp | 18 ++--------- modules/core/ns_set_autoop.cpp | 11 +------ modules/core/ns_set_email.cpp | 11 +------ modules/core/ns_set_greet.cpp | 11 +------ modules/core/ns_set_hide.cpp | 11 +------ modules/core/ns_set_kill.cpp | 11 +------ modules/core/ns_set_language.cpp | 18 +---------- modules/core/ns_set_message.cpp | 11 +------ modules/core/ns_set_private.cpp | 10 +----- modules/core/ns_set_secure.cpp | 11 +------ modules/core/ns_status.cpp | 6 +--- modules/core/ns_suspend.cpp | 12 ++----- modules/core/ns_update.cpp | 6 +--- modules/core/os_akill.cpp | 6 +--- modules/core/os_chankill.cpp | 6 +--- modules/core/os_chanlist.cpp | 6 +--- modules/core/os_defcon.cpp | 6 +--- modules/core/os_global.cpp | 6 +--- modules/core/os_ignore.cpp | 6 +--- modules/core/os_jupe.cpp | 6 +--- modules/core/os_kick.cpp | 6 +--- modules/core/os_mode.cpp | 6 +--- modules/core/os_modinfo.cpp | 6 +--- modules/core/os_modlist.cpp | 6 +--- modules/core/os_modload.cpp | 6 +--- modules/core/os_modreload.cpp | 6 +--- modules/core/os_modunload.cpp | 6 +--- modules/core/os_news.cpp | 19 ++--------- modules/core/os_noop.cpp | 7 +--- modules/core/os_oline.cpp | 6 +--- modules/core/os_quit.cpp | 6 +--- modules/core/os_reload.cpp | 6 +--- modules/core/os_restart.cpp | 7 +--- modules/core/os_session.cpp | 12 ++----- modules/core/os_set.cpp | 6 +--- modules/core/os_shutdown.cpp | 6 +--- modules/core/os_snline.cpp | 6 +--- modules/core/os_sqline.cpp | 6 +--- modules/core/os_staff.cpp | 6 +--- modules/core/os_stats.cpp | 6 +--- modules/core/os_svsnick.cpp | 6 +--- modules/core/os_szline.cpp | 6 +--- modules/core/os_umode.cpp | 6 +--- modules/core/os_update.cpp | 7 +--- modules/core/os_userlist.cpp | 6 +--- 134 files changed, 165 insertions(+), 865 deletions(-) (limited to 'modules/core') 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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶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 ¶ms) @@ -55,11 +56,6 @@ class CommandHSDel : public Command { SyntaxError(source, "DEL", _("DEL \002\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 ¶ms) @@ -60,11 +61,6 @@ class CommandHSDelAll : public Command { SyntaxError(source, "DELALL", _("DELALL \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 ¶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 ¶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 ¶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 ¶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 ¶ms) @@ -109,11 +110,6 @@ class CommandHSSet : public Command { SyntaxError(source, "SET", _("SET \002\002 \002\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 ¶ms) @@ -116,11 +117,6 @@ class CommandHSSetAll : public Command { SyntaxError(source, "SETALL", _("SETALL \002\002 \002\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 ¶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 ¶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 ¶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 ¶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.cp