diff options
| -rw-r--r-- | src/modules/m_chanhistory.cpp | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp index f440040b7..0e5bfd082 100644 --- a/src/modules/m_chanhistory.cpp +++ b/src/modules/m_chanhistory.cpp @@ -25,8 +25,8 @@ struct HistoryItem struct HistoryList { std::deque<HistoryItem> lines; - unsigned int max; - HistoryList(unsigned int Max) : max(Max) {} + unsigned int maxlen, maxtime; + HistoryList(unsigned int len, unsigned int time) : maxlen(len), maxtime(time) {} }; class HistoryMode : public ModeHandler @@ -38,12 +38,16 @@ class HistoryMode : public ModeHandler ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - int max = atoi(parameter.c_str()); - if (adding && max == 0) - return MODEACTION_DENY; if (adding) { - ext.set(channel, new HistoryList(max)); + std::string::size_type colon = parameter.find(':'); + if (colon == std::string::npos) + return MODEACTION_DENY; + int len = atoi(parameter.substr(0, colon).c_str()); + int time = atoi(parameter.substr(colon+1).c_str()); + if (len <= 0 || time < 0 || len > 50) + return MODEACTION_DENY; + ext.set(channel, new HistoryList(len, time)); channel->SetModeParam('H', parameter); } else @@ -58,9 +62,7 @@ class HistoryMode : public ModeHandler class ModuleChanHistory : public Module { HistoryMode m; - public: - ModuleChanHistory() : m(this) { if (!ServerInstance->Modes->AddMode(&m)) @@ -70,6 +72,11 @@ class ModuleChanHistory : public Module ServerInstance->Modules->Attach(eventlist, this, 2); } + ~ModuleChanHistory() + { + ServerInstance->Modes->DelMode(&m); + } + void OnUserMessage(User* user,void* dest,int target_type, const std::string &text, char status, const CUList&) { if (target_type == TYPE_CHANNEL && status == 0) @@ -82,7 +89,7 @@ class ModuleChanHistory : public Module snprintf(buf, MAXBUF, ":%s PRIVMSG %s :%s", user->GetFullHost().c_str(), c->name.c_str(), text.c_str()); list->lines.push_back(HistoryItem(buf)); - if (list->lines.size() > list->max) + if (list->lines.size() > list->maxlen) list->lines.pop_front(); } } @@ -93,8 +100,16 @@ class ModuleChanHistory : public Module HistoryList* list = m.ext.get(memb->chan); if (!list) return; + time_t mintime = 0; + if (list->maxtime) + mintime = ServerInstance->Time() - list->maxtime; + memb->user->WriteServ("NOTICE %s :Replaying up to %d lines of pre-join history spanning up to %d seconds", + memb->chan->name.c_str(), list->maxlen, list->maxtime); for(std::deque<HistoryItem>::iterator i = list->lines.begin(); i != list->lines.end(); ++i) - memb->user->Write(i->line); + { + if (i->ts >= mintime) + memb->user->Write(i->line); + } } Version GetVersion() |