X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nickflood.cpp;h=ce8b364e45a36fa28fae1740947c3e02abff31ca;hb=d4a1ea70451abb333e71f9cff09b624db59531a0;hp=93fbbfaaa7c9838471823675f4b1a33756783225;hpb=932e8d13f81c7c94a89dc3702f6d45bc185f5dcf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index 93fbbfaaa..ce8b364e4 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -19,6 +19,10 @@
 
 
 #include "inspircd.h"
+#include "modules/exemption.h"
+
+// The number of seconds nickname changing will be blocked for.
+static unsigned int duration;
 
 /** Holds settings and state associated with channel mode +F
  */
@@ -72,73 +76,71 @@ class nickfloodsettings
 
 	void lock()
 	{
-		unlocktime = ServerInstance->Time() + 60;
+		unlocktime = ServerInstance->Time() + duration;
 	}
 };
 
 /** Handles channel mode +F
  */
-class NickFlood : public ModeHandler
+class NickFlood : public ParamMode<NickFlood, SimpleExtItem<nickfloodsettings> >
 {
  public:
-	SimpleExtItem<nickfloodsettings> ext;
-	NickFlood(Module* Creator) : ModeHandler(Creator, "nickflood", 'F', PARAM_SETONLY, MODETYPE_CHANNEL),
-		ext("nickflood", Creator) { }
+	NickFlood(Module* Creator)
+		: ParamMode<NickFlood, SimpleExtItem<nickfloodsettings> >(Creator, "nickflood", 'F')
+	{
+	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
 	{
-		if (adding)
+		std::string::size_type colon = parameter.find(':');
+		if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos))
 		{
-			std::string::size_type colon = parameter.find(':');
-			if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos))
-			{
-				source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str());
-				return MODEACTION_DENY;
-			}
-
-			/* Set up the flood parameters for this channel */
-			unsigned int nnicks = ConvToInt(parameter.substr(0, colon));
-			unsigned int nsecs = ConvToInt(parameter.substr(colon+1));
-
-			if ((nnicks<1) || (nsecs<1))
-			{
-				source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str());
-				return MODEACTION_DENY;
-			}
+			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
+			return MODEACTION_DENY;
+		}
 
-			nickfloodsettings* f = ext.get(channel);
-			if ((f) && (nnicks == f->nicks) && (nsecs == f->secs))
-				// mode params match
-				return MODEACTION_DENY;
+		/* Set up the flood parameters for this channel */
+		unsigned int nnicks = ConvToNum<unsigned int>(parameter.substr(0, colon));
+		unsigned int nsecs = ConvToNum<unsigned int>(parameter.substr(colon+1));
 
-			ext.set(channel, new nickfloodsettings(nsecs, nnicks));
-			parameter = ConvToStr(nnicks) + ":" + ConvToStr(nsecs);
-			return MODEACTION_ALLOW;
-		}
-		else
+		if ((nnicks<1) || (nsecs<1))
 		{
-			if (!channel->IsModeSet(this))
-				return MODEACTION_DENY;
-
-			ext.unset(channel);
-			return MODEACTION_ALLOW;
+			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
+			return MODEACTION_DENY;
 		}
+
+		ext.set(channel, new nickfloodsettings(nsecs, nnicks));
+		return MODEACTION_ALLOW;
+	}
+
+	void SerializeParam(Channel* chan, const nickfloodsettings* nfs, std::string& out)
+	{
+		out.append(ConvToStr(nfs->nicks)).push_back(':');
+		out.append(ConvToStr(nfs->secs));
 	}
 };
 
 class ModuleNickFlood : public Module
 {
+	CheckExemption::EventProvider exemptionprov;
 	NickFlood nf;
 
  public:
 	ModuleNickFlood()
-		: nf(this)
+		: exemptionprov(this)
+		, nf(this)
+	{
+	}
+
+	void ReadConfig(ConfigStatus&) CXX11_OVERRIDE
 	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("nickflood");
+		duration = tag->getDuration("duration", 60, 10, 600);
 	}
 
-	ModResult OnUserPreNick(User* user, const std::string &newnick) CXX11_OVERRIDE
+	ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE
 	{
-		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+		for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++)
 		{
 			Channel* channel = (*i)->chan;
 			ModResult res;
@@ -146,13 +148,13 @@ class ModuleNickFlood : public Module
 			nickfloodsettings *f = nf.ext.get(channel);
 			if (f)
 			{
-				res = ServerInstance->OnCheckExemption(user,channel,"nickflood");
+				res = CheckExemption::Call(exemptionprov, user, channel, "nickflood");
 				if (res == MOD_RES_ALLOW)
 					continue;
 
 				if (f->islocked())
 				{
-					user->WriteNumeric(ERR_CANTCHANGENICK, ":%s has been locked for nickchanges for 60 seconds because there have been more than %u nick changes in %u seconds", channel->name.c_str(), f->nicks, f->secs);
+					user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("%s has been locked for nickchanges for %u seconds because there have been more than %u nick changes in %u seconds", channel->name.c_str(), duration, f->nicks, f->secs));
 					return MOD_RES_DENY;
 				}
 
@@ -160,7 +162,7 @@ class ModuleNickFlood : public Module
 				{
 					f->clear();
 					f->lock();
-					channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName.c_str(), "NOTICE %s :No nick changes are allowed for 60 seconds because there have been more than %u nick changes in %u seconds.", channel->name.c_str(), f->nicks, f->secs);
+					channel->WriteNotice(InspIRCd::Format("No nick changes are allowed for %u seconds because there have been more than %u nick changes in %u seconds.", duration, f->nicks, f->secs));
 					return MOD_RES_DENY;
 				}
 			}
@@ -177,7 +179,7 @@ class ModuleNickFlood : public Module
 		if (isdigit(user->nick[0])) /* allow switches to UID */
 			return;
 
-		for (UCListIter i = user->chans.begin(); i != user->chans.end(); ++i)
+		for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); ++i)
 		{
 			Channel* channel = (*i)->chan;
 			ModResult res;
@@ -185,7 +187,7 @@ class ModuleNickFlood : public Module
 			nickfloodsettings *f = nf.ext.get(channel);
 			if (f)
 			{
-				res = ServerInstance->OnCheckExemption(user,channel,"nickflood");
+				res = CheckExemption::Call(exemptionprov, user, channel, "nickflood");
 				if (res == MOD_RES_ALLOW)
 					return;