X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=6ea279422e4f9b237d606e5c4640a5a3f5cc978f;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=6ad32bfc1010207530b46b36c976b3fa857f50ce;hpb=ff3b706b2506d7614bce5e54bc88657bd62ebd4d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 6ad32bfc1..6ea279422 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -22,34 +22,17 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
-/** Handles channel mode +S
- */
-class ChannelStripColor : public SimpleChannelModeHandler
-{
- public:
-	ChannelStripColor(Module* Creator) : SimpleChannelModeHandler(Creator, "stripcolor", 'S') { }
-};
-
-/** Handles user mode +S
- */
-class UserStripColor : public SimpleUserModeHandler
-{
- public:
-	UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, "u_stripcolor", 'S') { }
-};
-
-
 class ModuleStripColor : public Module
 {
 	CheckExemption::EventProvider exemptionprov;
-	ChannelStripColor csc;
-	UserStripColor usc;
+	SimpleChannelModeHandler csc;
+	SimpleUserModeHandler usc;
 
  public:
 	ModuleStripColor()
 		: exemptionprov(this)
-		, csc(this)
-		, usc(this)
+		, csc(this, "stripcolor", 'S')
+		, usc(this, "u_stripcolor", 'S')
 	{
 	}
 
@@ -58,22 +41,21 @@ class ModuleStripColor : public Module
 		tokens["EXTBAN"].push_back('S');
 	}
 
-	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)
+		if (target.type == MessageTarget::TYPE_USER)
 		{
-			User* t = (User*)dest;
+			User* t = target.Get<User>();
 			active = t->IsModeSet(usc);
 		}
-		else if (target_type == TYPE_CHANNEL)
+		else if (target.type == MessageTarget::TYPE_CHANNEL)
 		{
-			Channel* t = (Channel*)dest;
-			ModResult res;
-			FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, t, "stripcolor"));
+			Channel* t = target.Get<Channel>();
+			ModResult res = CheckExemption::Call(exemptionprov, user, t, "stripcolor");
 
 			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
@@ -83,7 +65,7 @@ class ModuleStripColor : public Module
 
 		if (active)
 		{
-			InspIRCd::StripColor(text);
+			InspIRCd::StripColor(details.text);
 		}
 
 		return MOD_RES_PASSTHRU;
@@ -99,8 +81,7 @@ class ModuleStripColor : public Module
 
 		if (channel->GetExtBanStatus(user, 'S').check(!user->IsModeSet(csc)))
 		{
-			ModResult res;
-			FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, channel, "stripcolor"));
+			ModResult res = CheckExemption::Call(exemptionprov, user, channel, "stripcolor");
 
 			if (res != MOD_RES_ALLOW)
 				InspIRCd::StripColor(partmessage);
@@ -109,7 +90,7 @@ class ModuleStripColor : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides channel +S mode (strip ansi color)", VF_VENDOR);
+		return Version("Provides channel mode +S, strip ansi color", VF_VENDOR);
 	}
 
 };