X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=6453ace81485958a0060e4c4d28adbc2d4a3202f;hb=f2e3fd5952b23209b084bde4f464e6643c8a00ff;hp=28faf898b061aa0d6bb3247285b8baed8fa072e6;hpb=ff3b706b2506d7614bce5e54bc88657bd62ebd4d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 28faf898b..6453ace81 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -22,46 +22,9 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "modules/shun.h"
+#include "modules/stats.h"
 
-class Shun : public XLine
-{
-public:
-	std::string matchtext;
-
-	Shun(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& shunmask)
-		: XLine(s_time, d, src, re, "SHUN")
-		, matchtext(shunmask)
-	{
-	}
-
-	bool Matches(User *u)
-	{
-		// E: overrides shun
-		LocalUser* lu = IS_LOCAL(u);
-		if (lu && lu->exempt)
-			return false;
-
-		if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext) || InspIRCd::Match(u->nick+"!"+u->ident+"@"+u->GetIPString(), matchtext))
-			return true;
-
-		if (InspIRCd::MatchCIDR(u->GetIPString(), matchtext, ascii_case_insensitive_map))
-			return true;
-
-		return false;
-	}
-
-	bool Matches(const std::string &s)
-	{
-		if (matchtext == s)
-			return true;
-		return false;
-	}
-
-	const std::string& Displayable()
-	{
-		return matchtext;
-	}
-};
 
 /** An XLineFactory specialized to generate shun pointers
  */
@@ -72,12 +35,12 @@ class ShunFactory : public XLineFactory
 
 	/** Generate a shun
  	*/
-	XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+	XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
 	{
 		return new Shun(set_time, duration, source, reason, xline_specific_mask);
 	}
 
-	bool AutoApplyToUserList(XLine *x)
+	bool AutoApplyToUserList(XLine* x) CXX11_OVERRIDE
 	{
 		return false;
 	}
@@ -93,7 +56,7 @@ class CommandShun : public Command
 		flags_needed = 'o'; this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
 	}
 
-	CmdResult Handle(const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		/* syntax: SHUN nick!user@host time :reason goes here */
 		/* 'time' is a human-readable timestring, like 2d3h2s. */
@@ -106,13 +69,17 @@ class CommandShun : public Command
 
 		if (parameters.size() == 1)
 		{
-			if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user))
+			if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user))
+			{
+				ServerInstance->SNO->WriteToSnoMask('x', "%s removed SHUN on %s", user->nick.c_str(), parameters[0].c_str());
+			}
+			else if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user))
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s removed SHUN on %s",user->nick.c_str(),target.c_str());
+				ServerInstance->SNO->WriteToSnoMask('x',"%s removed SHUN on %s", user->nick.c_str(), target.c_str());
 			}
 			else
 			{
-				user->WriteNotice("*** Shun " + target + " not found in list, try /stats H.");
+				user->WriteNotice("*** Shun " + parameters[0] + " not found in list, try /stats H.");
 				return CMD_FAILURE;
 			}
 		}
@@ -123,7 +90,11 @@ class CommandShun : public Command
 			std::string expr;
 			if (parameters.size() > 2)
 			{
-				duration = InspIRCd::Duration(parameters[1]);
+				if (!InspIRCd::Duration(parameters[1], duration))
+				{
+					user->WriteNotice("*** Invalid duration for SHUN.");
+					return CMD_FAILURE;
+				}
 				expr = parameters[2];
 			}
 			else
@@ -151,14 +122,14 @@ class CommandShun : public Command
 			else
 			{
 				delete r;
-				user->WriteNotice("*** Shun for " + target + " already exists");
+				user->WriteNotice("*** Shun for " + target + " already exists.");
 				return CMD_FAILURE;
 			}
 		}
 		return CMD_SUCCESS;
 	}
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		if (IS_LOCAL(user))
 			return ROUTE_LOCALONLY; // spanningtree will send ADDLINE
@@ -167,7 +138,7 @@ class CommandShun : public Command
 	}
 };
 
-class ModuleShun : public Module
+class ModuleShun : public Module, public Stats::EventListener
 {
 	CommandShun cmd;
 	ShunFactory f;
@@ -176,7 +147,9 @@ class ModuleShun : public Module
 	bool affectopers;
 
  public:
-	ModuleShun() : cmd(this)
+	ModuleShun()
+		: Stats::EventListener(this)
+		, cmd(this)
 	{
 	}
 
@@ -217,10 +190,10 @@ class ModuleShun : public Module
 
 		ShunEnabledCommands.clear();
 
-		std::stringstream dcmds(cmds);
+		irc::spacesepstream dcmds(cmds);
 		std::string thiscmd;
 
-		while (dcmds >> thiscmd)
+		while (dcmds.GetToken(thiscmd))
 		{
 			ShunEnabledCommands.insert(thiscmd);
 		}
@@ -229,7 +202,7 @@ class ModuleShun : public Module
 		affectopers = tag->getBool("affectopers", false);
 	}
 
-	ModResult OnPreCommand(std::string &command, std::vector<std::string>& parameters, LocalUser* user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
 	{
 		if (validated)
 			return MOD_RES_PASSTHRU;
@@ -261,7 +234,7 @@ class ModuleShun : public Module
 		else if ((command == "PART") && (parameters.size() > 1))
 		{
 			/* same for PART */
-			parameters[1].clear();
+			parameters.pop_back();
 		}
 
 		/* if we're here, allow the command. */