Add support for the IRCv3 batch specification.

[user/henk/code/inspircd.git] / src / modules / m_chanhistory.cpp

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 4ed1ae6ae7be2bad35f69c353b2e7de079b10983..fe4bd94777374897551940fef5c0b058e43d4b0b 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -18,12 +18,21 @@
 
 
 #include "inspircd.h"
+#include "modules/ircv3_servertime.h"
+#include "modules/ircv3_batch.h"
 
 struct HistoryItem
 {
        time_t ts;
-       std::string line;
-       HistoryItem(const std::string& Line) : ts(ServerInstance->Time()), line(Line) {}
+       std::string text;
+       std::string sourcemask;
+
+       HistoryItem(User* source, const std::string& Text)
+               : ts(ServerInstance->Time())
+               , text(Text)
+               , sourcemask(source->GetFullHost())
+       {
+       }
 };
 
 struct HistoryList
@@ -63,18 +72,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 || time == 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;
 
@@ -108,29 +124,39 @@ 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")
+       ModuleChanHistory()
+               : m(this)
+               , botmode(this, "bot")
+               , batchcap(this)
+               , batchmanager(this)
+               , batch("chathistory")
+               , servertimemanager(this)
        {
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory");
-               m.maxlines = tag->getInt("maxlines", 50);
+               m.maxlines = tag->getUInt("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;
-                               list->lines.push_back(HistoryItem(line));
+                               list->lines.push_back(HistoryItem(user, details.text));
                                if (list->lines.size() > list->maxlen)
                                        list->lines.pop_front();
                        }
@@ -139,7 +165,8 @@ class ModuleChanHistory : public Module
 
        void OnPostJoin(Membership* memb) CXX11_OVERRIDE
        {
-               if (IS_REMOTE(memb->user))
+               LocalUser* localuser = IS_LOCAL(memb->user);
+               if (!localuser)
                        return;
 
                if (memb->user->IsModeSet(botmode) && !dobots)
@@ -152,16 +179,35 @@ 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)
+                               message.append(" spanning up to " + ConvToStr(list->maxtime) + " seconds");
+                       memb->WriteNotice(message);
+               }
+
+               if (batchmanager)
                {
-                       memb->user->WriteNotice("Replaying up to " + ConvToStr(list->maxlen) + " lines of pre-join history spanning up to " + ConvToStr(list->maxtime) + " seconds");
+                       batchmanager->Start(batch);
+                       batch.GetBatchStartMessage().PushParamRef(memb->chan->name);
                }
 
                for(std::deque<HistoryItem>::iterator i = list->lines.begin(); i != list->lines.end(); ++i)
                {
-                       if (i->ts >= mintime)
-                               memb->user->Write(i->line);
+                       const HistoryItem& item = *i;
+                       if (item.ts >= mintime)
+                       {
+                               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