1 files changed, 53 insertions, 61 deletions

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 651e659b5..ce6a31a34 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -23,97 +23,107 @@
  */
 
 
-/* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
-
-#define _CRT_SECURE_NO_DEPRECATE
-#define _SCL_SECURE_NO_DEPRECATE
-
 #include "inspircd.h"
-#include "u_listmode.h"
+#include "listmode.h"
+#include "modules/exemption.h"
+
+enum
+{
+	// InspIRCd-specific.
+	ERR_ALREADYCHANFILTERED = 937,
+	ERR_NOSUCHCHANFILTER = 938,
+	ERR_CHANFILTERFULL = 939
+};
 
 /** Handles channel mode +g
  */
 class ChanFilter : public ListModeBase
 {
  public:
+	unsigned long maxlen;
+
 	ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
 
-	virtual bool ValidateParam(User* user, Channel* chan, std::string &word)
+	bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
 	{
-		if ((word.length() > 35) || (word.empty()))
+		if (word.length() > maxlen)
 		{
-			user->WriteNumeric(935, "%s %s %s :word is too %s for censor list",user->nick.c_str(), chan->name.c_str(), word.c_str(), (word.empty() ? "short" : "long"));
+			user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Word is too long for the spamfilter list"));
 			return false;
 		}
 
 		return true;
 	}
 
-	virtual bool TellListTooLong(User* user, Channel* chan, std::string &word)
+	void TellListTooLong(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
 	{
-		user->WriteNumeric(939, "%s %s %s :Channel spamfilter list is full", user->nick.c_str(), chan->name.c_str(), word.c_str());
-		return true;
+		user->WriteNumeric(ERR_CHANFILTERFULL, chan->name, word, "Channel spamfilter list is full");
 	}
 
-	virtual void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
+	void TellAlreadyOnList(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
 	{
-		user->WriteNumeric(937, "%s %s :The word %s is already on the spamfilter list",user->nick.c_str(), chan->name.c_str(), word.c_str());
+		user->WriteNumeric(ERR_ALREADYCHANFILTERED, chan->name, InspIRCd::Format("The word %s is already on the spamfilter list", word.c_str()));
 	}
 
-	virtual void TellNotSet(User* user, Channel* chan, std::string &word)
+	void TellNotSet(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE
 	{
-		user->WriteNumeric(938, "%s %s :No such spamfilter word is set",user->nick.c_str(), chan->name.c_str());
+		user->WriteNumeric(ERR_NOSUCHCHANFILTER, chan->name, "No such spamfilter word is set");
 	}
 };
 
 class ModuleChanFilter : public Module
 {
+	CheckExemption::EventProvider exemptionprov;
 	ChanFilter cf;
 	bool hidemask;
+	bool notifyuser;
 
  public:
 
 	ModuleChanFilter()
-		: cf(this)
+		: exemptionprov(this)
+		, cf(this)
 	{
 	}
 
-	void init()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		ServerInstance->Modules->AddService(cf);
-
-		cf.DoImplements(this);
-		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-
-		OnRehash(NULL);
-	}
-
-	virtual void OnRehash(User* user)
-	{
-		hidemask = ServerInstance->Config->ConfValue("chanfilter")->getBool("hidemask");
+		ConfigTag* tag = ServerInstance->Config->ConfValue("chanfilter");
+		hidemask = tag->getBool("hidemask");
+		cf.maxlen = tag->getUInt("maxlen", 35, 10, 100);
+		notifyuser = tag->getBool("notifyuser", true);
 		cf.DoRehash();
 	}
 
-	virtual ModResult ProcessMessages(User* user,Channel* chan,std::string &text)
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		ModResult res = ServerInstance->OnCheckExemption(user,chan,"filter");
+		if (target.type != MessageTarget::TYPE_CHANNEL)
+			return MOD_RES_PASSTHRU;
+
+		Channel* chan = target.Get<Channel>();
+		ModResult res = CheckExemption::Call(exemptionprov, user, chan, "filter");
 
 		if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
 			return MOD_RES_PASSTHRU;
 
-		modelist* list = cf.extItem.get(chan);
+		ListModeBase::ModeList* list = cf.GetList(chan);
 
 		if (list)
 		{
-			for (modelist::iterator i = list->begin(); i != list->end(); i++)
+			for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); i++)
 			{
-				if (InspIRCd::Match(text, i->mask))
+				if (InspIRCd::Match(details.text, i->mask))
 				{
+					if (!notifyuser)
+					{
+						details.echooriginal = true;
+						return MOD_RES_DENY;
+					}
+
 					if (hidemask)
-						user->WriteNumeric(404, "%s %s :Cannot send to channel (your message contained a censored word)",user->nick.c_str(), chan->name.c_str());
+						user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your message contained a censored word)");
 					else
-						user->WriteNumeric(404, "%s %s %s :Cannot send to channel (your message contained a censored word)",user->nick.c_str(), chan->name.c_str(), i->mask.c_str());
+						user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (your message contained a censored word: " + i->mask + ")");
 					return MOD_RES_DENY;
 				}
 			}
@@ -122,32 +132,14 @@ class ModuleChanFilter : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		if (target_type == TYPE_CHANNEL)
-		{
-			return ProcessMessages(user,(Channel*)dest,text);
-		}
-		return MOD_RES_PASSTHRU;
-	}
-
-	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-	{
-		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
-	}
+		// We don't send any link data if the length is 35 for compatibility with the 2.0 branch.
+		std::string maxfilterlen;
+		if (cf.maxlen != 35)
+			maxfilterlen.assign(ConvToStr(cf.maxlen));
 
-	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
-	{
-		cf.DoSyncChannel(chan, proto, opaque);
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR);
-	}
-
-	virtual ~ModuleChanFilter()
-	{
+		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR, maxfilterlen);
 	}
 };