diff options
author | Matt Schatz <genius3000@g3k.solutions> | 2019-01-08 03:03:53 -0700 |
---|---|---|
committer | Peter Powell <petpow@saberuk.com> | 2019-01-09 10:07:09 +0000 |
commit | f2e3fd5952b23209b084bde4f464e6643c8a00ff (patch) | |
tree | 67944ae7844377009fdcd2058b8d27d5550f1efa /src/coremods | |
parent | f4041a13c3894e282fb34010f3373d1950136a8c (diff) |
Improve X-line text consistency.
- Change any "-Line", ":Line", or "*line" to "-line" throughout
the X-line code, comments, and documentation.
- Add periods to the end of some notices.
- Correct a typo in the Q-line code comments.
- Update the filter module documentation (shun addition).
Co-authored-by: Robby <robby@chatbelgie.be>
Diffstat (limited to 'src/coremods')
-rw-r--r-- | src/coremods/core_xline/cmd_eline.cpp | 8 | ||||
-rw-r--r-- | src/coremods/core_xline/cmd_gline.cpp | 10 | ||||
-rw-r--r-- | src/coremods/core_xline/cmd_kline.cpp | 10 | ||||
-rw-r--r-- | src/coremods/core_xline/cmd_qline.cpp | 8 | ||||
-rw-r--r-- | src/coremods/core_xline/cmd_zline.cpp | 8 | ||||
-rw-r--r-- | src/coremods/core_xline/core_xline.cpp | 6 | ||||
-rw-r--r-- | src/coremods/core_xline/core_xline.h | 10 |
7 files changed, 30 insertions, 30 deletions
diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp index a3a4d9466..3010e0f61 100644 --- a/src/coremods/core_xline/cmd_eline.cpp +++ b/src/coremods/core_xline/cmd_eline.cpp @@ -50,7 +50,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters) if (ih.first.empty()) { - user->WriteNotice("*** Target not found"); + user->WriteNotice("*** Target not found."); return CMD_FAILURE; } @@ -61,7 +61,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters) unsigned long duration; if (!InspIRCd::Duration(parameters[1], duration)) { - user->WriteNotice("*** Invalid duration for E-line"); + user->WriteNotice("*** Invalid duration for E-line."); return CMD_FAILURE; } ELine* el = new ELine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str()); @@ -82,7 +82,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters) else { delete el; - user->WriteNotice("*** E-Line for " + target + " already exists"); + user->WriteNotice("*** E-line for " + target + " already exists."); } } else @@ -93,7 +93,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters) } else { - user->WriteNotice("*** E-Line " + target + " not found in list, try /stats e"); + user->WriteNotice("*** E-line " + target + " not found in list, try /stats e."); } } diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp index a9de707c4..60dcd714a 100644 --- a/src/coremods/core_xline/cmd_gline.cpp +++ b/src/coremods/core_xline/cmd_gline.cpp @@ -50,7 +50,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters) if (ih.first.empty()) { - user->WriteNotice("*** Target not found"); + user->WriteNotice("*** Target not found."); return CMD_FAILURE; } @@ -60,14 +60,14 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters) else if (target.find('!') != std::string::npos) { - user->WriteNotice("*** G-Line cannot operate on nick!user@host masks"); + user->WriteNotice("*** G-line cannot operate on nick!user@host masks."); return CMD_FAILURE; } unsigned long duration; if (!InspIRCd::Duration(parameters[1], duration)) { - user->WriteNotice("*** Invalid duration for G-line"); + user->WriteNotice("*** Invalid duration for G-line."); return CMD_FAILURE; } GLine* gl = new GLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str()); @@ -90,7 +90,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters) else { delete gl; - user->WriteNotice("** G-Line for " + target + " already exists"); + user->WriteNotice("** G-line for " + target + " already exists."); } } @@ -102,7 +102,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters) } else { - user->WriteNotice("*** G-Line " + target + " not found in list, try /stats g."); + user->WriteNotice("*** G-line " + target + " not found in list, try /stats g."); } } diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp index 9b474d16c..813b9afa6 100644 --- a/src/coremods/core_xline/cmd_kline.cpp +++ b/src/coremods/core_xline/cmd_kline.cpp @@ -50,7 +50,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters) if (ih.first.empty()) { - user->WriteNotice("*** Target not found"); + user->WriteNotice("*** Target not found."); return CMD_FAILURE; } @@ -60,14 +60,14 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters) if (target.find('!') != std::string::npos) { - user->WriteNotice("*** K-Line cannot operate on nick!user@host masks"); + user->WriteNotice("*** K-line cannot operate on nick!user@host masks."); return CMD_FAILURE; } unsigned long duration; if (!InspIRCd::Duration(parameters[1], duration)) { - user->WriteNotice("*** Invalid duration for K-line"); + user->WriteNotice("*** Invalid duration for K-line."); return CMD_FAILURE; } KLine* kl = new KLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str()); @@ -90,7 +90,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters) else { delete kl; - user->WriteNotice("*** K-Line for " + target + " already exists"); + user->WriteNotice("*** K-line for " + target + " already exists."); } } else @@ -101,7 +101,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters) } else { - user->WriteNotice("*** K-Line " + target + " not found in list, try /stats k."); + user->WriteNotice("*** K-line " + target + " not found in list, try /stats k."); } } diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp index 893c8d213..086d860fc 100644 --- a/src/coremods/core_xline/cmd_qline.cpp +++ b/src/coremods/core_xline/cmd_qline.cpp @@ -40,14 +40,14 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters) if (parameters[0].find('@') != std::string::npos || parameters[0].find('!') != std::string::npos || parameters[0].find('.') != std::string::npos) { - user->WriteNotice("*** A Q-Line only bans a nick pattern, not a nick!user@host pattern."); + user->WriteNotice("*** A Q-line only bans a nick pattern, not a nick!user@host pattern."); return CMD_FAILURE; } unsigned long duration; if (!InspIRCd::Duration(parameters[1], duration)) { - user->WriteNotice("*** Invalid duration for Q-line"); + user->WriteNotice("*** Invalid duration for Q-line."); return CMD_FAILURE; } QLine* ql = new QLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); @@ -69,7 +69,7 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters) else { delete ql; - user->WriteNotice("*** Q-Line for " + parameters[0] + " already exists"); + user->WriteNotice("*** Q-line for " + parameters[0] + " already exists."); } } else @@ -80,7 +80,7 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters) } else { - user->WriteNotice("*** Q-Line " + parameters[0] + " not found in list, try /stats q."); + user->WriteNotice("*** Q-line " + parameters[0] + " not found in list, try /stats q."); return CMD_FAILURE; } } diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp index e81fc727f..31030adce 100644 --- a/src/coremods/core_xline/cmd_zline.cpp +++ b/src/coremods/core_xline/cmd_zline.cpp @@ -38,7 +38,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) { if (target.find('!') != std::string::npos) { - user->WriteNotice("*** You cannot include a nickname in a zline, a zline must ban only an IP mask"); + user->WriteNotice("*** You cannot include a nickname in a Z-line, a Z-line must ban only an IP mask."); return CMD_FAILURE; } @@ -65,7 +65,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) unsigned long duration; if (!InspIRCd::Duration(parameters[1], duration)) { - user->WriteNotice("*** Invalid duration for Z-line"); + user->WriteNotice("*** Invalid duration for Z-line."); return CMD_FAILURE; } ZLine* zl = new ZLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr); @@ -87,7 +87,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) else { delete zl; - user->WriteNotice("*** Z-Line for " + std::string(ipaddr) + " already exists"); + user->WriteNotice("*** Z-line for " + std::string(ipaddr) + " already exists."); } } else @@ -98,7 +98,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) } else { - user->WriteNotice("*** Z-Line " + target + " not found in list, try /stats Z."); + user->WriteNotice("*** Z-line " + target + " not found in list, try /stats Z."); return CMD_FAILURE; } } diff --git a/src/coremods/core_xline/core_xline.cpp b/src/coremods/core_xline/core_xline.cpp index ab80ab4ed..aa19bad34 100644 --- a/src/coremods/core_xline/core_xline.cpp +++ b/src/coremods/core_xline/core_xline.cpp @@ -66,16 +66,16 @@ class CoreModXLine : public Module ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE { - // Check Q-Lines (for local nick changes only, remote servers have our Q-Lines to enforce themselves) + // Check Q-lines (for local nick changes only, remote servers have our Q-lines to enforce themselves) XLine* xline = ServerInstance->XLines->MatchesLine("Q", newnick); if (!xline) return MOD_RES_PASSTHRU; // No match - // A Q-Line matched the new nick, tell opers if the user is registered + // A Q-line matched the new nick, tell opers if the user is registered if (user->registered == REG_ALL) { - ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s: %s", + ServerInstance->SNO->WriteGlobalSno('a', "Q-lined nickname %s from %s: %s", newnick.c_str(), user->GetFullRealHost().c_str(), xline->reason.c_str()); } diff --git a/src/coremods/core_xline/core_xline.h b/src/coremods/core_xline/core_xline.h index 1e0bc74cc..c607797f1 100644 --- a/src/coremods/core_xline/core_xline.h +++ b/src/coremods/core_xline/core_xline.h @@ -70,7 +70,7 @@ class InsaneBan class CommandEline : public Command { public: - /** Constructor for eline. + /** Constructor for E-line. */ CommandEline(Module* parent); @@ -87,7 +87,7 @@ class CommandEline : public Command class CommandGline : public Command { public: - /** Constructor for gline. + /** Constructor for G-line. */ CommandGline(Module* parent); @@ -104,7 +104,7 @@ class CommandGline : public Command class CommandKline : public Command { public: - /** Constructor for kline. + /** Constructor for K-line. */ CommandKline(Module* parent); @@ -127,7 +127,7 @@ class CommandQline : public Command }; public: - /** Constructor for qline. + /** Constructor for Q-line. */ CommandQline(Module* parent); @@ -150,7 +150,7 @@ class CommandZline : public Command }; public: - /** Constructor for zline. + /** Constructor for Z-line. */ CommandZline(Module* parent); |