X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanhistory.cpp;h=c114891bb80904a598481c1f0d8df1600362372c;hb=3a01b55a118d4937b75541fbf385180f7106fa12;hp=ac6d80bad3c7139a7b7222d8bc2292cc30643210;hpb=5eb361b215d99f25a586f7fd71158e22ea410355;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index ac6d80bad..c114891bb 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -37,12 +37,12 @@ struct HistoryList
 
 class HistoryMode : public ModeHandler
 {
-	bool IsValidDuration(const std::string duration)
+	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'))
+			if (((c >= '0') && (c <= '9')) || (c == 's') || (c == 'S'))
 				continue;
 
 			if (duration_multi[c] == 1)
@@ -70,7 +70,7 @@ class HistoryMode : public ModeHandler
 				return MODEACTION_DENY;
 
 			unsigned int len = ConvToInt(parameter.substr(0, colon));
-			int time = ServerInstance->Duration(duration);
+			int time = InspIRCd::Duration(duration);
 			if (len == 0 || time < 0)
 				return MODEACTION_DENY;
 			if (len > maxlines && IS_LOCAL(source))
@@ -79,7 +79,21 @@ class HistoryMode : public ModeHandler
 				len = maxlines;
 			if (parameter == channel->GetModeParameter(this))
 				return MODEACTION_DENY;
-			ext.set(channel, new HistoryList(len, time));
+
+			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
@@ -102,46 +116,40 @@ class ModuleChanHistory : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(m);
+		ServerInstance->Modules->AddService(m.ext);
 
 		Implementation eventlist[] = { I_OnPostJoin, I_OnUserMessage, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		OnRehash(NULL);
 	}
 
-	void OnRehash(User*)
+	void OnRehash(User*) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory");
 		m.maxlines = tag->getInt("maxlines", 50);
-		sendnotice = tag->getInt("notice", true);
-	}
-
-	~ModuleChanHistory()
-	{
-		ServerInstance->Modes->DelMode(&m);
+		sendnotice = tag->getBool("notice", true);
 	}
 
-	void OnUserMessage(User* user,void* dest,int target_type, const std::string &text, char status, const CUList&)
+	void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList&, MessageType msgtype) CXX11_OVERRIDE
 	{
-		if (target_type == TYPE_CHANNEL && status == 0)
+		if ((target_type == TYPE_CHANNEL) && (status == 0) && (msgtype == MSG_PRIVMSG))
 		{
 			Channel* c = (Channel*)dest;
 			HistoryList* list = m.ext.get(c);
 			if (list)
 			{
-				char buf[MAXBUF];
-				snprintf(buf, MAXBUF, ":%s PRIVMSG %s :%s",
-					user->GetFullHost().c_str(), c->name.c_str(), text.c_str());
-				list->lines.push_back(HistoryItem(buf));
+				const std::string line = ":" + user->GetFullHost() + " PRIVMSG " + c->name + " :" + text;
+				list->lines.push_back(HistoryItem(line));
 				if (list->lines.size() > list->maxlen)
 					list->lines.pop_front();
 			}
 		}
 	}
 
-	void OnPostJoin(Membership* memb)
+	void OnPostJoin(Membership* memb) CXX11_OVERRIDE
 	{
 		if (IS_REMOTE(memb->user))
 			return;
@@ -155,8 +163,7 @@ class ModuleChanHistory : public Module
 
 		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);
+			memb->user->WriteNotice("Replaying up to " + ConvToStr(list->maxlen) + " lines of pre-join history spanning up to " + ConvToStr(list->maxtime) + " seconds");
 		}
 
 		for(std::deque<HistoryItem>::iterator i = list->lines.begin(); i != list->lines.end(); ++i)
@@ -166,7 +173,7 @@ class ModuleChanHistory : public Module
 		}
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides channel history replayed on join", VF_VENDOR);
 	}