#include "inspircd.h"
+#include "modules/ircv3_servertime.h"
+#include "modules/ircv3_batch.h"
+#include "modules/server.h"
struct HistoryItem
{
struct HistoryList
{
std::deque<HistoryItem> lines;
- unsigned int maxlen, maxtime;
- std::string param;
+ unsigned int maxlen;
+ unsigned int maxtime;
- HistoryList(unsigned int len, unsigned int time, const std::string& oparam)
- : maxlen(len), maxtime(time), param(oparam) { }
+ HistoryList(unsigned int len, unsigned int time)
+ : maxlen(len)
+ , maxtime(time)
+ {
+ }
};
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)
: ParamMode<HistoryMode, SimpleExtItem<HistoryList> >(Creator, "history", 'H')
{
+ syntax = "<max-messages>:<max-duration>";
}
ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
}
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;
history->maxlen = len;
history->maxtime = time;
- history->param = parameter;
}
else
{
- ext.set(channel, new HistoryList(len, time, parameter));
+ ext.set(channel, new HistoryList(len, time));
}
return MODEACTION_ALLOW;
}
void SerializeParam(Channel* chan, const HistoryList* history, std::string& out)
{
- out.append(history->param);
+ out.append(ConvToStr(history->maxlen));
+ out.append(":");
+ out.append(InspIRCd::DurationString(history->maxtime));
}
};
-class ModuleChanHistory : public Module
+class ModuleChanHistory
+ : public Module
+ , public ServerProtocol::BroadcastEventListener
{
+ private:
HistoryMode m;
bool sendnotice;
UserModeReference botmode;
bool dobots;
+ IRCv3::Batch::CapReference batchcap;
+ IRCv3::Batch::API batchmanager;
+ IRCv3::Batch::Batch batch;
+ IRCv3::ServerTime::API servertimemanager;
+
+ void SendHistory(LocalUser* user, Channel* channel, HistoryList* list, time_t mintime)
+ {
+ if (batchmanager)
+ {
+ batchmanager->Start(batch);
+ batch.GetBatchStartMessage().PushParamRef(channel->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, channel, item.text);
+ if (servertimemanager)
+ servertimemanager->Set(msg, item.ts);
+ batch.AddToBatch(msg);
+ user->Send(ServerInstance->GetRFCEvents().privmsg, msg);
+ }
+ }
+
+ if (batchmanager)
+ batchmanager->End(batch);
+ }
+
public:
- ModuleChanHistory() : m(this), botmode(this, "bot")
+ ModuleChanHistory()
+ : ServerProtocol::BroadcastEventListener(this)
+ , m(this)
+ , botmode(this, "bot")
+ , batchcap(this)
+ , batchmanager(this)
+ , batch("chathistory")
+ , servertimemanager(this)
{
}
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))
HistoryList* list = m.ext.get(memb->chan);
if (!list)
return;
- time_t mintime = 0;
- 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");
+ message.append(" spanning up to " + InspIRCd::DurationString(list->maxtime));
memb->WriteNotice(message);
}
- 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);
- localuser->Send(ServerInstance->GetRFCEvents().privmsg, msg);
- }
- }
+ time_t mintime = 0;
+ if (list->maxtime)
+ mintime = ServerInstance->Time() - list->maxtime;
+
+ SendHistory(localuser, memb->chan, list, mintime);
}
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);
}
};
projects / user / henk / code / inspircd.git / blobdiff