Allow the maximum length of a chanfilter message to be configured.

[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 4ed1ae6ae7be2bad35f69c353b2e7de079b10983..5f081d9decbb17a2b26debf16ad4e4f36702453d 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -63,18 +63,25 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
        {
                std::string::size_type colon = parameter.find(':');
                if (colon == std::string::npos)
+               {
+                       source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
                        return MODEACTION_DENY;
+               }
 
                std::string duration(parameter, colon+1);
                if ((IS_LOCAL(source)) && ((duration.length() > 10) || (!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 || time == 0)
-                       return MODEACTION_DENY;
-               if (len > maxlines && IS_LOCAL(source))
+               if (len == 0 || (len > maxlines && IS_LOCAL(source)))
+               {
+                       source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
                        return MODEACTION_DENY;
+               }
                if (len > maxlines)
                        len = maxlines;
 
@@ -116,20 +123,20 @@ class ModuleChanHistory : public Module
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory");
-               m.maxlines = tag->getInt("maxlines", 50);
+               m.maxlines = tag->getInt("maxlines", 50, 1);
                sendnotice = tag->getBool("notice", true);
                dobots = tag->getBool("bots", true);
        }
 
-       void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList&, MessageType msgtype) CXX11_OVERRIDE
+       void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE
        {
-               if ((target_type == TYPE_CHANNEL) && (status == 0) && (msgtype == MSG_PRIVMSG))
+               if ((target.type == MessageTarget::TYPE_CHANNEL) && (target.status == 0) && (details.type == MSG_PRIVMSG))
                {
-                       Channel* c = (Channel*)dest;
+                       Channel* c = target.Get<Channel>();
                        HistoryList* list = m.ext.get(c);
                        if (list)
                        {
-                               const std::string line = ":" + user->GetFullHost() + " PRIVMSG " + c->name + " :" + text;
+                               const std::string line = ":" + user->GetFullHost() + " PRIVMSG " + c->name + " :" + details.text;
                                list->lines.push_back(HistoryItem(line));
                                if (list->lines.size() > list->maxlen)
                                        list->lines.pop_front();
@@ -154,7 +161,10 @@ class ModuleChanHistory : public Module
 
                if (sendnotice)
                {
-                       memb->user->WriteNotice("Replaying up to " + ConvToStr(list->maxlen) + " lines of pre-join history spanning up to " + ConvToStr(list->maxtime) + " seconds");
+                       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");
+                       memb->WriteNotice(message);
                }
 
                for(std::deque<HistoryItem>::iterator i = list->lines.begin(); i != list->lines.end(); ++i)