X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=43d0826dd7138954b28f61acb66d5bc00008bcd9;hb=12a47e788b3eba8e395abdd46c2dc91692b9b292;hp=2c7207698cbaab65c0d8f80bc54c15bb0fc7f30a;hpb=0d95204c9848a56b02a1aca717ddca7f5e60e5a6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 2c7207698..43d0826dd 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -22,31 +22,18 @@
 
 
 #include "inspircd.h"
-
-/* $ModDesc: Provides channel mode +c to block color */
-
-/** Handles the +c channel mode
- */
-class BlockColor : public SimpleChannelModeHandler
-{
- public:
-	BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { }
-};
+#include "modules/exemption.h"
 
 class ModuleBlockColor : public Module
 {
-	BlockColor bc;
+	CheckExemption::EventProvider exemptionprov;
+	SimpleChannelModeHandler bc;
  public:
 
-	ModuleBlockColor() : bc(this)
-	{
-	}
-
-	void init() CXX11_OVERRIDE
+	ModuleBlockColor()
+		: exemptionprov(this)
+		, bc(this, "blockcolor", 'c')
 	{
-		ServerInstance->Modules->AddService(bc);
-		Implementation eventlist[] = { I_OnUserPreMessage, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -54,19 +41,19 @@ class ModuleBlockColor : public Module
 		tokens["EXTBAN"].push_back('c');
 	}
 
-	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 ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
+		if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			Channel* c = (Channel*)dest;
-			ModResult res = ServerInstance->OnCheckExemption(user,c,"blockcolor");
+			Channel* c = target.Get<Channel>();
+			ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor");
 
 			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
 
-			if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet('c')))
+			if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet(bc)))
 			{
-				for (std::string::iterator i = text.begin(); i != text.end(); i++)
+				for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++)
 				{
 					switch (*i)
 					{
@@ -76,7 +63,7 @@ class ModuleBlockColor : public Module
 						case 21:
 						case 22:
 						case 31:
-							user->WriteNumeric(404, "%s %s :Can't send colors to channel (+c set)",user->nick.c_str(), c->name.c_str());
+							user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send colors to channel (+c set)");
 							return MOD_RES_DENY;
 						break;
 					}