X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_antibear.cpp;h=5690572ce7d0de53a1d340d5a32eba8cf84b9f79;hb=2ab88037d8d7d6df3fb9686216a0b36f5ece2313;hp=a5eb5612b4d7a2b815952cae9defd4ff1fa61c46;hpb=b68f64cf6ae64f220fbb91d26c0fd2ffb8ee402a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index a5eb5612b..5690572ce 100644
--- 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 */
@@ -43,9 +40,9 @@ 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 (!strncmp(parameters[1], "\1TIME Mon May 01 18:54:20 2006", 30))
 			{
@@ -56,23 +53,23 @@ class ModuleAntiBear : public Module
 					return 1;
 				}
 			}
-			else
-			{
-				/* Theyre not registered and the notice is targetted at a server. */
-				if ((user->registered != REG_ALL) && (strchr(parameters[0], '.')))
-					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;
 	}
 };
 
-MODULE_INIT(ModuleAntiBear);
+MODULE_INIT(ModuleAntiBear)