* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
- * Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
* Copyright (C) 2012-2015, 2018 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
, maxtime(time)
{
}
+
+ size_t Prune()
+ {
+ // Prune expired entries from the list.
+ if (maxtime)
+ {
+ time_t mintime = ServerInstance->Time() - maxtime;
+ while (!lines.empty() && lines.front().ts < mintime)
+ lines.pop_front();
+ }
+ return lines.size();
+ }
};
class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
history->maxlen = len;
history->maxtime = time;
+ history->Prune();
}
else
{
}
}
- void SendHistory(LocalUser* user, Channel* channel, HistoryList* list, time_t mintime)
+ void SendHistory(LocalUser* user, Channel* channel, HistoryList* list)
{
if (batchmanager)
{
batch.GetBatchStartMessage().PushParamRef(channel->name);
}
- for(std::deque<HistoryItem>::iterator i = list->lines.begin(); i != list->lines.end(); ++i)
+ for (std::deque<HistoryItem>::iterator i = list->lines.begin(); i != list->lines.end(); ++i)
{
HistoryItem& item = *i;
- if (item.ts >= mintime)
- {
- ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, item.sourcemask, channel, item.text, item.type);
- for (HistoryTagMap::iterator iter = item.tags.begin(); iter != item.tags.end(); ++iter)
- AddTag(msg, iter->first, iter->second);
- if (servertimemanager)
- servertimemanager->Set(msg, item.ts);
- batch.AddToBatch(msg);
- user->Send(ServerInstance->GetRFCEvents().privmsg, msg);
- }
+ ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, item.sourcemask, channel, item.text, item.type);
+ for (HistoryTagMap::iterator iter = item.tags.begin(); iter != item.tags.end(); ++iter)
+ AddTag(msg, iter->first, iter->second);
+ if (servertimemanager)
+ servertimemanager->Set(msg, item.ts);
+ batch.AddToBatch(msg);
+ user->Send(ServerInstance->GetRFCEvents().privmsg, msg);
}
if (batchmanager)
void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE
{
+ if (target.type != MessageTarget::TYPE_CHANNEL || target.status)
+ return;
+
std::string ctcpname;
- if ((target.type == MessageTarget::TYPE_CHANNEL) && (target.status == 0) && (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION")))
- {
- Channel* c = target.Get<Channel>();
- HistoryList* list = historymode.ext.get(c);
- if (list)
- {
- list->lines.push_back(HistoryItem(user, details));
- if (list->lines.size() > list->maxlen)
- list->lines.pop_front();
- }
- }
+ if (details.IsCTCP(ctcpname) && !irc::equals(ctcpname, "ACTION"))
+ return;
+
+ HistoryList* list = historymode.ext.get(target.Get<Channel>());
+ if (!list)
+ return;
+
+ list->lines.push_back(HistoryItem(user, details));
+ if (list->lines.size() > list->maxlen)
+ list->lines.pop_front();
}
void OnPostJoin(Membership* memb) CXX11_OVERRIDE
return;
HistoryList* list = historymode.ext.get(memb->chan);
- if (!list)
+ if (!list || !list->Prune())
return;
if ((prefixmsg) && (!batchcap.get(localuser)))
memb->WriteNotice(message);
}
- time_t mintime = 0;
- if (list->maxtime)
- mintime = ServerInstance->Time() - list->maxtime;
-
- SendHistory(localuser, memb->chan, list, mintime);
+ SendHistory(localuser, memb->chan, list);
}
Version GetVersion() CXX11_OVERRIDE