Attach to events and register services in init()

[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..b0001574a0dfee2bd5360371d3c4a76d091ea60a 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -56,6 +56,10 @@ class ModuleBlockAmsg : public Module
 
  public:
        ModuleBlockAmsg() : blockamsg("blockamsg", this)
+       {
+       }
+
+       void init()
        {
                this->OnRehash(NULL);
                ServerInstance->Extensions.Register(&blockamsg);
@@ -63,7 +67,6 @@ class ModuleBlockAmsg : public Module
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-
        virtual ~ModuleBlockAmsg()
        {
        }
@@ -75,14 +78,9 @@ class ModuleBlockAmsg : public Module
 
        virtual void OnRehash(User* user)
        {
-               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;
@@ -102,11 +100,7 @@ class ModuleBlockAmsg : public Module
                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.