Add ProtocolInterface::BroadcastEncap() and infrastructure for manually forwarding...

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

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 8160fcf542ad9fcb12d0f0984bae5c7b8b36fe82..833828233e7f6a89db5846b5b4c07db5d8b764d5 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -23,8 +23,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */
-
 enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOPERS, IBLOCK_SILENT };
 /*     IBLOCK_NOTICE           - Send a notice to the user informing them of what happened.
  *     IBLOCK_NOTICEOPERS      - Send a notice to the user informing them and send an oper notice.
@@ -37,7 +35,7 @@ enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOP
  */
 class BlockedMessage
 {
-public:
+ public:
        std::string message;
        irc::string target;
        time_t sent;
@@ -56,33 +54,19 @@ class ModuleBlockAmsg : public Module
 
  public:
        ModuleBlockAmsg() : blockamsg("blockamsg", this)
-       {
-               this->OnRehash(NULL);
-               ServerInstance->Extensions.Register(&blockamsg);
-               Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-       }
-
-
-       virtual ~ModuleBlockAmsg()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR);
        }
 
-       virtual void OnRehash(User* user)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               ConfigReader Conf;
-
-               ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false);
-
-               if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
-                       ForgetDelay = -1;
-
-               std::string act = Conf.ReadValue("blockamsg", "action", 0);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("blockamsg");
+               ForgetDelay = tag->getInt("delay", -1);
+               std::string act = tag->getString("action");
 
                if(act == "notice")
                        action = IBLOCK_NOTICE;
@@ -96,17 +80,13 @@ class ModuleBlockAmsg : public Module
                        action = IBLOCK_KILLOPERS;
        }
 
-       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
+       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
        {
                // Don't do anything with unregistered users
                if (user->registered != REG_ALL)
                        return MOD_RES_PASSTHRU;
 
-               // We want case insensitive command comparison.
-               // Add std::string contructor for irc::string :x
-               irc::string cmd = command.c_str();
-
-               if(validated && (cmd == "PRIVMSG" || cmd == "NOTICE") && (parameters.size() >= 2))
+               if ((validated) && (parameters.size() >= 2) && ((command == "PRIVMSG") || (command == "NOTICE")))
                {
                        // parameters[0] should have the target(s) in it.
                        // I think it will be faster to first check if there are any commas, and if there are then try and parse it out.
@@ -175,5 +155,4 @@ class ModuleBlockAmsg : public Module
        }
 };
 
-
 MODULE_INIT(ModuleBlockAmsg)