Only show UHNAMES and NAMESX in 005 if the cap module is loaded.

[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 06840744b1e7269ad7d9806bee8079def89720e6..7db851ee37316d61a6cc315b9de2394f9583495c 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -39,34 +39,24 @@ struct HistoryItem
 struct HistoryList
 {
        std::deque<HistoryItem> lines;
-       unsigned int maxlen, maxtime;
-       std::string param;
+       unsigned int maxlen;
+       unsigned int maxtime;
 
-       HistoryList(unsigned int len, unsigned int time, const std::string& oparam)
-               : maxlen(len), maxtime(time), param(oparam) { }
+       HistoryList(unsigned int len, unsigned int time)
+               : maxlen(len)
+               , maxtime(time)
+       {
+       }
 };
 
 class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
 {
-       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'))
-                               continue;
-
-                       if (duration_multi[c] == 1)
-                               return false;
-               }
-               return true;
-       }
-
  public:
        unsigned int maxlines;
        HistoryMode(Module* Creator)
                : ParamMode<HistoryMode, SimpleExtItem<HistoryList> >(Creator, "history", 'H')
        {
+               syntax = "<max-messages>:<max-duration>";
        }
 
        ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
@@ -79,15 +69,15 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
                }
 
                std::string duration(parameter, colon+1);
-               if ((IS_LOCAL(source)) && ((duration.length() > 10) || (!IsValidDuration(duration))))
+               if ((IS_LOCAL(source)) && ((duration.length() > 10) || (!InspIRCd::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 || (len > maxlines && IS_LOCAL(source)))
+               unsigned int len = ConvToNum<unsigned int>(parameter.substr(0, colon));
+               unsigned long time;
+               if (!InspIRCd::Duration(duration, time) || len == 0 || (len > maxlines && IS_LOCAL(source)))
                {
                        source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
                        return MODEACTION_DENY;
@@ -104,18 +94,19 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
 
                        history->maxlen = len;
                        history->maxtime = time;
-                       history->param = parameter;
                }
                else
                {
-                       ext.set(channel, new HistoryList(len, time, parameter));
+                       ext.set(channel, new HistoryList(len, time));
                }
                return MODEACTION_ALLOW;
        }
 
        void SerializeParam(Channel* chan, const HistoryList* history, std::string& out)
        {
-               out.append(history->param);
+               out.append(ConvToStr(history->maxlen));
+               out.append(":");
+               out.append(InspIRCd::DurationString(history->maxtime));
        }
 };
 
@@ -221,7 +212,7 @@ class ModuleChanHistory
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides channel history replayed on join", VF_VENDOR);
+               return Version("Provides channel mode +H, allows for the channel message history to be replayed on join", VF_VENDOR);
        }
 };