X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanhistory.cpp;h=24c6237b3812b6d7e9a18426d2563381ef6c4944;hb=c77cc4f737c782c3a56d69da0eac82edd41d4976;hp=6633e9582f7b3d284e61f880afedc4c867396f54;hpb=e586aaab7c4f7b03514c83451d73b73f55dc6998;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 6633e9582..24c6237b3 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;
@@ -94,14 +92,12 @@ class HistoryMode : public ModeHandler
 			{
 				ext.set(channel, new HistoryList(len, time));
 			}
-			channel->SetModeParam('H', parameter);
 		}
 		else
 		{
-			if (!channel->IsModeSet('H'))
+			if (!channel->IsModeSet(this))
 				return MODEACTION_DENY;
 			ext.unset(channel);
-			channel->SetModeParam('H', "");
 		}
 		return MODEACTION_ALLOW;
 	}
@@ -111,31 +107,24 @@ class ModuleChanHistory : public Module
 {
 	HistoryMode m;
 	bool sendnotice;
+	UserModeReference botmode;
+	bool dobots;
  public:
-	ModuleChanHistory() : m(this)
+	ModuleChanHistory() : m(this), botmode(this, "bot")
 	{
 	}
 
-	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);
-	}
-
-	void OnRehash(User*)
+	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&)
+	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);
@@ -149,11 +138,14 @@ class ModuleChanHistory : public Module
 		}
 	}
 
-	void OnPostJoin(Membership* memb)
+	void OnPostJoin(Membership* memb) CXX11_OVERRIDE
 	{
 		if (IS_REMOTE(memb->user))
 			return;
 
+		if (memb->user->IsModeSet(botmode) && !dobots)
+			return;
+
 		HistoryList* list = m.ext.get(memb->chan);
 		if (!list)
 			return;
@@ -173,7 +165,7 @@ class ModuleChanHistory : public Module
 		}
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides channel history replayed on join", VF_VENDOR);
 	}