X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=133c5180dd10338730378e333d20b0e0438053fb;hb=4aa27e75af8da0a5bc2e35f931f0165339f5f289;hp=fdc45a97ec9ba54e6033f0658c4831dfda383137;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index fdc45a97e..133c5180d 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -23,11 +23,9 @@
  */
 
 
-#define _CRT_SECURE_NO_DEPRECATE
-#define _SCL_SECURE_NO_DEPRECATE
-
 #include "inspircd.h"
 #include "listmode.h"
+#include "modules/exemption.h"
 
 /** Handles channel mode +g
  */
@@ -36,65 +34,59 @@ class ChanFilter : public ListModeBase
  public:
 	ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
 
-	bool ValidateParam(User* user, Channel* chan, std::string &word)
-	{
-		if ((word.length() > 35) || (word.empty()))
+	bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE	{
+		if (word.length() > 35)
 		{
-			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(935, chan->name, word, "%word is too long for censor list");
 			return false;
 		}
 
 		return true;
 	}
 
-	void 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());
+		user->WriteNumeric(939, chan->name, word, "Channel spamfilter list is full");
 	}
 
-	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(937, chan->name, InspIRCd::Format("The word %s is already on the spamfilter list", word.c_str()));
 	}
 
-	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(938, chan->name, "No such spamfilter word is set");
 	}
 };
 
 class ModuleChanFilter : public Module
 {
+	CheckExemption::EventProvider exemptionprov;
 	ChanFilter cf;
 	bool hidemask;
 
  public:
 
 	ModuleChanFilter()
-		: cf(this)
-	{
-	}
-
-	void init() CXX11_OVERRIDE
+		: exemptionprov(this)
+		, cf(this)
 	{
-		ServerInstance->Modules->AddService(cf);
-
-		cf.DoImplements(this);
-		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnSyncChannel };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-
-		OnRehash(NULL);
 	}
 
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		hidemask = ServerInstance->Config->ConfValue("chanfilter")->getBool("hidemask");
 		cf.DoRehash();
 	}
 
-	ModResult ProcessMessages(User* user,Channel* chan,std::string &text)
+	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
 	{
-		ModResult res = ServerInstance->OnCheckExemption(user,chan,"filter");
+		if (target_type != TYPE_CHANNEL)
+			return MOD_RES_PASSTHRU;
+
+		Channel* chan = static_cast<Channel*>(dest);
+		ModResult res = CheckExemption::Call(exemptionprov, user, chan, "filter");
 
 		if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
 			return MOD_RES_PASSTHRU;
@@ -108,9 +100,9 @@ class ModuleChanFilter : public Module
 				if (InspIRCd::Match(text, i->mask))
 				{
 					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, i->mask, "Cannot send to channel (your message contained a censored word)");
 					return MOD_RES_DENY;
 				}
 			}
@@ -119,20 +111,6 @@ class ModuleChanFilter : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
-	{
-		if (target_type == TYPE_CHANNEL)
-		{
-			return ProcessMessages(user,(Channel*)dest,text);
-		}
-		return MOD_RES_PASSTHRU;
-	}
-
-	void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
-	{
-		cf.DoSyncChannel(chan, proto, opaque);
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR);