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

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index e8a516b94..5f081d9de 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -63,18 +63,25 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
 	{
 		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, 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));
 		unsigned int time = InspIRCd::Duration(duration);
-		if (len == 0)
-			return MODEACTION_DENY;
-		if (len > maxlines && IS_LOCAL(source))
+		if (len == 0 || (len > maxlines && IS_LOCAL(source)))
+		{
+			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
 			return MODEACTION_DENY;
+		}
 		if (len > maxlines)
 			len = maxlines;
 
@@ -121,15 +128,15 @@ class ModuleChanHistory : public Module
 		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();