X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=4148c59b4f2b7f870a320b0da6b7148a2b4f4d5f;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=fa573a699c3e874624eee8d6e01d9106a5243274;hpb=4ab1c43c1eee708fc50a4808f714a731891b75e8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index fa573a699..4148c59b4 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -62,12 +62,12 @@ class ModuleCensor : public Module
 		OnRehash(NULL);
 		ServerInstance->Modules->AddService(cu);
 		ServerInstance->Modules->AddService(cc);
-		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
+		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	// format of a config entry is <badword text="shit" replace="poo">
-	ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) CXX11_OVERRIDE
+	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
 	{
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
@@ -75,11 +75,11 @@ class ModuleCensor : public Module
 		bool active = false;
 
 		if (target_type == TYPE_USER)
-			active = ((User*)dest)->IsModeSet('G');
+			active = ((User*)dest)->IsModeSet(cu);
 		else if (target_type == TYPE_CHANNEL)
 		{
-			active = ((Channel*)dest)->IsModeSet('G');
 			Channel* c = (Channel*)dest;
+			active = c->IsModeSet(cc);
 			ModResult res = ServerInstance->OnCheckExemption(user,c,"censor");
 
 			if (res == MOD_RES_ALLOW)
@@ -107,11 +107,6 @@ class ModuleCensor : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) CXX11_OVERRIDE
-	{
-		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
-	}
-
 	void OnRehash(User* user) CXX11_OVERRIDE
 	{
 		/*