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 6b40407a51412228041c0cb6a00a9bb949e64f15..f18aa6883df3e218904ee8af5cc533336ac4d0d8 100644 (file)
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "xline.h"
 
 /* $ModDesc: Sends a numeric on connect which cripples a common type of trojan/spambot */
@@ -40,21 +37,20 @@ class ModuleAntiBear : public Module
 
        void Implements(char* List)
        {
-               List[I_OnUserRegister] = List[I_OnPreCommand] = List[I_OnUserConnect] = 1;
+               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 && user->GetExt("antibear_timewait"))
                {
                        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");
@@ -65,7 +61,7 @@ class ModuleAntiBear : public Module
                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);
@@ -73,11 +69,6 @@ class ModuleAntiBear : public Module
                user->Extend("antibear_timewait");
                return 0;
        }
-       
-       virtual void OnUserConnect(userrec *user)
-       {
-               user->Shrink("antibear_timewait");
-       }
 };
 
 MODULE_INIT(ModuleAntiBear)