X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_repeat.cpp;h=57a6edab6b7842e09b51180d1ac18757a76f67a2;hb=5a2af6ded883d71c6c4c9f1497cca1721f8b0742;hp=ef62e9ab10bdec3aeb60b1a52bb61d7b05822d6f;hpb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index ef62e9ab1..57a6edab6 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -34,7 +34,7 @@ class ChannelSettings
 	unsigned int Backlog;
 	unsigned int Lines;
 	unsigned int Diff;
-	unsigned int Seconds;
+	unsigned long Seconds;
 
 	void serialize(std::string& out) const
 	{
@@ -125,9 +125,10 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		: ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >(Creator, "repeat", 'E')
 		, MemberInfoExt("repeat_memb", ExtensionItem::EXT_MEMBERSHIP, Creator)
 	{
+		syntax = "[~|*]<lines>:<sec>[:<difference>][:<backlog>]";
 	}
 
-	void OnUnset(User* source, Channel* chan)
+	void OnUnset(User* source, Channel* chan) CXX11_OVERRIDE
 	{
 		// Unset the per-membership extension when the mode is removed
 		const Channel::MemberMap& users = chan->GetUsers();
@@ -140,15 +141,14 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		ChannelSettings settings;
 		if (!ParseSettings(source, parameter, settings))
 		{
-			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter,
-				"Invalid repeat syntax. Syntax is {[~*]}[lines]:[time]{:[difference]}{:[backlog]}."));
+			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
 			return MODEACTION_DENY;
 		}
 
 		if ((settings.Backlog > 0) && (settings.Lines > settings.Backlog))
 		{
 			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter,
-				"Invalid repeat syntax. You can't set needed lines higher than backlog."));
+				"You can't set lines higher than backlog."));
 			return MODEACTION_DENY;
 		}
 
@@ -274,10 +274,10 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		else
 			settings.Action = ChannelSettings::ACT_KICK;
 
-		if ((settings.Lines = ConvToInt(item)) == 0)
+		if ((settings.Lines = ConvToNum<unsigned int>(item)) == 0)
 			return false;
 
-		if ((!stream.GetToken(item)) || ((settings.Seconds = InspIRCd::Duration(item)) == 0))
+		if ((!stream.GetToken(item)) || !InspIRCd::Duration(item, settings.Seconds) || (settings.Seconds == 0))
 			// Required parameter missing
 			return false;
 
@@ -286,13 +286,13 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		if (stream.GetToken(item))
 		{
 			// There is a diff parameter, see if it's valid (> 0)
-			if ((settings.Diff = ConvToInt(item)) == 0)
+			if ((settings.Diff = ConvToNum<unsigned int>(item)) == 0)
 				return false;
 
 			if (stream.GetToken(item))
 			{
 				// There is a backlog parameter, see if it's valid
-				if ((settings.Backlog = ConvToInt(item)) == 0)
+				if ((settings.Backlog = ConvToNum<unsigned int>(item)) == 0)
 					return false;
 
 				// If there are still tokens, then it's invalid because we allow only 4
@@ -309,14 +309,14 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		if (ms.MaxLines && settings.Lines > ms.MaxLines)
 		{
 			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, InspIRCd::Format(
-				"Invalid repeat parameter. The line number you specified is too great. Maximum allowed is %u.", ms.MaxLines)));
+				"The line number you specified is too big. Maximum allowed is %u.", ms.MaxLines)));
 			return false;
 		}
 
 		if (ms.MaxSecs && settings.Seconds > ms.MaxSecs)
 		{
 			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, InspIRCd::Format(
-				"Invalid repeat parameter. The seconds you specified is too great. Maximum allowed is %u.", ms.MaxSecs)));
+				"The seconds you specified are too big. Maximum allowed is %u.", ms.MaxSecs)));
 			return false;
 		}
 
@@ -324,10 +324,10 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		{
 			if (ms.MaxDiff == 0)
 				source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter,
-					"Invalid repeat parameter. The server administrator has disabled matching on edit distance."));
+					"The server administrator has disabled matching on edit distance."));
 			else
 				source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, InspIRCd::Format(
-					"Invalid repeat parameter. The distance you specified is too great. Maximum allowed is %u.", ms.MaxDiff)));
+					"The distance you specified is too big. Maximum allowed is %u.", ms.MaxDiff)));
 			return false;
 		}
 
@@ -335,10 +335,10 @@ class RepeatMode : public ParamMode<RepeatMode, SimpleExtItem<ChannelSettings> >
 		{
 			if (ms.MaxBacklog == 0)
 				source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter,
-					"Invalid repeat parameter. The server administrator has disabled backlog matching."));
+					"The server administrator has disabled backlog matching."));
 			else
 				source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter, InspIRCd::Format(
-					"Invalid repeat paramter. The backlog you specified is too great. Maximum allowed is %u.", ms.MaxBacklog)));
+					"The backlog you specified is too big. Maximum allowed is %u.", ms.MaxBacklog)));
 			return false;
 		}
 
@@ -409,7 +409,7 @@ class RepeatModule : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the +E channel mode - for blocking of similar messages", VF_COMMON|VF_VENDOR, rm.GetModuleSettings());
+		return Version("Provides channel mode +E, blocking of similar messages", VF_COMMON|VF_VENDOR, rm.GetModuleSettings());
 	}
 };