X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanhistory.cpp;h=e48e67fe5557ffb601425de6dde5ceba787e3b7b;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=f440040b7a37e14de909f06af0f96f2e60ccab41;hpb=55c2a6f29af89105d2b9444226d60fc9c914dca7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp index f440040b7..e48e67fe5 100644 --- a/src/modules/m_chanhistory.cpp +++ b/src/modules/m_chanhistory.cpp @@ -1,16 +1,22 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" /* $ModDesc: Provides channel history for a given number of lines */ @@ -25,29 +31,75 @@ struct HistoryItem struct HistoryList { std::deque 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 { + 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: SimpleExtItem ext; + unsigned int maxlines; HistoryMode(Module* Creator) : ModeHandler(Creator, "history", 'H', PARAM_SETONLY, MODETYPE_CHANNEL), ext("history", Creator) { } 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; + + std::string duration = parameter.substr(colon+1); + if ((IS_LOCAL(source)) && ((duration.length() > 10) || (!IsValidDuration(duration)))) + return MODEACTION_DENY; + + unsigned int len = ConvToInt(parameter.substr(0, colon)); + int time = ServerInstance->Duration(duration); + if (len == 0 || time < 0) + return MODEACTION_DENY; + if (len > maxlines && IS_LOCAL(source)) + return MODEACTION_DENY; + if (len > maxlines) + len = maxlines; + if (parameter == channel->GetModeParameter(this)) + return MODEACTION_DENY; + + HistoryList* history = ext.get(channel); + if (history) + { + // Shrink the list if the new line number limit is lower than the old one + if (len < history->lines.size()) + history->lines.erase(history->lines.begin(), history->lines.begin() + (history->lines.size() - len)); + + history->maxlen = len; + history->maxtime = time; + } + else + { + ext.set(channel, new HistoryList(len, time)); + } channel->SetModeParam('H', parameter); } else { + if (!channel->IsModeSet('H')) + return MODEACTION_DENY; ext.unset(channel); channel->SetModeParam('H', ""); } @@ -58,16 +110,27 @@ class HistoryMode : public ModeHandler class ModuleChanHistory : public Module { HistoryMode m; - + bool sendnotice; public: - ModuleChanHistory() : m(this) { - if (!ServerInstance->Modes->AddMode(&m)) - throw ModuleException("Could not add new modes!"); + } + + void init() + { + ServerInstance->Modules->AddService(m); + ServerInstance->Modules->AddService(m.ext); + + Implementation eventlist[] = { I_OnPostJoin, I_OnUserMessage, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + OnRehash(NULL); + } - Implementation eventlist[] = { I_OnUserJoin, I_OnUserMessage }; - ServerInstance->Modules->Attach(eventlist, this, 2); + void OnRehash(User*) + { + ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory"); + m.maxlines = tag->getInt("maxlines", 50); + sendnotice = tag->getBool("notice", true); } void OnUserMessage(User* user,void* dest,int target_type, const std::string &text, char status, const CUList&) @@ -82,24 +145,40 @@ 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(); } } } - void OnUserJoin(Membership* memb, bool sync, bool created, CUList& except_list) + void OnPostJoin(Membership* memb) { + if (IS_REMOTE(memb->user)) + return; + HistoryList* list = m.ext.get(memb->chan); if (!list) return; + time_t mintime = 0; + if (list->maxtime) + mintime = ServerInstance->Time() - list->maxtime; + + if (sendnotice) + { + 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::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() { - return Version("Provides channel history replayed on join", VF_COMMON | VF_VENDOR); + return Version("Provides channel history replayed on join", VF_VENDOR); } };