Fix linking servers that are using the nationalchars module.

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

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index cf623c4abdd2e1c12c1d0553f9b65e8af4afb356..8d6c70092273ba5bdbde27404a92ca75706f6db2 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -21,6 +21,16 @@
 
 #include "inspircd.h"
 
+enum
+{
+       // From UnrealIRCd.
+       ERR_CANNOTKNOCK = 480,
+
+       // From ircd-ratbox.
+       ERR_CHANOPEN = 713,
+       ERR_KNOCKONCHAN = 714
+};
+
 /** Handles the /KNOCK command
  */
 class CommandKnock : public Command
@@ -36,16 +46,16 @@ class CommandKnock : public Command
                , noknockmode(Noknockmode)
                , inviteonlymode(Creator, "inviteonly")
        {
-               syntax = "<channel> <reason>";
+               syntax = "<channel> :<reason>";
                Penalty = 5;
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                Channel* c = ServerInstance->FindChan(parameters[0]);
                if (!c)
                {
-                       user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+                       user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
                        return CMD_FAILURE;
                }
 
@@ -57,7 +67,7 @@ class CommandKnock : public Command
 
                if (c->IsModeSet(noknockmode))
                {
-                       user->WriteNumeric(480, InspIRCd::Format("Can't KNOCK on %s, +K is set.", c->name.c_str()));
+                       user->WriteNumeric(ERR_CANNOTKNOCK, InspIRCd::Format("Can't KNOCK on %s, +K is set.", c->name.c_str()));
                        return CMD_FAILURE;
                }
 
@@ -71,13 +81,19 @@ class CommandKnock : public Command
                        c->WriteNotice(InspIRCd::Format("User %s is KNOCKing on %s (%s)", user->nick.c_str(), c->name.c_str(), parameters[1].c_str()));
 
                if (sendnumeric)
-                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "710 %s %s %s :is KNOCKing: %s", c->name.c_str(), c->name.c_str(), user->GetFullHost().c_str(), parameters[1].c_str());
+               {
+                       Numeric::Numeric numeric(710);
+                       numeric.push(c->name).push(user->GetFullHost()).push("is KNOCKing: " + parameters[1]);
+
+                       ClientProtocol::Messages::Numeric numericmsg(numeric, c->name);
+                       c->Write(ServerInstance->GetRFCEvents().numeric, numericmsg);
+               }
 
                user->WriteNotice("KNOCKing on " + c->name);
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_OPT_BCAST;
        }
@@ -117,7 +133,7 @@ class ModuleKnock : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for /KNOCK and channel mode +K", VF_OPTCOMMON | VF_VENDOR);
+               return Version("Provides the KNOCK command and channel mode +K", VF_OPTCOMMON | VF_VENDOR);
        }
 };