Improve the description of the maphide module.

[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 0c39453465b88a6265884ad1f90c580924b79fb2..06840744b1e7269ad7d9806bee8079def89720e6 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -18,6 +18,9 @@
 
 
 #include "inspircd.h"
+#include "modules/ircv3_servertime.h"
+#include "modules/ircv3_batch.h"
+#include "modules/server.h"
 
 struct HistoryItem
 {
@@ -116,14 +119,28 @@ 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), botmode(this, "bot")
+       ModuleChanHistory()
+               : ServerEventListener(this)
+               , m(this)
+               , botmode(this, "bot")
+               , batchcap(this)
+               , batchmanager(this)
+               , batch("chathistory")
+               , servertimemanager(this)
        {
        }
 
@@ -135,6 +152,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))
@@ -166,7 +188,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)
@@ -174,15 +196,27 @@ 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;
                        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