X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=fce00dfc73551e07cd056da29e782def43e943ce;hb=93fa544b2671b078cf81ac04fbb4b48d5e2d1677;hp=747c16d83a1cf98f1b70158ef68829b8ce18a709;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 747c16d83..fce00dfc7 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -20,63 +20,41 @@
  */
 
 
-#define _CRT_SECURE_NO_DEPRECATE
-#define _SCL_SECURE_NO_DEPRECATE
-
 #include "inspircd.h"
-#include <iostream>
+#include "modules/exemption.h"
 
-typedef std::map<irc::string,irc::string> censor_t;
-
-/** Handles usermode +G
- */
-class CensorUser : public SimpleUserModeHandler
-{
- public:
-	CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, "u_censor", 'G') { }
-};
-
-/** Handles channel mode +G
- */
-class CensorChannel : public SimpleChannelModeHandler
-{
- public:
-	CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, "censor", 'G') { }
-};
+typedef insp::flat_map<irc::string, irc::string> censor_t;
 
 class ModuleCensor : public Module
 {
+	CheckExemption::EventProvider exemptionprov;
 	censor_t censors;
-	CensorUser cu;
-	CensorChannel cc;
+	SimpleUserModeHandler cu;
+	SimpleChannelModeHandler cc;
 
  public:
-	ModuleCensor() : cu(this), cc(this) { }
-
-	void init() CXX11_OVERRIDE
+	ModuleCensor()
+		: exemptionprov(this)
+		, cu(this, "u_censor", 'G')
+		, cc(this, "censor", 'G')
 	{
-		/* Read the configuration file on startup.
-		 */
-		OnRehash(NULL);
-		ServerInstance->Modules->AddService(cu);
-		ServerInstance->Modules->AddService(cc);
 	}
 
 	// 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, MessageType msgtype) CXX11_OVERRIDE
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
 
 		bool active = false;
 
-		if (target_type == TYPE_USER)
-			active = ((User*)dest)->IsModeSet(cu);
-		else if (target_type == TYPE_CHANNEL)
+		if (target.type == MessageTarget::TYPE_USER)
+			active = target.Get<User>()->IsModeSet(cu);
+		else if (target.type == MessageTarget::TYPE_CHANNEL)
 		{
-			Channel* c = (Channel*)dest;
+			Channel* c = target.Get<Channel>();
 			active = c->IsModeSet(cc);
-			ModResult res = ServerInstance->OnCheckExemption(user,c,"censor");
+			ModResult res = CheckExemption::Call(exemptionprov, user, c, "censor");
 
 			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
@@ -85,25 +63,26 @@ class ModuleCensor : public Module
 		if (!active)
 			return MOD_RES_PASSTHRU;
 
-		irc::string text2 = text.c_str();
+		irc::string text2 = details.text.c_str();
 		for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
 		{
 			if (text2.find(index->first) != irc::string::npos)
 			{
 				if (index->second.empty())
 				{
-					user->WriteNumeric(ERR_WORDFILTERED, "%s %s %s :Your message contained a censored word, and was blocked", user->nick.c_str(), ((Channel*)dest)->name.c_str(), index->first.c_str());
+					const std::string targname = target.type == MessageTarget::TYPE_CHANNEL ? target.Get<Channel>()->name : target.Get<User>()->nick;
+					user->WriteNumeric(ERR_WORDFILTERED, targname, index->first.c_str(), "Your message contained a censored word, and was blocked");
 					return MOD_RES_DENY;
 				}
 
-				SearchAndReplace(text2, index->first, index->second);
+				stdalgo::string::replace_all(text2, index->first, index->second);
 			}
 		}
-		text = text2.c_str();
+		details.text = text2.c_str();
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		/*
 		 * reload our config file on rehash - we must destroy and re-allocate the classes