]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_blockamsg.cpp
Someone is getting slapped for this; the new hidesplits/hidebans behavior doesn't...
[user/henk/code/inspircd.git] / src / modules / m_blockamsg.cpp
index 59c03e1e3652e6b64aef748e531fcb69bf226224..39e3c16b1128b3cefbf384fe482639b8900cfa77 100644 (file)
@@ -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,7 +17,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "inspircd.h"
 
 
 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)
        {
        }
 };
@@ -52,7 +48,7 @@ public:
        ModuleBlockAmsg(InspIRCd* Me) : Module::Module(Me)
        {
                
-               this->OnRehash("");
+               this->OnRehash(NULL,"");
        }
 
        void Implements(char* List)
@@ -66,10 +62,10 @@ 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(ServerInstance);
                
@@ -93,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))
@@ -120,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;