From 584d4569031d9e5d699d72eb3e09307fc84ea2f8 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Mon, 13 Aug 2018 21:48:06 +0100
Subject: Add support for the IRCv3 batch specification.

Co-authored-by: Attila Molnar <attilamolnar@hush.com>
---
 src/modules/m_chanhistory.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'src/modules/m_chanhistory.cpp')

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 57db002a8..fe4bd9477 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -19,6 +19,7 @@
 
 #include "inspircd.h"
 #include "modules/ircv3_servertime.h"
+#include "modules/ircv3_batch.h"
 
 struct HistoryItem
 {
@@ -123,12 +124,18 @@ class ModuleChanHistory : public Module
 	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)
 		, botmode(this, "bot")
+		, batchcap(this)
+		, batchmanager(this)
+		, batch("chathistory")
 		, servertimemanager(this)
 	{
 	}
@@ -172,7 +179,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 +187,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,9 +201,13 @@ 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
-- 
cgit v1.3.1-10-gc9f91