PERL PIE FOR ALL: Rename a fuckload of XLineManager's methods

[user/henk/code/inspircd.git] / src / modules / m_antibear.cpp

diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index 515030f242c95dee451104afe977a5fcf0ca08b1..f18aa6883df3e218904ee8af5cc533336ac4d0d8 100644 (file)
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 #include "xline.h"
 
@@ -24,7 +21,7 @@ class ModuleAntiBear : public Module
  private:
 
  public:
-       ModuleAntiBear(InspIRCd* Me) : Module::Module(Me)
+       ModuleAntiBear(InspIRCd* Me) : Module(Me)
        {
                
        }
@@ -43,57 +40,35 @@ class ModuleAntiBear : public Module
                List[I_OnUserRegister] = List[I_OnPreCommand] = 1;
        }
 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
        {
-               if (command == "NOTICE" && !validated && pcnt > 1)
+               if (command == "NOTICE" && !validated && pcnt > 1 && user->GetExt("antibear_timewait"))
                {
-                       if (!strcmp(parameters[1], "\1TIME Mon May 01 18:54:20 2006\1"))
+                       if (!strncmp(parameters[1], "\1TIME Mon May 01 18:54:20 2006", 30))
                        {
-                               if (ServerInstance->XLines->add_zline(86400, ServerInstance->Config->ServerName, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->MakeHostIP()))
-                               {
-                                       ServerInstance->XLines->apply_lines(APPLY_ZLINES);
-                                       FOREACH_MOD(I_OnAddGLine,OnAddZLine(86400, NULL, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->MakeHostIP()));
-                                       return 1;
-                               }
+                               ServerInstance->XLines->AddZLine(86400, ServerInstance->Config->ServerName, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->GetIPString());
+                               // XXX move events into the damn XLineManager stuff
+                               FOREACH_MOD(I_OnAddGLine,OnAddZLine(86400, NULL, "Unless you're stuck in a time warp, you appear to be a bear bot!", user->MakeHostIP()));
+                               ServerInstance->XLines->ApplyLines();
+                               return 1;
                        }
+                       
+                       user->Shrink("antibear_timewait");
+                       // Block the command, so the user doesn't receive a no such nick notice
+                       return 1;
                }
+               
                return 0;
        }
 
-       virtual int OnUserRegister(userrec* user)
+       virtual int OnUserRegister(User* user)
        {
                user->WriteServ("439 %s :This server has anti-spambot mechanisms enabled.", user->nick);
                user->WriteServ("931 %s :Malicious bots, spammers, and other automated systems of dubious origin are NOT welcome here.", user->nick);
                user->WriteServ("PRIVMSG %s :\1TIME\1", user->nick);
+               user->Extend("antibear_timewait");
                return 0;
        }
 };
 
-class ModuleAntiBearFactory : public ModuleFactory
-{
- public:
-       ModuleAntiBearFactory()
-       {
-       }
-       
-       ~ModuleAntiBearFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleAntiBear(Me);
-       }
-       
-};
-
-
-//
-// The "C" linkage factory0() function creates the ModuleAntiBearFactory
-// class for this library
-//
-
-extern "C" void * init_module( void )
-{
-       return new ModuleAntiBearFactory;
-}
+MODULE_INIT(ModuleAntiBear)