X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_deaf.cpp;h=e58d130a52417b429cc46bdf3e87d4befed33de3;hb=b7716ed57704b2b2bcc665a590aecc8f02de631d;hp=fd9b322c0cf947ff1a34518f63b47c6383757774;hpb=8f5efbc7aa33b792e02d01e3288f553e6e98ccaa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index fd9b322c0..e58d130a5 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -28,7 +28,7 @@ class User_d : public ModeHandler
  public:
 	User_d(Module* Creator) : ModeHandler(Creator, "deaf", 'd', PARAM_NONE, MODETYPE_USER) { }
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
 	{
 		if (adding == dest->IsModeSet(this))
 			return MODEACTION_DENY;
@@ -60,20 +60,20 @@ class ModuleDeaf : public Module
 		deaf_bypasschars_uline = tag->getString("bypasscharsuline");
 	}
 
-	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)
+		if (target.type != MessageTarget::TYPE_CHANNEL)
 			return MOD_RES_PASSTHRU;
 
-		Channel* chan = static_cast<Channel*>(dest);
-		bool is_bypasschar = (deaf_bypasschars.find(text[0]) != std::string::npos);
-		bool is_bypasschar_uline = (deaf_bypasschars_uline.find(text[0]) != std::string::npos);
+		Channel* chan = target.Get<Channel>();
+		bool is_bypasschar = (deaf_bypasschars.find(details.text[0]) != std::string::npos);
+		bool is_bypasschar_uline = (deaf_bypasschars_uline.find(details.text[0]) != std::string::npos);
 
 		/*
 		 * If we have no bypasschars_uline in config, and this is a bypasschar (regular)
 		 * Than it is obviously going to get through +d, no build required
 		 */
-		if (!deaf_bypasschars_uline.empty() && is_bypasschar)
+		if (deaf_bypasschars_uline.empty() && is_bypasschar)
 			return MOD_RES_PASSTHRU;
 
 		const Channel::MemberMap& ulist = chan->GetUsers();
@@ -94,11 +94,8 @@ class ModuleDeaf : public Module
 			if (is_bypasschar && !is_a_uline)
 				continue; /* deliver message */
 
-			if (status && !strchr(i->second->GetAllPrefixChars(), status))
-				continue;
-
 			/* don't deliver message! */
-			exempt_list.insert(i->first);
+			details.exemptions.insert(i->first);
 		}
 
 		return MOD_RES_PASSTHRU;