X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanhistory.cpp;h=caa3c1e8b5447c5c19ba6e629b2e1ddfa7ba8ce7;hb=8f915e5ddbab4e36bb08f9f9d726e953db1f601f;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..caa3c1e8b 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -25,25 +25,36 @@ 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
 {
  public:
 	SimpleExtItem<HistoryList> ext;
+	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 &parameter, 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 = ServerInstance->Duration(parameter.substr(colon+1));
+			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;
+			ext.set(channel, new HistoryList(len, time));
 			channel->SetModeParam('H', parameter);
 		}
 		else
@@ -58,16 +69,28 @@ class HistoryMode : public ModeHandler
 class ModuleChanHistory : public Module
 {
 	HistoryMode m;
-
  public:
-
 	ModuleChanHistory() : m(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&m))
-			throw ModuleException("Could not add new modes!");
+	}
 
-		Implementation eventlist[] = { I_OnUserJoin, I_OnUserMessage };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+	void init()
+	{
+		ServerInstance->Modules->AddService(m);
+
+		Implementation eventlist[] = { I_OnPostJoin, I_OnUserMessage, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
+		OnRehash(NULL);
+	}
+
+	void OnRehash(User*)
+	{
+		m.maxlines = ServerInstance->Config->ConfValue("chanhistory")->getInt("maxlines", 50);
+	}
+
+	~ModuleChanHistory()
+	{
+		ServerInstance->Modes->DelMode(&m);
 	}
 
 	void OnUserMessage(User* user,void* dest,int target_type, const std::string &text, char status, const CUList&)
@@ -82,24 +105,32 @@ 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)
 	{
 		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()
 	{
-		return Version("Provides channel history replayed on join", VF_COMMON | VF_VENDOR);
+		return Version("Provides channel history replayed on join", VF_VENDOR);
 	}
 };