X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanhistory.cpp;h=f6e7ea40e6071a100203c576e880a744594e1f39;hb=1d020d132ff6d05ffd865d025cf161d7637f10d8;hp=ad10a25242463be7c7fa4eeee79153750a544eea;hpb=c286b42418c3d7614225b1226632a25ac513994b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index ad10a2524..f6e7ea40e 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -19,8 +19,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides channel history for a given number of lines */
-
 struct HistoryItem
 {
 	time_t ts;
@@ -32,10 +30,13 @@ struct HistoryList
 {
 	std::deque<HistoryItem> lines;
 	unsigned int maxlen, maxtime;
-	HistoryList(unsigned int len, unsigned int time) : maxlen(len), maxtime(time) {}
+	std::string param;
+
+	HistoryList(unsigned int len, unsigned int time, const std::string& oparam)
+		: maxlen(len), maxtime(time), param(oparam) { }
 };
 
-class HistoryMode : public ModeHandler
+class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
 {
 	bool IsValidDuration(const std::string& duration)
 	{
@@ -52,83 +53,72 @@ class HistoryMode : public ModeHandler
 	}
 
  public:
-	SimpleExtItem<HistoryList> ext;
 	unsigned int maxlines;
-	HistoryMode(Module* Creator) : ModeHandler(Creator, "history", 'H', PARAM_SETONLY, MODETYPE_CHANNEL),
-		ext("history", Creator) { }
+	HistoryMode(Module* Creator)
+		: ParamMode<HistoryMode, SimpleExtItem<HistoryList> >(Creator, "history", 'H')
+	{
+	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
 	{
-		if (adding)
+		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 = InspIRCd::Duration(duration);
+		if (len == 0 || time < 0)
+			return MODEACTION_DENY;
+		if (len > maxlines && IS_LOCAL(source))
+			return MODEACTION_DENY;
+		if (len > maxlines)
+			len = maxlines;
+
+		HistoryList* history = ext.get(channel);
+		if (history)
 		{
-			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 = InspIRCd::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));
+			// 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));
-			}
+			history->maxlen = len;
+			history->maxtime = time;
+			history->param = parameter;
 		}
 		else
 		{
-			if (!channel->IsModeSet(this))
-				return MODEACTION_DENY;
-			ext.unset(channel);
+			ext.set(channel, new HistoryList(len, time, parameter));
 		}
 		return MODEACTION_ALLOW;
 	}
+
+	void SerializeParam(Channel* chan, const HistoryList* history, std::string& out)
+	{
+		out.append(history->param);
+	}
 };
 
 class ModuleChanHistory : public Module
 {
 	HistoryMode m;
 	bool sendnotice;
+	UserModeReference botmode;
+	bool dobots;
  public:
-	ModuleChanHistory() : m(this)
-	{
-	}
-
-	void init() CXX11_OVERRIDE
+	ModuleChanHistory() : m(this), botmode(this, "bot")
 	{
-		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);
 	}
 
-	void OnRehash(User*) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory");
 		m.maxlines = tag->getInt("maxlines", 50);
 		sendnotice = tag->getBool("notice", true);
+		dobots = tag->getBool("bots", true);
 	}
 
 	void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList&, MessageType msgtype) CXX11_OVERRIDE
@@ -152,6 +142,9 @@ class ModuleChanHistory : public Module
 		if (IS_REMOTE(memb->user))
 			return;
 
+		if (memb->user->IsModeSet(botmode) && !dobots)
+			return;
+
 		HistoryList* list = m.ext.get(memb->chan);
 		if (!list)
 			return;