Remove InspIRCd* parameters and fields

[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 cf390f1653b733631bdf7fdfd64aa9863e957dc1..7c4d6341958da3d65f903fe112a6dff9e70e3b15 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -42,36 +42,38 @@ class ModuleBlockAmsg : public Module
 {
        int ForgetDelay;
        BlockAction action;
-       
+       SimpleExtItem<BlockedMessage> blockamsg;
+
  public:
-       ModuleBlockAmsg(InspIRCd* Me) : Module(Me)
+       ModuleBlockAmsg() : blockamsg("blockamsg", this)
        {
-               this->OnRehash(NULL,"");
-               Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_OnCleanup };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               this->OnRehash(NULL);
+               Extensible::Register(&blockamsg);
+               Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       
+
        virtual ~ModuleBlockAmsg()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+               return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR,API_VERSION);
        }
-       
-       virtual void OnRehash(User* user, const std::string &parameter)
+
+       virtual void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
-               
+               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);
-               
+
                if(act == "notice")
                        action = IBLOCK_NOTICE;
                else if(act == "noticeopers")
@@ -84,50 +86,49 @@ class ModuleBlockAmsg : public Module
                        action = IBLOCK_KILLOPERS;
        }
 
-       virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
        {
                // Don't do anything with unregistered users, or remote ones.
                if(!user || (user->registered != REG_ALL) || !IS_LOCAL(user))
-                       return 0;
-                       
+                       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))
                {
                        // 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.
                        // Most messages have a single target so...
-                       
+
                        int targets = 1;
                        int userchans = 0;
-               
+
                        if(*parameters[0].c_str() != '#')
                        {
                                // Decrement if the first target wasn't a channel.
                                targets--;
                        }
-                       
+
                        for(const char* c = parameters[0].c_str(); *c; c++)
                                if((*c == ',') && *(c+1) && (*(c+1) == '#'))
                                        targets++;
-                               
+
                        /* targets should now contain the number of channel targets the msg/notice was pointed at.
                         * If the msg/notice was a PM there should be no channel targets and 'targets' should = 0.
                         * We don't want to block PMs so...
                         */
                        if(targets == 0)
                        {
-                               return 0;
+                               return MOD_RES_PASSTHRU;
                        }
-                                       
+
                        userchans = user->chans.size();
 
                        // Check that this message wasn't already sent within a few seconds.
-                       BlockedMessage* m;
-                       user->GetExt("amsgblock", m);
-                       
+                       BlockedMessage* m = blockamsg.get(user);
+
                        // If the message is identical and within the time.
                        // We check the target is *not* identical, that'd straying into the realms of flood control. Which isn't what we're doing...
                        // OR
@@ -137,16 +138,16 @@ class ModuleBlockAmsg : public Module
                        {
                                // Block it...
                                if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
-                                       ServerInstance->SNO->WriteToSnoMask('A', "%s had an /amsg or /ame denied", user->nick.c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str());
 
                                if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
                                        ServerInstance->Users->QuitUser(user, "Global message (/amsg or /ame) detected");
                                else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
                                        user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick.c_str());
-                                                                       
-                               return 1;
+
+                               return MOD_RES_DENY;
                        }
-                       
+
                        if(m)
                        {
                                // If there's already a BlockedMessage allocated, use it.
@@ -157,25 +158,10 @@ class ModuleBlockAmsg : public Module
                        else
                        {
                                m = new BlockedMessage(parameters[1], parameters[0].c_str(), ServerInstance->Time());
-                               user->Extend("amsgblock", (char*)m);
-                       }
-               }                                       
-               return 0;
-       }
-       
-       void OnCleanup(int target_type, void* item)
-       {
-               if(target_type == TYPE_USER)
-               {
-                       User* user = (User*)item;
-                       BlockedMessage* m;
-                       user->GetExt("amsgblock", m);
-                       if(m)
-                       {
-                               delete m;
-                               user->Shrink("amsgblock");
+                               blockamsg.set(user, m);
                        }
                }
+               return MOD_RES_PASSTHRU;
        }
 };