diff options
Diffstat (limited to 'src')
66 files changed, 87 insertions, 87 deletions
diff --git a/src/coremods/core_channel/cmd_invite.cpp b/src/coremods/core_channel/cmd_invite.cpp index c26318337..732894aa5 100644 --- a/src/coremods/core_channel/cmd_invite.cpp +++ b/src/coremods/core_channel/cmd_invite.cpp @@ -29,7 +29,7 @@ CommandInvite::CommandInvite(Module* parent, Invite::APIImpl& invapiimpl) , invapi(invapiimpl) { Penalty = 4; - syntax = "[<nick> <channel>]"; + syntax = "[<nick> <channel> [<time>]]"; } /** Handle /INVITE diff --git a/src/coremods/core_channel/cmd_join.cpp b/src/coremods/core_channel/cmd_join.cpp index 2caed9dc6..0e783d2b3 100644 --- a/src/coremods/core_channel/cmd_join.cpp +++ b/src/coremods/core_channel/cmd_join.cpp @@ -24,7 +24,7 @@ CommandJoin::CommandJoin(Module* parent) : SplitCommand(parent, "JOIN", 1, 2) { - syntax = "<channel>{,<channel>} {<key>{,<key>}}"; + syntax = "<channel>[,<channel>]+ [<key>[,<key>]+]"; Penalty = 2; } diff --git a/src/coremods/core_channel/cmd_kick.cpp b/src/coremods/core_channel/cmd_kick.cpp index 755c6613b..77ac36a66 100644 --- a/src/coremods/core_channel/cmd_kick.cpp +++ b/src/coremods/core_channel/cmd_kick.cpp @@ -24,7 +24,7 @@ CommandKick::CommandKick(Module* parent) : Command(parent, "KICK", 2, 3) { - syntax = "<channel> <nick>{,<nick>} [<reason>]"; + syntax = "<channel> <nick>[,<nick>]+ [:<reason>]"; } /** Handle /KICK @@ -65,7 +65,7 @@ CmdResult CommandKick::Handle(User* user, const Params& parameters) if (u->server->IsULine()) { - user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, "You may not kick a u-lined client"); + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, "You may not kick a U-lined client"); return CMD_FAILURE; } } diff --git a/src/coremods/core_channel/cmd_names.cpp b/src/coremods/core_channel/cmd_names.cpp index 28273c903..a179cf9dc 100644 --- a/src/coremods/core_channel/cmd_names.cpp +++ b/src/coremods/core_channel/cmd_names.cpp @@ -27,7 +27,7 @@ CommandNames::CommandNames(Module* parent) , privatemode(parent, "private") , invisiblemode(parent, "invisible") { - syntax = "{<channel>{,<channel>}}"; + syntax = "<channel>[,<channel>]+"; } /** Handle /NAMES diff --git a/src/coremods/core_channel/cmd_topic.cpp b/src/coremods/core_channel/cmd_topic.cpp index 0417f1a0c..f0af2a0ad 100644 --- a/src/coremods/core_channel/cmd_topic.cpp +++ b/src/coremods/core_channel/cmd_topic.cpp @@ -29,7 +29,7 @@ CommandTopic::CommandTopic(Module* parent) , secretmode(parent, "secret") , topiclockmode(parent, "topiclock") { - syntax = "<channel> [<topic>]"; + syntax = "<channel> [:<topic>]"; Penalty = 2; } diff --git a/src/coremods/core_ison.cpp b/src/coremods/core_ison.cpp index 3f6b1ac74..ec097f1c6 100644 --- a/src/coremods/core_ison.cpp +++ b/src/coremods/core_ison.cpp @@ -30,7 +30,7 @@ class CommandIson : public SplitCommand CommandIson(Module* parent) : SplitCommand(parent, "ISON", 1) { - syntax = "<nick> {nick}"; + syntax = "<nick> [<nick>]+"; } /** Handle command. * @param parameters The parameters to the command diff --git a/src/coremods/core_message.cpp b/src/coremods/core_message.cpp index 8a7499f1d..65eaa1bb7 100644 --- a/src/coremods/core_message.cpp +++ b/src/coremods/core_message.cpp @@ -303,7 +303,7 @@ class CommandMessage : public Command , moderatedmode(parent, "moderated") , noextmsgmode(parent, "noextmsg") { - syntax = "<target>{,<target>} <message>"; + syntax = "<target>[,<target>]+ :<message>"; } /** Handle command. @@ -357,7 +357,7 @@ class CommandSQuery : public SplitCommand CommandSQuery(Module* Creator) : SplitCommand(Creator, "SQUERY", 2, 2) { - syntax = "<service> <message>"; + syntax = "<service> :<message>"; } CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE @@ -398,7 +398,7 @@ class CommandSQuery : public SplitCommand if (!FirePreEvents(user, msgtarget, msgdetails)) return CMD_FAILURE; - // The SQUERY command targets a service on a u-lined server. This can never + // The SQUERY command targets a service on a U-lined server. This can never // be on the server local to the source so we don't need to do any routing // logic and can forward it as a PRIVMSG. diff --git a/src/coremods/core_oper/cmd_die.cpp b/src/coremods/core_oper/cmd_die.cpp index 724db2f32..73c590711 100644 --- a/src/coremods/core_oper/cmd_die.cpp +++ b/src/coremods/core_oper/cmd_die.cpp @@ -27,7 +27,7 @@ CommandDie::CommandDie(Module* parent, std::string& hashref) , hash(hashref) { flags_needed = 'o'; - syntax = "<server>"; + syntax = "<servername>"; } void DieRestart::SendError(const std::string& message) diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp index bdf08f194..01179d61d 100644 --- a/src/coremods/core_oper/cmd_kill.cpp +++ b/src/coremods/core_oper/cmd_kill.cpp @@ -27,7 +27,7 @@ CommandKill::CommandKill(Module* parent) , protoev(parent, name) { flags_needed = 'o'; - syntax = "<nickname> <reason>"; + syntax = "<nick>[,<nick>]+ :<reason>"; TRANSLATE2(TR_CUSTOM, TR_CUSTOM); } diff --git a/src/coremods/core_oper/cmd_restart.cpp b/src/coremods/core_oper/cmd_restart.cpp index afadb911a..a96993e7e 100644 --- a/src/coremods/core_oper/cmd_restart.cpp +++ b/src/coremods/core_oper/cmd_restart.cpp @@ -26,7 +26,7 @@ CommandRestart::CommandRestart(Module* parent, std::string& hashref) , hash(hashref) { flags_needed = 'o'; - syntax = "<server>"; + syntax = "<servername>"; } CmdResult CommandRestart::Handle(User* user, const Params& parameters) diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp index 6576aa514..918d59ab7 100644 --- a/src/coremods/core_stats.cpp +++ b/src/coremods/core_stats.cpp @@ -44,7 +44,7 @@ class CommandStats : public Command , statsevprov(Creator, "event/stats") { allow_empty_last_param = false; - syntax = "<stats-symbol> [<servername>]"; + syntax = "<symbol> [<servername>]"; } /** Handle command. diff --git a/src/coremods/core_stub.cpp b/src/coremods/core_stub.cpp index e4f18cb22..06e033f15 100644 --- a/src/coremods/core_stub.cpp +++ b/src/coremods/core_stub.cpp @@ -40,7 +40,7 @@ class CommandConnect : public Command : Command(parent, "CONNECT", 1) { flags_needed = 'o'; - syntax = "<servername>"; + syntax = "<servermask>"; } /** Handle command. @@ -126,7 +126,7 @@ class CommandSquit : public Command : Command(parent, "SQUIT", 1, 2) { flags_needed = 'o'; - syntax = "<servername>"; + syntax = "<servermask>"; } /** Handle command. diff --git a/src/coremods/core_user/cmd_away.cpp b/src/coremods/core_user/cmd_away.cpp index 50a586392..834e8711d 100644 --- a/src/coremods/core_user/cmd_away.cpp +++ b/src/coremods/core_user/cmd_away.cpp @@ -33,7 +33,7 @@ CommandAway::CommandAway(Module* parent) , awayevprov(parent) { allow_empty_last_param = false; - syntax = "[<message>]"; + syntax = "[:<message>]"; } /** Handle /AWAY diff --git a/src/coremods/core_user/cmd_mode.cpp b/src/coremods/core_user/cmd_mode.cpp index ffeb9a2e3..f58a41aa4 100644 --- a/src/coremods/core_user/cmd_mode.cpp +++ b/src/coremods/core_user/cmd_mode.cpp @@ -26,7 +26,7 @@ CommandMode::CommandMode(Module* parent) : Command(parent, "MODE", 1) , seq(0) { - syntax = "<target> <modes> {<mode-parameters>}"; + syntax = "<target> [[(+|-)]<modes> [<mode-parameters>]]"; memset(&sent, 0, sizeof(sent)); } diff --git a/src/coremods/core_user/cmd_part.cpp b/src/coremods/core_user/cmd_part.cpp index 2bc431ab3..9400eed93 100644 --- a/src/coremods/core_user/cmd_part.cpp +++ b/src/coremods/core_user/cmd_part.cpp @@ -25,7 +25,7 @@ CommandPart::CommandPart(Module* parent) : Command(parent, "PART", 1, 2) { Penalty = 5; - syntax = "<channel>{,<channel>} [<reason>]"; + syntax = "<channel>[,<channel>]+ [:<reason>]"; } CmdResult CommandPart::Handle(User* user, const Params& parameters) diff --git a/src/coremods/core_user/cmd_quit.cpp b/src/coremods/core_user/cmd_quit.cpp index d919a5761..74781a98e 100644 --- a/src/coremods/core_user/cmd_quit.cpp +++ b/src/coremods/core_user/cmd_quit.cpp @@ -26,7 +26,7 @@ CommandQuit::CommandQuit(Module* parent) , operquit("operquit", ExtensionItem::EXT_USER, parent) { works_before_reg = true; - syntax = "[<message>]"; + syntax = "[:<message>]"; } CmdResult CommandQuit::Handle(User* user, const Params& parameters) diff --git a/src/coremods/core_user/cmd_user.cpp b/src/coremods/core_user/cmd_user.cpp index 1a8b091f3..89b173909 100644 --- a/src/coremods/core_user/cmd_user.cpp +++ b/src/coremods/core_user/cmd_user.cpp @@ -33,7 +33,7 @@ CommandUser::CommandUser(Module* parent) allow_empty_last_param = false; works_before_reg = true; Penalty = 0; - syntax = "<username> <localhost> <remotehost> <realname>"; + syntax = "<username> <unused> <unused> :<realname>"; } CmdResult CommandUser::HandleLocal(LocalUser* user, const Params& parameters) diff --git a/src/coremods/core_userhost.cpp b/src/coremods/core_userhost.cpp index 542c1831d..e21e7d95b 100644 --- a/src/coremods/core_userhost.cpp +++ b/src/coremods/core_userhost.cpp @@ -33,7 +33,7 @@ class CommandUserhost : public Command : Command(parent,"USERHOST", 1) , hideopermode(parent, "hideoper") { - syntax = "<nick> [<nick> ...]"; + syntax = "<nick> [<nick>]+"; } /** Handle command. * @param parameters The parameters to the command diff --git a/src/coremods/core_wallops.cpp b/src/coremods/core_wallops.cpp index 6b055f874..09fafd244 100644 --- a/src/coremods/core_wallops.cpp +++ b/src/coremods/core_wallops.cpp @@ -36,7 +36,7 @@ class CommandWallops : public Command , protoevprov(parent, name) { flags_needed = 'o'; - syntax = "<any-text>"; + syntax = ":<message>"; } /** Handle command. diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp index b5f9163e1..bf00b741f 100644 --- a/src/coremods/core_who.cpp +++ b/src/coremods/core_who.cpp @@ -143,7 +143,7 @@ class CommandWho : public SplitCommand , whoevprov(parent, "event/who") { allow_empty_last_param = false; - syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [[Aafhilmnoprstux][%acdfhilnorstu] <server>|<nickname>|<channel>|<realname>|<host>|0]"; + syntax = "<server>|<nick>|<channel>|<realname>|<host>|0 [[Aafhilmnoprstux][%acdfhilnorstu] <server>|<nick>|<channel>|<realname>|<host>|0]"; } /** Sends a WHO reply to a user. */ diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp index 880e5a533..199c9e2ac 100644 --- a/src/coremods/core_whois.cpp +++ b/src/coremods/core_whois.cpp @@ -107,7 +107,7 @@ class CommandWhois : public SplitCommand , lineevprov(parent, "event/whoisline") { Penalty = 2; - syntax = "<nick>{,<nick>}"; + syntax = "[<servername>] <nick>[,<nick>]+"; } /** Handle command. diff --git a/src/coremods/core_whowas.cpp b/src/coremods/core_whowas.cpp index 65c83e08b..80c87357c 100644 --- a/src/coremods/core_whowas.cpp +++ b/src/coremods/core_whowas.cpp @@ -37,7 +37,7 @@ enum CommandWhowas::CommandWhowas( Module* parent) : Command(parent, "WHOWAS", 1) { - syntax = "<nick>{,<nick>}"; + syntax = "<nick>"; Penalty = 2; } diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp index 4700e9fd2..99794be3e 100644 --- a/src/coremods/core_xline/cmd_eline.cpp +++ b/src/coremods/core_xline/cmd_eline.cpp @@ -26,7 +26,7 @@ CommandEline::CommandEline(Module* parent) : Command(parent, "ELINE", 1, 3) { flags_needed = 'o'; - syntax = "<ident@host> [<duration> :<reason>]"; + syntax = "<user@host> [<duration> :<reason>]"; } /** Handle /ELINE diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp index 413da97b1..ae1ea5d6e 100644 --- a/src/coremods/core_xline/cmd_gline.cpp +++ b/src/coremods/core_xline/cmd_gline.cpp @@ -26,7 +26,7 @@ CommandGline::CommandGline(Module* parent) : Command(parent, "GLINE", 1, 3) { flags_needed = 'o'; - syntax = "<ident@host> [<duration> :<reason>]"; + syntax = "<user@host> [<duration> :<reason>]"; } /** Handle /GLINE diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp index 6499b6b00..ad7511d56 100644 --- a/src/coremods/core_xline/cmd_kline.cpp +++ b/src/coremods/core_xline/cmd_kline.cpp @@ -26,7 +26,7 @@ CommandKline::CommandKline(Module* parent) : Command(parent, "KLINE", 1, 3) { flags_needed = 'o'; - syntax = "<ident@host> [<duration> :<reason>]"; + syntax = "<user@host> [<duration> :<reason>]"; } /** Handle /KLINE diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp index 0b2ef99bb..51f5bec16 100644 --- a/src/coremods/core_xline/cmd_qline.cpp +++ b/src/coremods/core_xline/cmd_qline.cpp @@ -27,7 +27,7 @@ CommandQline::CommandQline(Module* parent) : Command(parent, "QLINE", 1, 3) { flags_needed = 'o'; - syntax = "<nick> [<duration> :<reason>]"; + syntax = "<nickmask> [<duration> :<reason>]"; } CmdResult CommandQline::Handle(User* user, const Params& parameters) diff --git a/src/mode.cpp b/src/mode.cpp index 50dd05d2d..6f17d3896 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -592,13 +592,13 @@ void ModeParser::AddMode(ModeHandler* mh) PrefixMode* otherpm = FindPrefix(pm->GetPrefix()); if (otherpm) - throw ModuleException(InspIRCd::Format("Mode prefix for %s already by used by %s from %s: %c", + throw ModuleException(InspIRCd::Format("Mode prefix for %s already used by %s from %s: %c", mh->name.c_str(), otherpm->name.c_str(), otherpm->creator->ModuleSourceFile.c_str(), pm->GetPrefix())); } ModeHandler*& slot = modehandlers[mh->GetModeType()][mh->GetModeChar()-65]; if (slot) - throw ModuleException(InspIRCd::Format("Mode letter for %s already by used by %s from %s: %c", + throw ModuleException(InspIRCd::Format("Mode letter for %s already used by %s from %s: %c", mh->name.c_str(), slot->name.c_str(), slot->creator->ModuleSourceFile.c_str(), mh->GetModeChar())); // The mode needs an id if it is either a user mode, a simple mode (flag) or a parameter mode. diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 3810fcf32..49143034f 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -179,7 +179,7 @@ public: extInfo(Creator) { allow_empty_last_param = false; - syntax = "*|(+|-)<nick>[,(+|-)<nick> ...]"; + syntax = "*|(+|-)<nick>[,(+|-)<nick>]+"; TRANSLATE1(TR_CUSTOM); } @@ -189,7 +189,7 @@ public: if (parameter.find(',') != std::string::npos) return; - // Convert a [+|-]<nick> into a [-]<uuid> + // Convert a (+|-)<nick> into a [-]<uuid> ACCEPTAction action = GetTargetAndAction(parameter); if (!action.first) return; diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 8d08de9d9..ae49dbc05 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -88,7 +88,7 @@ class CommandCBan : public Command public: CommandCBan(Module* Creator) : Command(Creator, "CBAN", 1, 3) { - flags_needed = 'o'; this->syntax = "<channel> [<duration> :<reason>]"; + flags_needed = 'o'; this->syntax = "<channel> [<duration> [:<reason>]]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 4c89ad894..d80719c17 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -132,7 +132,7 @@ class CommandWebIRC : public SplitCommand { allow_empty_last_param = false; works_before_reg = true; - this->syntax = "<password> <gateway> <hostname> <ip> [flags]"; + this->syntax = "<password> <gateway> <hostname> <ip> [<flags>]"; } CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 58e71aadc..6447ef9e3 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -146,7 +146,7 @@ class CommandCheck : public Command : Command(parent,"CHECK", 1) , snomaskmode(parent, "snomask") { - flags_needed = 'o'; syntax = "<nickname>|<ip>|<hostmask>|<channel> <server>"; + flags_needed = 'o'; syntax = "<nick>|<ipmask>|<hostmask>|<channel> [<servername>]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index 6e498a8be..af6e09aaf 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -33,7 +33,7 @@ class CommandChghost : public Command { allow_empty_last_param = false; flags_needed = 'o'; - syntax = "<nick> <newhost>"; + syntax = "<nick> <host>"; TRANSLATE2(TR_NICK, TR_TEXT); } diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index 9a2d3b2ea..6ddda7ea1 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -31,7 +31,7 @@ class CommandChgident : public Command { allow_empty_last_param = false; flags_needed = 'o'; - syntax = "<nick> <newident>"; + syntax = "<nick> <ident>"; TRANSLATE2(TR_NICK, TR_TEXT); } diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index aedd75d94..108c988cc 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -29,7 +29,7 @@ class CommandChgname : public Command { allow_empty_last_param = false; flags_needed = 'o'; - syntax = "<nick> <new real name>"; + syntax = "<nick> :<realname>"; TRANSLATE2(TR_NICK, TR_TEXT); } diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp index dec49866c..096ce6022 100644 --- a/src/modules/m_clearchan.cpp +++ b/src/modules/m_clearchan.cpp @@ -28,7 +28,7 @@ class CommandClearChan : public Command CommandClearChan(Module* Creator) : Command(Creator, "CLEARCHAN", 1, 3) { - syntax = "<channel> [<KILL|KICK|G|Z>] [<reason>]"; + syntax = "<channel> [KILL|KICK|G|Z] [:<reason>]"; flags_needed = 'o'; // Stop the linking mod from forwarding ENCAP'd CLEARCHAN commands, see below why diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 2dd378062..da88d1759 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -74,7 +74,7 @@ class CommandTitle : public Command CommandTitle(Module* Creator) : Command(Creator,"TITLE", 2), ctitle("ctitle", ExtensionItem::EXT_USER, Creator) { - syntax = "<user> <password>"; + syntax = "<username> <password>"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp index 3ead72a45..57c8ea3b2 100644 --- a/src/modules/m_cycle.cpp +++ b/src/modules/m_cycle.cpp @@ -28,7 +28,7 @@ class CommandCycle : public SplitCommand CommandCycle(Module* Creator) : SplitCommand(Creator, "CYCLE", 1) { - Penalty = 3; syntax = "<channel> :[reason]"; + Penalty = 3; syntax = "<channel> [:<reason>]"; } CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index d9e26d28f..f0a88022c 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -54,7 +54,7 @@ static const char* const helptext[] = "Brain would then be able to send you files. They would have to", "resend the file again if the server gave them an error message", "before you added them to your DCCALLOW list.", - "DCCALLOW entries will be temporary by default, if you want to add", + "DCCALLOW entries will be temporary. If you want to add", "them to your DCCALLOW list until you leave IRC, type:", "/DCCALLOW +Brain 0", "To remove the user from your DCCALLOW list, type:", @@ -63,7 +63,7 @@ static const char* const helptext[] = "/DCCALLOW LIST", "NOTE: If the user leaves IRC or changes their nickname", " they will be removed from your DCCALLOW list.", - " your DCCALLOW list will be deleted when you leave IRC." + " Your DCCALLOW list will be deleted when you leave IRC." }; class BannedFileList @@ -117,7 +117,7 @@ class CommandDccallow : public Command CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - /* syntax: DCCALLOW [+|-]<nick> (<time>) */ + /* syntax: DCCALLOW [(+|-)<nick> [<time>]]|[LIST|HELP] */ if (!parameters.size()) { // display current DCCALLOW list diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index c0ce025bd..adc1b59ff 100644 --- a/src/modules/m_globalload.cpp +++ b/src/modules/m_globalload.cpp @@ -32,7 +32,7 @@ class CommandGloadmodule : public Command CommandGloadmodule(Module* Creator) : Command(Creator,"GLOADMODULE", 1) { flags_needed = 'o'; - syntax = "<modulename> [servermask]"; + syntax = "<modulename> [<servermask>]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE @@ -71,7 +71,7 @@ class CommandGunloadmodule : public Command CommandGunloadmodule(Module* Creator) : Command(Creator,"GUNLOADMODULE", 1) { flags_needed = 'o'; - syntax = "<modulename> [servermask]"; + syntax = "<modulename> [<servermask>]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE @@ -122,7 +122,7 @@ class CommandGreloadmodule : public Command public: CommandGreloadmodule(Module* Creator) : Command(Creator, "GRELOADMODULE", 1) { - flags_needed = 'o'; syntax = "<modulename> [servermask]"; + flags_needed = 'o'; syntax = "<modulename> [<servermask>]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp index b98adce35..0102b3b57 100644 --- a/src/modules/m_globops.cpp +++ b/src/modules/m_globops.cpp @@ -30,7 +30,7 @@ class CommandGlobops : public Command public: CommandGlobops(Module* Creator) : Command(Creator,"GLOBOPS", 1,1) { - flags_needed = 'o'; syntax = "<any-text>"; + flags_needed = 'o'; syntax = ":<message>"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index 1b66e01a4..435f30d59 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -46,7 +46,7 @@ class CommandKnock : public Command , noknockmode(Noknockmode) , inviteonlymode(Creator, "inviteonly") { - syntax = "<channel> <reason>"; + syntax = "<channel> :<reason>"; Penalty = 5; } diff --git a/src/modules/m_modenotice.cpp b/src/modules/m_modenotice.cpp index 5311015b7..59e0e8dc1 100644 --- a/src/modules/m_modenotice.cpp +++ b/src/modules/m_modenotice.cpp @@ -24,7 +24,7 @@ class CommandModeNotice : public Command public: CommandModeNotice(Module* parent) : Command(parent,"MODENOTICE",2,2) { - syntax = "<modes> <message>"; + syntax = "<modeletters> :<message>"; flags_needed = 'o'; } diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp index fd72c7320..b82dbcc7d 100644 --- a/src/modules/m_monitor.cpp +++ b/src/modules/m_monitor.cpp @@ -316,7 +316,7 @@ class CommandMonitor : public SplitCommand { Penalty = 2; allow_empty_last_param = false; - syntax = "[C|L|S|+ <nick1>[,<nick2>]|- <nick1>[,<nick2>]"; + syntax = "C|L|S|(+|-) <nick>[,<nick>]+"; } CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp index 8872ba629..3c8452e7b 100644 --- a/src/modules/m_namedmodes.cpp +++ b/src/modules/m_namedmodes.cpp @@ -56,7 +56,7 @@ class CommandProp : public SplitCommand CommandProp(Module* parent) : SplitCommand(parent, "PROP", 1) { - syntax = "<user|channel> {[+-]<mode> [<value>]}*"; + syntax = "<channel> [[(+|-)]<mode> [<value>]]"; } CmdResult HandleLocal(LocalUser* src, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 964ed9780..86cf6245a 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -40,7 +40,7 @@ class CommandNicklock : public Command locked(ext) { flags_needed = 'o'; - syntax = "<oldnick> <newnick>"; + syntax = "<nick> <newnick>"; TRANSLATE2(TR_NICK, TR_TEXT); } @@ -100,7 +100,7 @@ class CommandNickunlock : public Command locked(ext) { flags_needed = 'o'; - syntax = "<locked-nick>"; + syntax = "<nick>"; TRANSLATE1(TR_NICK); } diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp index 137ddb96c..696c4fe6d 100644 --- a/src/modules/m_password_hash.cpp +++ b/src/modules/m_password_hash.cpp @@ -28,7 +28,7 @@ class CommandMkpasswd : public Command public: CommandMkpasswd(Module* Creator) : Command(Creator, "MKPASSWD", 2) { - syntax = "<hashtype> <any-text>"; + syntax = "<hashtype> <plaintext>"; Penalty = 5; } diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 8d60ff8c6..357b2ea41 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -165,7 +165,7 @@ class CommandRemove : public RemoveBase CommandRemove(Module* Creator, bool& snk, ChanModeReference& nkm) : RemoveBase(Creator, snk, nkm, "REMOVE") { - syntax = "<channel> <nick> [<reason>]"; + syntax = "<channel> <nick> [:<reason>]"; TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT); } @@ -183,7 +183,7 @@ class CommandFpart : public RemoveBase CommandFpart(Module* Creator, bool& snk, ChanModeReference& nkm) : RemoveBase(Creator, snk, nkm, "FPART") { - syntax = "<channel> <nick> [<reason>]"; + syntax = "<channel> <nick> [:<reason>]"; TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT); } diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp index a8dd49e2d..89df1814c 100644 --- a/src/modules/m_repeat.cpp +++ b/src/modules/m_repeat.cpp @@ -141,14 +141,14 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> > if (!ParseSettings(source, parameter, settings)) { source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, - "Invalid repeat syntax. Syntax is {[~*]}[lines]:[time]{:[difference]}{:[backlog]}.")); + "Invalid repeat syntax. Syntax is: [~|*]<lines>:<sec>[:<difference>][:<backlog>]")); return MODEACTION_DENY; } if ((settings.Backlog > 0) && (settings.Lines > settings.Backlog)) { source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, - "Invalid repeat syntax. You can't set needed lines higher than backlog.")); + "Invalid repeat syntax. You can't set lines higher than backlog.")); return MODEACTION_DENY; } @@ -319,7 +319,7 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> > if (ms.MaxSecs && settings.Seconds > ms.MaxSecs) { source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, InspIRCd::Format( - "Invalid repeat parameter. The seconds you specified is too great. Maximum allowed is %u.", ms.MaxSecs))); + "Invalid repeat parameter. The seconds you specified are too great. Maximum allowed is %u.", ms.MaxSecs))); return false; } diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 1eb2d8ac3..353a184aa 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -137,7 +137,7 @@ class CommandRLine : public Command public: CommandRLine(Module* Creator, RLineFactory& rlf) : Command(Creator,"RLINE", 1, 3), factory(rlf) { - flags_needed = 'o'; this->syntax = "<regex> [<rline-duration>] :<reason>"; + flags_needed = 'o'; this->syntax = "<regex> [<duration> :<reason>]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp index ce28630b4..7db988b60 100644 --- a/src/modules/m_rmode.cpp +++ b/src/modules/m_rmode.cpp @@ -28,7 +28,7 @@ class CommandRMode : public Command CommandRMode(Module* Creator) : Command(Creator,"RMODE", 2, 3) { allow_empty_last_param = false; - syntax = "<channel> <mode> [pattern]"; + syntax = "<channel> <mode> [<pattern>]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index 9aa8837e0..f506a2e1c 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -29,7 +29,7 @@ class CommandSajoin : public Command CommandSajoin(Module* Creator) : Command(Creator,"SAJOIN", 1) { allow_empty_last_param = false; - flags_needed = 'o'; syntax = "[<nick>] <channel>[,<channel>]"; + flags_needed = 'o'; syntax = "[<nick>] <channel>[,<channel>]+"; TRANSLATE2(TR_NICK, TR_TEXT); } @@ -53,7 +53,7 @@ class CommandSajoin : public Command if (dest->server->IsULine()) { - user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a u-lined client"); + user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client"); return CMD_FAILURE; } if (IS_LOCAL(user) && !ServerInstance->IsChannel(channel)) diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp index 6a9e11fe7..2970596af 100644 --- a/src/modules/m_sakick.cpp +++ b/src/modules/m_sakick.cpp @@ -27,7 +27,7 @@ class CommandSakick : public Command public: CommandSakick(Module* Creator) : Command(Creator,"SAKICK", 2, 3) { - flags_needed = 'o'; syntax = "<channel> <nick> [reason]"; + flags_needed = 'o'; syntax = "<channel> <nick> [:<reason>]"; TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT); } @@ -42,7 +42,7 @@ class CommandSakick : public Command if (dest->server->IsULine()) { - user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a u-lined client"); + user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client"); return CMD_FAILURE; } diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp index 634464ac2..322ee91b8 100644 --- a/src/modules/m_samode.cpp +++ b/src/modules/m_samode.cpp @@ -33,7 +33,7 @@ class CommandSamode : public Command CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2) { allow_empty_last_param = false; - flags_needed = 'o'; syntax = "<target> <modes> {<mode-parameters>}"; + flags_needed = 'o'; syntax = "<target> (+|-)<modes> [<mode-parameters>]"; active = false; } diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp index 4744ca1de..e814e2c4e 100644 --- a/src/modules/m_sanick.cpp +++ b/src/modules/m_sanick.cpp @@ -29,7 +29,7 @@ class CommandSanick : public Command CommandSanick(Module* Creator) : Command(Creator,"SANICK", 2) { allow_empty_last_param = false; - flags_needed = 'o'; syntax = "<nick> <new-nick>"; + flags_needed = 'o'; syntax = "<nick> <newnick>"; TRANSLATE2(TR_NICK, TR_TEXT); } @@ -42,7 +42,7 @@ class CommandSanick : public Command { if (target && target->server->IsULine()) { - user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a u-lined client"); + user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client"); return CMD_FAILURE; } diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index 0cd82fa15..4f7bfdb1f 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -28,7 +28,7 @@ class CommandSapart : public Command public: CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3) { - flags_needed = 'o'; syntax = "<nick> <channel>[,<channel>] [reason]"; + flags_needed = 'o'; syntax = "<nick> <channel>[,<channel>]+ [:<reason>]"; TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT); } @@ -48,7 +48,7 @@ class CommandSapart : public Command if (dest->server->IsULine()) { - user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a u-lined client"); + user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client"); return CMD_FAILURE; } diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp index 9034016d2..648528876 100644 --- a/src/modules/m_saquit.cpp +++ b/src/modules/m_saquit.cpp @@ -28,7 +28,7 @@ class CommandSaquit : public Command public: CommandSaquit(Module* Creator) : Command(Creator, "SAQUIT", 2, 2) { - flags_needed = 'o'; syntax = "<nick> <reason>"; + flags_needed = 'o'; syntax = "<nick> :<reason>"; TRANSLATE2(TR_NICK, TR_TEXT); } @@ -39,7 +39,7 @@ class CommandSaquit : public Command { if (dest->server->IsULine()) { - user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a u-lined client"); + user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client"); return CMD_FAILURE; } diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp index 8c8629221..b3aec8592 100644 --- a/src/modules/m_satopic.cpp +++ b/src/modules/m_satopic.cpp @@ -26,7 +26,7 @@ class CommandSATopic : public Command public: CommandSATopic(Module* Creator) : Command(Creator,"SATOPIC", 2, 2) { - flags_needed = 'o'; syntax = "<target> <topic>"; + flags_needed = 'o'; syntax = "<channel> :<topic>"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp index 87eed4022..bb8514add 100644 --- a/src/modules/m_sethost.cpp +++ b/src/modules/m_sethost.cpp @@ -32,7 +32,7 @@ class CommandSethost : public Command : Command(Creator,"SETHOST", 1) { allow_empty_last_param = false; - flags_needed = 'o'; syntax = "<new-hostname>"; + flags_needed = 'o'; syntax = "<host>"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp index 11ce8f015..79e168332 100644 --- a/src/modules/m_setident.cpp +++ b/src/modules/m_setident.cpp @@ -30,7 +30,7 @@ class CommandSetident : public Command CommandSetident(Module* Creator) : Command(Creator,"SETIDENT", 1) { allow_empty_last_param = false; - flags_needed = 'o'; syntax = "<new-ident>"; + flags_needed = 'o'; syntax = "<ident>"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp index 5c27a655e..b0e76f587 100644 --- a/src/modules/m_setname.cpp +++ b/src/modules/m_setname.cpp @@ -30,7 +30,7 @@ class CommandSetname : public Command CommandSetname(Module* Creator) : Command(Creator,"SETNAME", 1, 1) { allow_empty_last_param = false; - syntax = "<new real name>"; + syntax = ":<realname>"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index cd2743ab0..e54156da6 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -53,7 +53,7 @@ class CommandShun : public Command public: CommandShun(Module* Creator) : Command(Creator, "SHUN", 1, 3) { - flags_needed = 'o'; this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>"; + flags_needed = 'o'; this->syntax = "<nick!user@host> [<duration> :<reason>]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 165e083bb..dc703f9b0 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -24,7 +24,7 @@ #include "inspircd.h" /* Improved drop-in replacement for the /SILENCE command - * syntax: /SILENCE [+|-]<mask> <p|c|i|n|t|a|x> as in <privatemessage|channelmessage|invites|privatenotice|channelnotice|all|exclude> + * syntax: /SILENCE [(+|-)<mask> [p|c|i|n|t|a|x]] as in [privatemessages|channelmessages|invites|privatenotices|channelnotices|all|exclude] * * example that blocks all except private messages * /SILENCE +*!*@* a @@ -74,7 +74,7 @@ class CommandSVSSilence : public Command public: CommandSVSSilence(Module* Creator) : Command(Creator,"SVSSILENCE", 2) { - syntax = "<target> {[+|-]<mask> <p|c|i|n|t|a|x>}"; + syntax = "<target> (+|-)<mask> [p|c|i|n|t|a|x]"; TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT); } @@ -119,7 +119,7 @@ class CommandSilence : public Command , ext("silence_list", ExtensionItem::EXT_USER, Creator) { allow_empty_last_param = false; - syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}"; + syntax = "[(+|-)<mask> [p|c|i|n|t|a|x]]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp index 7ede80b4c..7edb9501a 100644 --- a/src/modules/m_spanningtree/rsquit.cpp +++ b/src/modules/m_spanningtree/rsquit.cpp @@ -29,7 +29,7 @@ CommandRSQuit::CommandRSQuit(Module* Creator) : Command(Creator, "RSQUIT", 1) { flags_needed = 'o'; - syntax = "<target-server-mask> [reason]"; + syntax = "<target-server-mask> [:<reason>]"; } CmdResult CommandRSQuit::Handle(User* user, const Params& parameters) diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index 73fde6582..daffdf7d9 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -96,7 +96,7 @@ class CommandSvshold : public Command public: CommandSvshold(Module* Creator) : Command(Creator, "SVSHOLD", 1) { - flags_needed = 'o'; this->syntax = "<nickname> [<duration> :<reason>]"; + flags_needed = 'o'; this->syntax = "<nick> [<duration> :<reason>]"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp index c64f53684..54b2808b9 100644 --- a/src/modules/m_userip.cpp +++ b/src/modules/m_userip.cpp @@ -28,7 +28,7 @@ class CommandUserip : public Command public: CommandUserip(Module* Creator) : Command(Creator,"USERIP", 1) { - syntax = "<nick> [<nick> ...]"; + syntax = "<nick> [<nick>]+"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index 8b84132b2..385ec9e02 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -133,7 +133,7 @@ class CommandWatch : public SplitCommand , manager(managerref) { allow_empty_last_param = false; - syntax = "[<C|L|S|l|+<nick1>|-<nick>>]"; + syntax = "C|L|l|S|(+|-)<nick> [(+|-)<nick>]+"; } CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE |