X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=3699fc3aa8622bd2b9083f77a4616fb9b006224c;hb=4132a44396d8fa3d23f87b5cbea5b928aa09769f;hp=86f307bae2ed4e494bccb87555cf75ef3f2f6e1e;hpb=2ab2de1dda8f2043898b9df8004ba5b6c4df7349;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 86f307bae..3699fc3aa 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -20,117 +20,75 @@
 
 
 #include "inspircd.h"
-
-/* $ModDesc: Provides channel +S mode (strip ansi color) */
-
-/** 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') { }
-};
-
+#include "modules/exemption.h"
 
 class ModuleStripColor : public Module
 {
-	bool AllowChanOps;
-	ChannelStripColor csc;
-	UserStripColor usc;
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler csc;
+	SimpleUserModeHandler usc;
 
  public:
-	ModuleStripColor() : csc(this), usc(this)
-	{
-	}
-
-	void init()
+	ModuleStripColor()
+		: exemptionprov(this)
+		, csc(this, "stripcolor", 'S')
+		, usc(this, "u_stripcolor", 'S')
 	{
-		ServerInstance->Modules->AddService(usc);
-		ServerInstance->Modules->AddService(csc);
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-	virtual ~ModuleStripColor()
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
+		tokens["EXTBAN"].push_back('S');
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		ServerInstance->AddExtBanChar('S');
-	}
-
-	virtual void ReplaceLine(std::string &sentence)
-	{
-		/* refactor this completely due to SQUIT bug since the old code would strip last char and replace with \0 --peavey */
-		int seq = 0;
-
- 		for (std::string::iterator i = sentence.begin(); i != sentence.end();)
-		{
-			if (*i == 3)
-				seq = 1;
-			else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) ))
-			{
-				seq++;
-				if ( (seq <= 4) && (*i == ',') )
-					seq = 1;
-				else if (seq > 3)
-					seq = 0;
-			}
-			else
-				seq = 0;
-
-			if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31)))
-				i = sentence.erase(i);
-			else
-				++i;
-		}
-	}
-
-	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	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;
-			active = t->IsModeSet('S');
+			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 = ServerInstance->OnCheckExemption(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;
 
-			active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet('S'));
+			active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet(csc));
 		}
 
 		if (active)
 		{
-			this->ReplaceLine(text);
+			InspIRCd::StripColor(details.text);
 		}
 
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	void OnUserPart(Membership* memb, std::string& partmessage, CUList& except_list) CXX11_OVERRIDE
 	{
-		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
+		User* user = memb->user;
+		Channel* channel = memb->chan;
+
+		if (!IS_LOCAL(user))
+			return;
+
+		if (channel->GetExtBanStatus(user, 'S').check(!user->IsModeSet(csc)))
+		{
+			ModResult res = CheckExemption::Call(exemptionprov, user, channel, "stripcolor");
+
+			if (res != MOD_RES_ALLOW)
+				InspIRCd::StripColor(partmessage);
+		}
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides channel +S mode (strip ansi color)", VF_VENDOR);
 	}