From 5f40dce0345e9fa39b3e00c34d550ea6cd202e8e Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sat, 16 Dec 2017 13:00:31 +0000 Subject: Only show a duration in m_chanhistory's notice if one is set. Closes #1235. --- src/modules/m_chanhistory.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp index 4ed1ae6ae..c51e6337e 100644 --- a/src/modules/m_chanhistory.cpp +++ b/src/modules/m_chanhistory.cpp @@ -71,7 +71,7 @@ class HistoryMode : public ParamMode > unsigned int len = ConvToInt(parameter.substr(0, colon)); unsigned int time = InspIRCd::Duration(duration); - if (len == 0 || time == 0) + if (len == 0) return MODEACTION_DENY; if (len > maxlines && IS_LOCAL(source)) return MODEACTION_DENY; @@ -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->user->WriteNotice(message); } for(std::deque::iterator i = list->lines.begin(); i != list->lines.end(); ++i) -- cgit v1.2.3