1 files changed, 24 insertions, 87 deletions

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 43b24cfae..e58d130a5 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides usermode +d to block channel messages and channel notices */
-
 /** User mode +d - filter out channel messages and channel notices
  */
 class User_d : public ModeHandler
@@ -30,33 +28,22 @@ 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;
+
 		if (adding)
-		{
-			if (!dest->IsModeSet('d'))
-			{
-				dest->WriteServ("NOTICE %s :*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode %s -d.", dest->nick.c_str(), dest->nick.c_str());
-				dest->SetMode('d',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet('d'))
-			{
-				dest->SetMode('d',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-		return MODEACTION_DENY;
+			dest->WriteNotice("*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode " + dest->nick + " -d.");
+
+		dest->SetMode(this, adding);
+		return MODEACTION_ALLOW;
 	}
 };
 
 class ModuleDeaf : public Module
 {
 	User_d m1;
-
 	std::string deaf_bypasschars;
 	std::string deaf_bypasschars_uline;
 
@@ -66,84 +53,40 @@ class ModuleDeaf : public Module
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(m1);
-
-		OnRehash(NULL);
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
-	virtual void OnRehash(User* user)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("deaf");
 		deaf_bypasschars = tag->getString("bypasschars");
 		deaf_bypasschars_uline = tag->getString("bypasscharsuline");
 	}
 
-	virtual ModResult OnUserPreNotice(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 (target_type == TYPE_CHANNEL)
-		{
-			Channel* chan = (Channel*)dest;
-			if (chan)
-				this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list);
-		}
+		if (target.type != MessageTarget::TYPE_CHANNEL)
+			return MOD_RES_PASSTHRU;
 
-		return MOD_RES_PASSTHRU;
-	}
-
-	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-	{
-		if (target_type == TYPE_CHANNEL)
-		{
-			Channel* chan = (Channel*)dest;
-			if (chan)
-				this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list);
-		}
-
-		return MOD_RES_PASSTHRU;
-	}
-
-	virtual void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list)
-	{
-		const UserMembList *ulist = chan->GetUsers();
-		bool is_a_uline;
-		bool is_bypasschar, is_bypasschar_avail;
-		bool is_bypasschar_uline, is_bypasschar_uline_avail;
-
-		is_bypasschar = is_bypasschar_avail = is_bypasschar_uline = is_bypasschar_uline_avail = 0;
-		if (!deaf_bypasschars.empty())
-		{
-			is_bypasschar_avail = 1;
-			if (deaf_bypasschars.find(text[0], 0) != std::string::npos)
-				is_bypasschar = 1;
-		}
-		if (!deaf_bypasschars_uline.empty())
-		{
-			is_bypasschar_uline_avail = 1;
-			if (deaf_bypasschars_uline.find(text[0], 0) != std::string::npos)
-				is_bypasschar_uline = 1;
-		}
+		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 (!is_bypasschar_uline_avail && is_bypasschar)
-			return;
+		if (deaf_bypasschars_uline.empty() && is_bypasschar)
+			return MOD_RES_PASSTHRU;
 
-		for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
+		const Channel::MemberMap& ulist = chan->GetUsers();
+		for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
 		{
 			/* not +d ? */
-			if (!i->first->IsModeSet('d'))
+			if (!i->first->IsModeSet(m1))
 				continue; /* deliver message */
 			/* matched both U-line only and regular bypasses */
 			if (is_bypasschar && is_bypasschar_uline)
 				continue; /* deliver message */
 
-			is_a_uline = ServerInstance->ULine(i->first->server);
+			bool is_a_uline = i->first->server->IsULine();
 			/* matched a U-line only bypass */
 			if (is_bypasschar_uline && is_a_uline)
 				continue; /* deliver message */
@@ -151,23 +94,17 @@ class ModuleDeaf : public Module
 			if (is_bypasschar && !is_a_uline)
 				continue; /* deliver message */
 
-			if (status && !strchr(chan->GetAllPrefixChars(i->first), status))
-				continue;
-
 			/* don't deliver message! */
-			exempt_list.insert(i->first);
+			details.exemptions.insert(i->first);
 		}
-	}
 
-	virtual ~ModuleDeaf()
-	{
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides usermode +d to block channel messages and channel notices", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleDeaf)