Add support for blocking tag messages with the deaf mode.

[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 96ea66d7b0e505294a6d8557255caebd02ce2b6b..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
@@ -21,6 +27,18 @@
 
 #include "inspircd.h"
 
+enum
+{
+       // From UnrealIRCd.
+       ERR_CANNOTKNOCK = 480,
+
+       // From ircd-ratbox.
+       RPL_KNOCK = 710,
+       RPL_KNOCKDLVR = 711,
+       ERR_CHANOPEN = 713,
+       ERR_KNOCKONCHAN = 714
+};
+
 /** Handles the /KNOCK command
  */
 class CommandKnock : public Command
@@ -36,48 +54,58 @@ 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(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str());
+                       user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
                        return CMD_FAILURE;
                }
 
                if (c->HasUser(user))
                {
-                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, you are already on that channel.", user->nick.c_str(), c->name.c_str());
+                       user->WriteNumeric(ERR_KNOCKONCHAN, c->name, InspIRCd::Format("Can't KNOCK on %s, you are already on that channel.", c->name.c_str()));
                        return CMD_FAILURE;
                }
 
                if (c->IsModeSet(noknockmode))
                {
-                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, +K is set.",user->nick.c_str(), 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;
                }
 
                if (!c->IsModeSet(inviteonlymode))
                {
-                       user->WriteNumeric(480, "%s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick.c_str(), c->name.c_str());
+                       user->WriteNumeric(ERR_CHANOPEN, c->name, InspIRCd::Format("Can't KNOCK on %s, channel is not invite only so knocking is pointless!", c->name.c_str()));
                        return CMD_FAILURE;
                }
 
                if (sendnotice)
-                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name.c_str(), user->nick.c_str(), c->name.c_str(), parameters[1].c_str());
+               {
+                       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;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_OPT_BCAST;
        }
@@ -95,25 +123,15 @@ class ModuleKnock : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(kn);
-               ServerInstance->Modules->AddService(cmd);
-
-               OnRehash(NULL);
-       }
-
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                std::string knocknotify = ServerInstance->Config->ConfValue("knock")->getString("notify");
-               irc::string notify(knocknotify.c_str());
-
-               if (notify == "numeric")
+               if (stdalgo::string::equalsci(knocknotify, "numeric"))
                {
                        cmd.sendnotice = false;
                        cmd.sendnumeric = true;
                }
-               else if (notify == "both")
+               else if (stdalgo::string::equalsci(knocknotify, "both"))
                {
                        cmd.sendnotice = true;
                        cmd.sendnumeric = true;
@@ -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);
        }
 };