X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=8d6c70092273ba5bdbde27404a92ca75706f6db2;hb=f6b33a8facd6ca200292786c1061782c41cdd278;hp=171893fd7238379c3ce576cfc96f64459ba60b51;hpb=c2376ac6f49ab01794a21a3e9bb7c1b3c5a1c2d8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 171893fd7..8d6c70092 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -24,7 +24,11 @@
 enum
 {
 	// From UnrealIRCd.
-	ERR_CANNOTKNOCK = 480
+	ERR_CANNOTKNOCK = 480,
+
+	// From ircd-ratbox.
+	ERR_CHANOPEN = 713,
+	ERR_KNOCKONCHAN = 714
 };
 
 /** Handles the /KNOCK command
@@ -42,11 +46,11 @@ 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) CXX11_OVERRIDE
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		Channel* c = ServerInstance->FindChan(parameters[0]);
 		if (!c)
@@ -77,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) CXX11_OVERRIDE
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		return ROUTE_OPT_BCAST;
 	}
@@ -123,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);
 	}
 };