Allow configuring whether SETNAME sends snotices and is oper-only.

[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 266497b9092b38b5f3f0c1491d82b8ad4e851703..c4af2fd7ff4783b95650ee2a1ce8de4493dd95f6 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -48,7 +48,7 @@ class BlockedMessage
 
 class ModuleBlockAmsg : public Module
 {
-       int ForgetDelay;
+       unsigned int ForgetDelay;
        BlockAction action;
        SimpleExtItem<BlockedMessage> blockamsg;
 
@@ -66,22 +66,22 @@ class ModuleBlockAmsg : public Module
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("blockamsg");
-               ForgetDelay = tag->getInt("delay", -1);
+               ForgetDelay = tag->getDuration("delay", 3);
                std::string act = tag->getString("action");
 
-               if (act == "notice")
+               if (stdalgo::string::equalsci(act, "notice"))
                        action = IBLOCK_NOTICE;
-               else if (act == "noticeopers")
+               else if (stdalgo::string::equalsci(act, "noticeopers"))
                        action = IBLOCK_NOTICEOPERS;
-               else if (act == "silent")
+               else if (stdalgo::string::equalsci(act, "silent"))
                        action = IBLOCK_SILENT;
-               else if (act == "kill")
+               else if (stdalgo::string::equalsci(act, "kill"))
                        action = IBLOCK_KILL;
                else
                        action = IBLOCK_KILLOPERS;
        }
 
-       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
                // Don't do anything with unregistered users
                if (user->registered != REG_ALL)
@@ -116,7 +116,7 @@ class ModuleBlockAmsg : public Module
                        // OR
                        // The number of target channels is equal to the number of channels the sender is on..a little suspicious.
                        // Check it's more than 1 too, or else users on one channel would have fun.
-                       if ((m && (m->message == parameters[1]) && (!irc::equals(m->target, parameters[0])) && (ForgetDelay != -1) && (m->sent >= ServerInstance->Time()-ForgetDelay)) || ((targets > 1) && (targets == user->chans.size())))
+                       if ((m && (m->message == parameters[1]) && (!irc::equals(m->target, parameters[0])) && ForgetDelay && (m->sent >= ServerInstance->Time()-ForgetDelay)) || ((targets > 1) && (targets == user->chans.size())))
                        {
                                // Block it...
                                if (action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)