Some more text fixes and improvements (#1618).

[user/henk/code/inspircd.git] / src / modules / m_remove.cpp

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 8d0009d71330baca2816c421a412c102d7cbbadf..850864be2d612435838e3b50f2f21d9a8b8d0b52 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -47,7 +47,7 @@ class RemoveBase : public Command
        {
        }
 
-       CmdResult HandleRMB(const std::vector<std::string>& parameters, User *user, bool fpart)
+       CmdResult HandleRMB(User* user, const CommandBase::Params& parameters,  bool fpart)
        {
                User* target;
                Channel* channel;
@@ -74,21 +74,26 @@ class RemoveBase : public Command
                channel = ServerInstance->FindChan(channame);
 
                /* Fix by brain - someone needs to learn to validate their input! */
-               if ((!target) || (target->registered != REG_ALL) || (!channel))
+               if (!channel)
                {
-                       user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", !channel ? channame.c_str() : username.c_str());
+                       user->WriteNumeric(Numerics::NoSuchChannel(channame));
+                       return CMD_FAILURE;
+               }
+               if ((!target) || (target->registered != REG_ALL))
+               {
+                       user->WriteNumeric(Numerics::NoSuchNick(username));
                        return CMD_FAILURE;
                }
 
                if (!channel->HasUser(target))
                {
-                       user->WriteNotice(InspIRCd::Format("*** The user %s is not on channel %s", target->nick.c_str(), channel->name.c_str()));
+                       user->WriteNotice(InspIRCd::Format("*** User %s is not on channel %s", target->nick.c_str(), channel->name.c_str()));
                        return CMD_FAILURE;
                }
 
                if (target->server->IsULine())
                {
-                       user->WriteNumeric(482, "%s :Only a u-line may remove a u-line from a channel.", channame.c_str());
+                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channame, "Only a U-line may remove a U-line from a channel.");
                        return CMD_FAILURE;
                }
 
@@ -97,7 +102,7 @@ class RemoveBase : public Command
                {
                        /* We'll let everyone remove their level and below, eg:
                         * ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1)
-                        * a ulined target will get a higher level than it's possible for a /remover to get..so they're safe.
+                         a ulined target will get a higher level than it's possible for a /remover to get..so they're safe.
                         * Nobody may remove people with >= protectedrank rank.
                         */
                        unsigned int ulevel = channel->GetPrefixValue(user);
@@ -108,8 +113,8 @@ class RemoveBase : public Command
                                if (!IS_LOCAL(target))
                                {
                                        // Send an ENCAP REMOVE with parameters being in the old <user> <chan> order which is
-                                       // compatible with both 2.0 and 2.2. This also turns FPART into REMOVE.
-                                       std::vector<std::string> p;
+                                       // compatible with both 2.0 and 3.0. This also turns FPART into REMOVE.
+                                       CommandBase::Params p;
                                        p.push_back(target->uuid);
                                        p.push_back(channel->name);
                                        if (parameters.size() > 2)
@@ -130,21 +135,21 @@ class RemoveBase : public Command
                                /* Build up the part reason string. */
                                reason = "Removed by " + user->nick + ": " + reasonparam;
 
-                               channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str());
+                               channel->WriteNotice(InspIRCd::Format("%s removed %s from the channel", user->nick.c_str(), target->nick.c_str()));
                                target->WriteNotice("*** " + user->nick + " removed you from " + channel->name + " with the message: " + reasonparam);
 
                                channel->PartUser(target, reason);
                        }
                        else
                        {
-                               user->WriteNotice(InspIRCd::Format("*** You do not have access to /remove %s from %s", target->nick.c_str(), channel->name.c_str()));
+                               user->WriteNotice(InspIRCd::Format("*** You do not have access to /REMOVE %s from %s", target->nick.c_str(), channel->name.c_str()));
                                return CMD_FAILURE;
                        }
                }
                else
                {
                        /* m_nokicks.so was loaded and +Q was set, block! */
-                       user->WriteNumeric(ERR_RESTRICTED, "%s :Can't remove user %s from channel (nokicks mode is set)", channel->name.c_str(), target->nick.c_str());
+                       user->WriteNumeric(ERR_RESTRICTED, channel->name, InspIRCd::Format("Can't remove user %s from channel (+Q is set)", target->nick.c_str()));
                        return CMD_FAILURE;
                }
 
@@ -160,13 +165,13 @@ 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);
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               return HandleRMB(parameters, user, false);
+               return HandleRMB(user, parameters, false);
        }
 };
 
@@ -178,13 +183,13 @@ 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);
        }
 
-       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               return HandleRMB(parameters, user, true);
+               return HandleRMB(user, parameters, true);
        }
 };
 
@@ -212,12 +217,12 @@ class ModuleRemove : public Module
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("remove");
                supportnokicks = tag->getBool("supportnokicks");
-               cmd1.protectedrank = cmd2.protectedrank = tag->getInt("protectedrank", 50000);
+               cmd1.protectedrank = cmd2.protectedrank = tag->getUInt("protectedrank", 50000);
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR);
+               return Version("Provides the REMOVE command as an alternative to KICK, it makes users appear to have left the channel", VF_OPTCOMMON | VF_VENDOR);
        }
 };