X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanhistory.cpp;h=5f081d9decbb17a2b26debf16ad4e4f36702453d;hb=4132a44396d8fa3d23f87b5cbea5b928aa09769f;hp=f6e7ea40e6071a100203c576e880a744594e1f39;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index f6e7ea40e..5f081d9de 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -59,22 +59,29 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
 	{
 	}
 
-	ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
+	ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
 	{
 		std::string::size_type colon = parameter.find(':');
 		if (colon == std::string::npos)
+		{
+			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
 			return MODEACTION_DENY;
+		}
 
-		std::string duration = parameter.substr(colon+1);
+		std::string duration(parameter, colon+1);
 		if ((IS_LOCAL(source)) && ((duration.length() > 10) || (!IsValidDuration(duration))))
+		{
+			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
 			return MODEACTION_DENY;
+		}
 
 		unsigned int len = ConvToInt(parameter.substr(0, colon));
-		int time = InspIRCd::Duration(duration);
-		if (len == 0 || time < 0)
-			return MODEACTION_DENY;
-		if (len > maxlines && IS_LOCAL(source))
+		unsigned int time = InspIRCd::Duration(duration);
+		if (len == 0 || (len > maxlines && IS_LOCAL(source)))
+		{
+			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
 			return MODEACTION_DENY;
+		}
 		if (len > maxlines)
 			len = maxlines;
 
@@ -116,20 +123,20 @@ class ModuleChanHistory : public Module
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory");
-		m.maxlines = tag->getInt("maxlines", 50);
+		m.maxlines = tag->getInt("maxlines", 50, 1);
 		sendnotice = tag->getBool("notice", true);
 		dobots = tag->getBool("bots", true);
 	}
 
-	void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList&, MessageType msgtype) CXX11_OVERRIDE
+	void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE
 	{
-		if ((target_type == TYPE_CHANNEL) && (status == 0) && (msgtype == MSG_PRIVMSG))
+		if ((target.type == MessageTarget::TYPE_CHANNEL) && (target.status == 0) && (details.type == MSG_PRIVMSG))
 		{
-			Channel* c = (Channel*)dest;
+			Channel* c = target.Get<Channel>();
 			HistoryList* list = m.ext.get(c);
 			if (list)
 			{
-				const std::string line = ":" + user->GetFullHost() + " PRIVMSG " + c->name + " :" + text;
+				const std::string line = ":" + user->GetFullHost() + " PRIVMSG " + c->name + " :" + details.text;
 				list->lines.push_back(HistoryItem(line));
 				if (list->lines.size() > list->maxlen)
 					list->lines.pop_front();
@@ -154,7 +161,10 @@ class ModuleChanHistory : public Module
 
 		if (sendnotice)
 		{
-			memb->user->WriteNotice("Replaying up to " + ConvToStr(list->maxlen) + " lines of pre-join history spanning up to " + ConvToStr(list->maxtime) + " seconds");
+			std::string message("Replaying up to " + ConvToStr(list->maxlen) + " lines of pre-join history");
+			if (list->maxtime > 0)
+				message.append(" spanning up to " + ConvToStr(list->maxtime) + " seconds");
+			memb->WriteNotice(message);
 		}
 
 		for(std::deque<HistoryItem>::iterator i = list->lines.begin(); i != list->lines.end(); ++i)