X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=bdf990313098ac615d1f45a657d54a8c56c0c68d;hb=58f4306bb6e1f91076fccf30a3b43a40b3d1915a;hp=95c7cd37b1c51052890b4dea0abdbcf96e03cfbd;hpb=32834b531c503bf86c022647b77c9eaad66eb36f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 95c7cd37b..bdf990313 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -1,11 +1,4 @@
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <sstream>
 #include "inspircd.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "configreader.h"
 #include "xline.h"
 
 /* $ModDesc: Provides the /shun command, which stops a user executing all commands except PING and PONG. */
@@ -85,26 +78,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], "SHUN", 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]);
@@ -112,7 +105,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 (...)
 			{
@@ -125,12 +118,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());
 					}
 
@@ -139,7 +132,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());
 				}
 			}
 		}
@@ -168,16 +161,17 @@ class ModuleShun : public Module
 
 	virtual ~ModuleShun()
 	{
+		ServerInstance->XLines->DelAll("SHUN");
 		ServerInstance->XLines->UnregisterFactory(f);
 	}
 
 	virtual int OnStats(char symbol, User* user, string_list& out)
 	{
-		// XXX write me
-//format << Srv->Config->ServerName << " 223 " << user->nick << " :" << iter->banmask << " " << iter->set_on << " " << iter->length << " " << 
-//iter->set_by << " " << iter->reason; 
-		
-		return 0;
+		if (symbol != 'S')
+			return 0;
+
+		ServerInstance->XLines->InvokeStats("SHUN", 223, user, out);
+		return 1;
 	}
 
 	virtual void OnUserConnect(User* user)
@@ -195,20 +189,35 @@ class ModuleShun : public Module
 		}
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, User* user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(std::string &command, std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
 	{
-		if((command != "PONG") && (command != "PING"))
+		if (validated || !user->GetExt("shunned"))
+			return 0;
+
+		if (!ServerInstance->XLines->MatchesLine("SHUN", user))
+		{
+			/* The shun previously set on this user has expired or been removed */
+			user->Shrink("shunned");
+			return 0;
+		}
+
+		if (command == "QUIT")
 		{
-			if (user->GetExt("shunned"))
-				return 1;
+			/* Allow QUIT but dont show any quit message */
+			parameters.clear();
+			return 0;
 		}
 
-		return 0;
+		/* Always allow PONG and PING */
+		if (command == "PONG" || command == "PING")
+			return 0;
+
+		return 1;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,0,API_VERSION);
+		return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
 	}
 };