Fix m_chanhistory sending the history notice directly to the user.

[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 a0929a0d01c4c6f84e7f50a8b7653bf101bef643..e8a516b947aa8c1f2b7c3c95a2d0917893aa47f1 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -59,7 +59,7 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
        {
        }
 
-       ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
+       ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
        {
                std::string::size_type colon = parameter.find(':');
                if (colon == std::string::npos)
@@ -70,8 +70,8 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
                        return MODEACTION_DENY;
 
                unsigned int len = ConvToInt(parameter.substr(0, colon));
-               int time = InspIRCd::Duration(duration);
-               if (len == 0 || time < 0)
+               unsigned int time = InspIRCd::Duration(duration);
+               if (len == 0)
                        return MODEACTION_DENY;
                if (len > maxlines && IS_LOCAL(source))
                        return MODEACTION_DENY;
@@ -116,7 +116,7 @@ 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);
        }
@@ -154,7 +154,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)