diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-12-16 13:00:31 +0000 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2017-12-16 13:05:48 +0000 |
| commit | 5f40dce0345e9fa39b3e00c34d550ea6cd202e8e (patch) | |
| tree | 98df77fd1fe3847149e2050ee15d72f46f6a3761 /src/modules | |
| parent | 2afc1af4639ae2bbef397f4f6acc834950017d91 (diff) | |
Only show a duration in m_chanhistory's notice if one is set.
Closes #1235.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_chanhistory.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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<HistoryMode, SimpleExtItem<HistoryList> > 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<HistoryItem>::iterator i = list->lines.begin(); i != list->lines.end(); ++i) |