Fix a bunch of weird indentation and spacing issues.

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index d183d0240972d4f47ee7eac234c9ef2ef71725b9..3538052b7a3e4d4310527366853aa659bdcf7530 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
- *   Copyright (C) 2016-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2016-2019, 2021 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 Shawn Smith <ShawnSmith0828@gmail.com>
@@ -388,7 +388,9 @@ void ModeParser::ModeParamsToChangeList(User* user, ModeType type, const std::ve
                if (!mh)
                {
                        /* No mode handler? Unknown mode character then. */
-                       user->WriteNumeric(type == MODETYPE_CHANNEL ? ERR_UNKNOWNMODE : ERR_UNKNOWNSNOMASK, modechar, "is an unknown mode character");
+                       int numeric = (type == MODETYPE_CHANNEL ? ERR_UNKNOWNMODE : ERR_UNKNOWNSNOMASK);
+                       const char* typestr = (type == MODETYPE_CHANNEL ? "channel" : "user");
+                       user->WriteNumeric(numeric, modechar, InspIRCd::Format("is not a recognised %s mode.", typestr));
                        continue;
                }
 
@@ -573,7 +575,7 @@ void ModeParser::CleanMask(std::string &mask)
        else if ((pos_of_pling == std::string::npos) && (pos_of_at != std::string::npos))
        {
                /* Has an @ but no !, its a user@host */
-                mask = "*!" + mask;
+               mask = "*!" + mask;
        }
        else if ((pos_of_pling != std::string::npos) && (pos_of_at == std::string::npos))
        {
@@ -757,9 +759,9 @@ std::string ModeParser::GiveModeList(ModeType mt)
        for (unsigned char mode = 'A'; mode <= 'z'; mode++)
        {
                ModeHandler* mh = modehandlers[mt][mode-65];
-                /* One parameter when adding */
                if (mh)
                {
+                       /* One parameter when adding */
                        if (mh->NeedsParam(true))
                        {
                                PrefixMode* pm = mh->IsPrefixMode();