Remove NULL checks from various Channel functions

[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 c570e0a714066fb1ffef750a97515528ba52cb4f..18eb76775a90bf44af571645e9098eb7b021244c 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -37,7 +37,7 @@ enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOP
  */
 class BlockedMessage
 {
-public:
+ public:
        std::string message;
        irc::string target;
        time_t sent;
@@ -57,32 +57,26 @@ 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()
+       void init() CXX11_OVERRIDE
        {
+               this->OnRehash(NULL);
+               ServerInstance->Modules->AddService(blockamsg);
+               Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       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 OnRehash(User* user) 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,7 +90,7 @@ 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)
@@ -171,5 +165,4 @@ class ModuleBlockAmsg : public Module
        }
 };
 
-
 MODULE_INIT(ModuleBlockAmsg)