m_spanningtree Move all server-to-server command handlers into handler classes

[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 ac6d80bad3c7139a7b7222d8bc2292cc30643210..bace497c20dfb2a111b49bd8a11f2428740e6256 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -19,8 +19,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides channel history for a given number of lines */
-
 struct HistoryItem
 {
        time_t ts;
@@ -37,12 +35,12 @@ struct HistoryList
 
 class HistoryMode : public ModeHandler
 {
-       bool IsValidDuration(const std::string duration)
+       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'))
+                       if (((c >= '0') && (c <= '9')) || (c == 's') || (c == 'S'))
                                continue;
 
                        if (duration_multi[c] == 1)
@@ -70,7 +68,7 @@ class HistoryMode : public ModeHandler
                                return MODEACTION_DENY;
 
                        unsigned int len = ConvToInt(parameter.substr(0, colon));
-                       int time = ServerInstance->Duration(duration);
+                       int time = InspIRCd::Duration(duration);
                        if (len == 0 || time < 0)
                                return MODEACTION_DENY;
                        if (len > maxlines && IS_LOCAL(source))
@@ -79,15 +77,27 @@ class HistoryMode : public ModeHandler
                                len = maxlines;
                        if (parameter == channel->GetModeParameter(this))
                                return MODEACTION_DENY;
-                       ext.set(channel, new HistoryList(len, time));
-                       channel->SetModeParam('H', parameter);
+
+                       HistoryList* history = ext.get(channel);
+                       if (history)
+                       {
+                               // Shrink the list if the new line number limit is lower than the old one
+                               if (len < history->lines.size())
+                                       history->lines.erase(history->lines.begin(), history->lines.begin() + (history->lines.size() - len));
+
+                               history->maxlen = len;
+                               history->maxtime = time;
+                       }
+                       else
+                       {
+                               ext.set(channel, new HistoryList(len, time));
+                       }
                }
                else
                {
-                       if (!channel->IsModeSet('H'))
+                       if (!channel->IsModeSet(this))
                                return MODEACTION_DENY;
                        ext.unset(channel);
-                       channel->SetModeParam('H', "");
                }
                return MODEACTION_ALLOW;
        }
@@ -102,46 +112,38 @@ class ModuleChanHistory : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(m);
+               ServerInstance->Modules->AddService(m.ext);
 
-               Implementation eventlist[] = { I_OnPostJoin, I_OnUserMessage, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
                OnRehash(NULL);
        }
 
-       void OnRehash(User*)
+       void OnRehash(User*) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory");
                m.maxlines = tag->getInt("maxlines", 50);
-               sendnotice = tag->getInt("notice", true);
-       }
-
-       ~ModuleChanHistory()
-       {
-               ServerInstance->Modes->DelMode(&m);
+               sendnotice = tag->getBool("notice", true);
        }
 
-       void OnUserMessage(User* user,void* dest,int target_type, const std::string &text, char status, const CUList&)
+       void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList&, MessageType msgtype) CXX11_OVERRIDE
        {
-               if (target_type == TYPE_CHANNEL && status == 0)
+               if ((target_type == TYPE_CHANNEL) && (status == 0) && (msgtype == MSG_PRIVMSG))
                {
                        Channel* c = (Channel*)dest;
                        HistoryList* list = m.ext.get(c);
                        if (list)
                        {
-                               char buf[MAXBUF];
-                               snprintf(buf, MAXBUF, ":%s PRIVMSG %s :%s",
-                                       user->GetFullHost().c_str(), c->name.c_str(), text.c_str());
-                               list->lines.push_back(HistoryItem(buf));
+                               const std::string line = ":" + user->GetFullHost() + " PRIVMSG " + c->name + " :" + text;
+                               list->lines.push_back(HistoryItem(line));
                                if (list->lines.size() > list->maxlen)
                                        list->lines.pop_front();
                        }
                }
        }
 
-       void OnPostJoin(Membership* memb)
+       void OnPostJoin(Membership* memb) CXX11_OVERRIDE
        {
                if (IS_REMOTE(memb->user))
                        return;
@@ -155,8 +157,7 @@ class ModuleChanHistory : public Module
 
                if (sendnotice)
                {
-                       memb->user->WriteServ("NOTICE %s :Replaying up to %d lines of pre-join history spanning up to %d seconds",
-                               memb->chan->name.c_str(), list->maxlen, list->maxtime);
+                       memb->user->WriteNotice("Replaying up to " + ConvToStr(list->maxlen) + " lines of pre-join history spanning up to " + ConvToStr(list->maxtime) + " seconds");
                }
 
                for(std::deque<HistoryItem>::iterator i = list->lines.begin(); i != list->lines.end(); ++i)
@@ -166,7 +167,7 @@ class ModuleChanHistory : public Module
                }
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides channel history replayed on join", VF_VENDOR);
        }