X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=52802f168884fd2a1783b2b41b0cae08b984b001;hb=df4afba6c23c939af1013582c94138832017af4e;hp=39ba3f9a00d580d398ec5222cdb4c79a113aeea3;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 39ba3f9a0..52802f168 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -82,56 +82,40 @@ class joinfloodsettings
 
 /** Handles channel mode +j
  */
-class JoinFlood : public ModeHandler
+class JoinFlood : public ParamMode<JoinFlood, SimpleExtItem<joinfloodsettings> >
 {
  public:
-	SimpleExtItem<joinfloodsettings> ext;
-	JoinFlood(Module* Creator) : ModeHandler(Creator, "joinflood", 'j', PARAM_SETONLY, MODETYPE_CHANNEL),
-		ext("joinflood", Creator) { }
+	JoinFlood(Module* Creator)
+		: ParamMode<JoinFlood, SimpleExtItem<joinfloodsettings> >(Creator, "joinflood", 'j')
+	{
+	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
 	{
-		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 %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
-				return MODEACTION_DENY;
-			}
-
-			/* Set up the flood parameters for this channel */
-			unsigned int njoins = ConvToInt(parameter.substr(0, colon));
-			unsigned int nsecs = ConvToInt(parameter.substr(colon+1));
-			if ((njoins<1) || (nsecs<1))
-			{
-				source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
-				return MODEACTION_DENY;
-			}
-
-			joinfloodsettings jfs(nsecs, njoins);
-			joinfloodsettings* f = ext.get(channel);
-			if ((f) && (*f == jfs))
-				// mode params match
-				return MODEACTION_DENY;
-
-			ext.set(channel, jfs);
-			parameter = ConvToStr(njoins) + ":" + ConvToStr(nsecs);
-			return MODEACTION_ALLOW;
+			source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str());
+			return MODEACTION_DENY;
 		}
-		else
-		{
-			if (!channel->IsModeSet(this))
-				return MODEACTION_DENY;
 
-			joinfloodsettings* f = ext.get(channel);
-			if (f)
-			{
-				ext.unset(channel);
-				return MODEACTION_ALLOW;
-			}
+		/* Set up the flood parameters for this channel */
+		unsigned int njoins = ConvToInt(parameter.substr(0, colon));
+		unsigned int nsecs = ConvToInt(parameter.substr(colon+1));
+		if ((njoins<1) || (nsecs<1))
+		{
+			source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str());
+			return MODEACTION_DENY;
 		}
-		return MODEACTION_DENY;
+
+		ext.set(channel, new joinfloodsettings(nsecs, njoins));
+		return MODEACTION_ALLOW;
+	}
+
+	void SerializeParam(Channel* chan, const joinfloodsettings* jfs, std::string& out)
+	{
+		out.append(ConvToStr(jfs->joins)).push_back(':');
+		out.append(ConvToStr(jfs->secs));
 	}
 };
 
@@ -145,14 +129,6 @@ class ModuleJoinFlood : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(jf);
-		ServerInstance->Modules->AddService(jf.ext);
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (chan)
@@ -160,7 +136,7 @@ class ModuleJoinFlood : public Module
 			joinfloodsettings *f = jf.ext.get(chan);
 			if (f && f->islocked())
 			{
-				user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
+				user->WriteNumeric(609, "%s :This channel is temporarily unavailable (+j). Please try again later.",chan->name.c_str());
 				return MOD_RES_DENY;
 			}
 		}
@@ -176,7 +152,7 @@ class ModuleJoinFlood : public Module
 		joinfloodsettings *f = jf.ext.get(memb->chan);
 
 		/* But all others are OK */
-		if (f)
+		if ((f) && (!f->islocked()))
 		{
 			f->addjoin();
 			if (f->shouldlock())