Tidy up strlens which are not required

[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 8c0aab79523871a0800b07718f30b69dceaf3080..cf09bfecdd32d6840d270b8a69187a5e53783d17 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -23,7 +23,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "inspircd.h"
 
@@ -31,6 +31,8 @@
 
 enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOPERS, IBLOCK_SILENT };
 
+/** Holds a blocked message's details
+ */
 class BlockedMessage : public classbase
 {
 public:
@@ -66,7 +68,7 @@ public:
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,0,0,0,VF_VENDOR,API_VERSION);
        }
        
        virtual void OnRehash(const std::string &parameter)
@@ -93,7 +95,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))
@@ -133,7 +135,7 @@ 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)
@@ -152,11 +154,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);
                        }
                }