X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=be77f9d772beb69b65c46ebe8f24080cffc2c0d3;hb=87dd84a97265843cfe19f20c207c1c72f38a4f2d;hp=f580c56462e568d1954b146706b32acaf825f28a;hpb=7317c9184ca0d0aa6d34c7812f637b44ddfd6a74;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index f580c5646..be77f9d77 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -41,7 +41,8 @@ public:
 
 	void Apply(User *u)
 	{
-		// Application is done by the module.
+		if (!u->GetExt("shunned"))
+			u->Extend("shunned");
 	}
 
 
@@ -56,6 +57,21 @@ public:
 	}
 };
 
+/** An XLineFactory specialized to generate shun pointers
+ */
+class ShunFactory : public XLineFactory
+{
+ public:
+	ShunFactory(InspIRCd* Instance) : XLineFactory(Instance, "SHUN") { }
+
+	/** Generate a shun
+ 	*/
+	XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask)
+	{
+		return new Shun(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
+	}
+};
+
 //typedef std::vector<Shun> shunlist;
 
 class cmd_shun : public Command
@@ -69,26 +85,26 @@ class cmd_shun : public Command
 		this->source = "m_shun.so";
 	}
 
-	CmdResult Handle(const char* const*parameters, int pcnt, User *user)
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user)
 	{
 		/* syntax: SHUN nick!user@host time :reason goes here */
 		/* 'time' is a human-readable timestring, like 2d3h2s. */
 
-		if(pcnt == 1)
+		if (parameters.size() == 1)
 		{
-			if (ServerInstance->XLines->DelLine(parameters[0], "S", user))
+			if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user))
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick,parameters[0]);
+				ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick.c_str(),parameters[0].c_str());
 			}
 			else
 			{
 				// XXX todo implement stats
-				user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick,parameters[0]);
+				user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick.c_str(),parameters[0].c_str());
 			}
 
 			return CMD_SUCCESS;
 		}
-		else if (pcnt >= 2)
+		else if (parameters.size() >= 2)
 		{
 			// Adding - XXX todo make this respect <insane> tag perhaps..
 			long duration = ServerInstance->Duration(parameters[1]);
@@ -96,7 +112,7 @@ class cmd_shun : public Command
 
 			try
 			{
-				r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]);
+				r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 			}
 			catch (...)
 			{
@@ -109,12 +125,12 @@ class cmd_shun : public Command
 				{
 					if (!duration)
 					{
-						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick, parameters[0]);
+						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick.c_str(), parameters[0].c_str());
 					}
 					else
 					{
 						time_t c_requires_crap = duration + ServerInstance->Time();
-						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s", user->nick, parameters[0],
+						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s", user->nick.c_str(), parameters[0].c_str(),
 						ServerInstance->TimeString(c_requires_crap).c_str());
 					}
 
@@ -123,7 +139,7 @@ class cmd_shun : public Command
 				else
 				{
 					delete r;
-					user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick, parameters[0]);
+					user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), parameters[0].c_str());
 				}
 			}
 		}
@@ -135,19 +151,26 @@ class cmd_shun : public Command
 class ModuleShun : public Module
 {
 	cmd_shun* mycommand;
+	ShunFactory *f;
 
  public:
 	ModuleShun(InspIRCd* Me) : Module(Me)
 	{
+		f = new ShunFactory(ServerInstance);
+		ServerInstance->XLines->RegisterFactory(f);
+
 		mycommand = new cmd_shun(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
+		Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-	void Implements(char* List)
+	virtual ~ModuleShun()
 	{
-		List[I_OnPreCommand] = List[I_OnStats] = 1;
+		ServerInstance->XLines->UnregisterFactory(f);
 	}
-	
+
 	virtual int OnStats(char symbol, User* user, string_list& out)
 	{
 		// XXX write me
@@ -157,29 +180,32 @@ class ModuleShun : public Module
 		return 0;
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, User* user, bool validated, const std::string &original_line)
+	virtual void OnUserConnect(User* user)
 	{
-		if (user->registered != REG_ALL)
-			return 0;
+		if (!IS_LOCAL(user))
+			return;
 
-		if((command != "PONG") && (command != "PING"))
+		// Apply lines on user connect
+		XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user);
+
+		if (rl)
 		{
-			// Don't let them issue cmd if they are shunned..
-			XLine *rl = ServerInstance->XLines->MatchesLine("S", user);
+			// Bang. :P
+			rl->Apply(user);
+		}
+	}
 
-			if (rl)
-			{
+	virtual int OnPreCommand(const std::string &command, const std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
+	{
+		if((command != "PONG") && (command != "PING"))
+		{
+			if (user->GetExt("shunned"))
 				return 1;
-			}
 		}
 
 		return 0;
 	}
 
-	virtual ~ModuleShun()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version(1,0,0,0,0,API_VERSION);