X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanhistory.cpp;h=540fa29087cbb548307826967d6429e5ae7c1ee7;hb=da53c17315d3eb0d0177608d306d208bdf05786b;hp=57db002a894c6d71bb69ac4cc7ff9a5e189cc27b;hpb=224952435591734d8308fd2b612d51c030416e53;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 57db002a8..540fa2908 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -19,6 +19,8 @@
 
 #include "inspircd.h"
 #include "modules/ircv3_servertime.h"
+#include "modules/ircv3_batch.h"
+#include "modules/server.h"
 
 struct HistoryItem
 {
@@ -46,20 +48,6 @@ struct HistoryList
 
 class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
 {
-	bool IsValidDuration(const std::string& duration)
-	{
-		for (std::string::const_iterator i = duration.begin(); i != duration.end(); ++i)
-		{
-			unsigned char c = *i;
-			if (((c >= '0') && (c <= '9')) || (c == 's') || (c == 'S'))
-				continue;
-
-			if (duration_multi[c] == 1)
-				return false;
-		}
-		return true;
-	}
-
  public:
 	unsigned int maxlines;
 	HistoryMode(Module* Creator)
@@ -77,15 +65,15 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
 		}
 
 		std::string duration(parameter, colon+1);
-		if ((IS_LOCAL(source)) && ((duration.length() > 10) || (!IsValidDuration(duration))))
+		if ((IS_LOCAL(source)) && ((duration.length() > 10) || (!InspIRCd::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 || (len > maxlines && IS_LOCAL(source)))
+		unsigned int len = ConvToNum<unsigned int>(parameter.substr(0, colon));
+		unsigned long time;
+		if (!InspIRCd::Duration(duration, time) || len == 0 || (len > maxlines && IS_LOCAL(source)))
 		{
 			source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
 			return MODEACTION_DENY;
@@ -117,18 +105,27 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
 	}
 };
 
-class ModuleChanHistory : public Module
+class ModuleChanHistory
+	: public Module
+	, public ServerEventListener
 {
 	HistoryMode m;
 	bool sendnotice;
 	UserModeReference botmode;
 	bool dobots;
+	IRCv3::Batch::CapReference batchcap;
+	IRCv3::Batch::API batchmanager;
+	IRCv3::Batch::Batch batch;
 	IRCv3::ServerTime::API servertimemanager;
 
  public:
 	ModuleChanHistory()
-		: m(this)
+		: ServerEventListener(this)
+		, m(this)
 		, botmode(this, "bot")
+		, batchcap(this)
+		, batchmanager(this)
+		, batch("chathistory")
 		, servertimemanager(this)
 	{
 	}
@@ -141,6 +138,11 @@ class ModuleChanHistory : public Module
 		dobots = tag->getBool("bots", true);
 	}
 
+	ModResult OnBroadcastMessage(Channel* channel, const Server* server) CXX11_OVERRIDE
+	{
+		return channel->IsModeSet(m) ? MOD_RES_ALLOW : MOD_RES_PASSTHRU;
+	}
+
 	void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE
 	{
 		if ((target.type == MessageTarget::TYPE_CHANNEL) && (target.status == 0) && (details.type == MSG_PRIVMSG))
@@ -172,7 +174,7 @@ class ModuleChanHistory : public Module
 		if (list->maxtime)
 			mintime = ServerInstance->Time() - list->maxtime;
 
-		if (sendnotice)
+		if ((sendnotice) && (!batchcap.get(localuser)))
 		{
 			std::string message("Replaying up to " + ConvToStr(list->maxlen) + " lines of pre-join history");
 			if (list->maxtime > 0)
@@ -180,6 +182,12 @@ class ModuleChanHistory : public Module
 			memb->WriteNotice(message);
 		}
 
+		if (batchmanager)
+		{
+			batchmanager->Start(batch);
+			batch.GetBatchStartMessage().PushParamRef(memb->chan->name);
+		}
+
 		for(std::deque<HistoryItem>::iterator i = list->lines.begin(); i != list->lines.end(); ++i)
 		{
 			const HistoryItem& item = *i;
@@ -188,14 +196,18 @@ class ModuleChanHistory : public Module
 				ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, item.sourcemask, memb->chan, item.text);
 				if (servertimemanager)
 					servertimemanager->Set(msg, item.ts);
+				batch.AddToBatch(msg);
 				localuser->Send(ServerInstance->GetRFCEvents().privmsg, msg);
 			}
 		}
+
+		if (batchmanager)
+			batchmanager->End(batch);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides channel history replayed on join", VF_VENDOR);
+		return Version("Provides channel mode +H, allows for the channel message history to be replayed on join", VF_VENDOR);
 	}
 };