Someone is getting slapped for this; the new hidesplits/hidebans behavior doesn't...

[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 fdbc33839d112561421c060503cd05da222854b7..39e3c16b1128b3cefbf384fe482639b8900cfa77 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -2,20 +2,14 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *                                             <omster@gmail.com>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
- 
-/* <3's to Lauren for original info on mIRC's weird behaviour */
 
 #include <string>
 #include <time.h>
@@ -23,37 +17,38 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
+#include "inspircd.h"
 
 /* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */
 
-extern time_t TIME;
-
 enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOPERS, IBLOCK_SILENT };
 
+/** Holds a blocked message's details
+ */
 class BlockedMessage : public classbase
 {
 public:
        std::string message;
        irc::string target;
        time_t sent;
-       
-       BlockedMessage(std::string msg, irc::string tgt, time_t when) : message(msg), target(tgt), sent(when)
+
+       BlockedMessage(const std::string &msg, const irc::string &tgt, time_t when) : message(msg), target(tgt), sent(when)
        {
        }
 };
 
 class ModuleBlockAmsg : public Module
 {
-       Server* Srv;
+       
        int ForgetDelay;
        BlockAction action;
 public:
-       ModuleBlockAmsg(Server* Me) : Module::Module(Me)
+       ModuleBlockAmsg(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               this->OnRehash("");
+               
+               this->OnRehash(NULL,"");
        }
 
        void Implements(char* List)
@@ -67,12 +62,12 @@ public:
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
        
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
-               ConfigReader* Conf = new ConfigReader;
+               ConfigReader* Conf = new ConfigReader(ServerInstance);
                
                ForgetDelay = Conf->ReadInteger("blockamsg", "delay", 0, false);
                if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
@@ -94,7 +89,7 @@ public:
                DELETE(Conf);
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *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))
@@ -121,9 +116,7 @@ public:
                                if((*c == ',') && *(c+1) && (*(c+1) == '#'))
                                        targets++;
                                        
-                       for(std::vector<ucrec*>::iterator f = user->chans.begin(); f != user->chans.end(); f++)
-                               if(((ucrec*)(*f))->channel)
-                                       userchans++;
+                       userchans = user->chans.size();
 
                        // Check that this message wasn't already sent within a few seconds.
                        BlockedMessage* m;
@@ -134,16 +127,16 @@ public:
                        // 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]) && (m->target != parameters[0]) && (ForgetDelay != -1) && (m->sent >= TIME-ForgetDelay)) || ((targets > 1) && (targets == userchans)))
+                       if((m && (m->message == parameters[1]) && (m->target != parameters[0]) && (ForgetDelay != -1) && (m->sent >= ServerInstance->Time()-ForgetDelay)) || ((targets > 1) && (targets == userchans)))
                        {
                                // Block it...
                                if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
-                                       WriteOpers("*** %s had an /amsg or /ame denied", user->nick);
+                                       ServerInstance->WriteOpers("*** %s had an /amsg or /ame denied", user->nick);
 
                                if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
-                                       Srv->QuitUser(user, "Global message (/amsg or /ame) detected");
+                                       userrec::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected");
                                else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
-                                       WriteServ(user->fd, "NOTICE %s :Global message (/amsg or /ame) detected", user->nick);
+                                       user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick);
                                                                        
                                return 1;
                        }
@@ -153,11 +146,11 @@ public:
                                // If there's already a BlockedMessage allocated, use it.
                                m->message = parameters[1];
                                m->target = parameters[0];
-                               m->sent = TIME;
+                               m->sent = ServerInstance->Time();
                        }
                        else
                        {
-                               m = new BlockedMessage(parameters[1], parameters[0], TIME);
+                               m = new BlockedMessage(parameters[1], parameters[0], ServerInstance->Time());
                                user->Extend("amsgblock", (char*)m);
                        }
                }                                       
@@ -192,7 +185,7 @@ class ModuleBlockAmsgFactory : public ModuleFactory
                {
                }
        
-               virtual Module * CreateModule(Server* Me)
+               virtual Module * CreateModule(InspIRCd* Me)
                {
                        return new ModuleBlockAmsg(Me);
                }