Fix the cloaking module on C++98 compilers.

[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 a0a8455a8ebd76b929bcda25e4df4d29d93d23e8..e7e55f0e90216f5469b061ffc4199d8c5b3303f0 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -1,9 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2004-2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013, 2018, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013, 2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2004, 2006, 2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -27,6 +33,8 @@ enum
        ERR_CANNOTKNOCK = 480,
 
        // From ircd-ratbox.
+       RPL_KNOCK = 710,
+       RPL_KNOCKDLVR = 711,
        ERR_CHANOPEN = 713,
        ERR_KNOCKONCHAN = 714
 };
@@ -46,7 +54,7 @@ class CommandKnock : public Command
                , noknockmode(Noknockmode)
                , inviteonlymode(Creator, "inviteonly")
        {
-               syntax = "<channel> <reason>";
+               syntax = "<channel> :<reason>";
                Penalty = 5;
        }
 
@@ -78,12 +86,22 @@ class CommandKnock : public Command
                }
 
                if (sendnotice)
+               {
                        c->WriteNotice(InspIRCd::Format("User %s is KNOCKing on %s (%s)", user->nick.c_str(), c->name.c_str(), parameters[1].c_str()));
+                       user->WriteNotice("KNOCKing on " + c->name);
+               }
 
                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(RPL_KNOCK);
+                       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->WriteNumeric(RPL_KNOCKDLVR, c->name, "KNOCKing on channel");
+               }
 
-               user->WriteNotice("KNOCKing on " + c->name);
                return CMD_SUCCESS;
        }
 
@@ -127,7 +145,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("Adds the /KNOCK command which allows users to request access to an invite-only channel and channel mode K (noknock) which allows channels to disable usage of this command.", VF_OPTCOMMON | VF_VENDOR);
        }
 };