Automatically prune the history lists in chanhistory.

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 38ec217dff7abcda16825c75d0f80f079fd440ce..3ad6b81e64c90e276b1c3caed9d6da25ff4246c1 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -61,6 +61,18 @@ struct HistoryList
                , 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> >
@@ -108,6 +120,7 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
 
                        history->maxlen = len;
                        history->maxtime = time;
+                       history->Prune();
                }
                else
                {
@@ -165,7 +178,7 @@ class ModuleChanHistory
                }
        }
 
-       void SendHistory(LocalUser* user, Channel* channel, HistoryList* list, time_t mintime)
+       void SendHistory(LocalUser* user, Channel* channel, HistoryList* list)
        {
                if (batchmanager)
                {
@@ -173,19 +186,16 @@ class ModuleChanHistory
                        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)
@@ -250,7 +260,7 @@ class ModuleChanHistory
                        return;
 
                HistoryList* list = historymode.ext.get(memb->chan);
-               if (!list)
+               if (!list || !list->Prune())
                        return;
 
                if ((prefixmsg) && (!batchcap.get(localuser)))
@@ -261,11 +271,7 @@ class ModuleChanHistory
                        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