X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_deaf.cpp;h=e360e2a2e6a117cb320423e57dc3f22ebf4eb78c;hb=5a2af6ded883d71c6c4c9f1497cca1721f8b0742;hp=2f7221313679fb09c2f765ade43438dd6667adf6;hpb=66ecf04088b747c00e7fdf8380fbece7848018be;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 2f7221313..e360e2a2e 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -34,7 +34,7 @@ class DeafMode : public ModeHandler
 			return MODEACTION_DENY;
 
 		if (adding)
-			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->WriteNotice("*** You have enabled user mode +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;
@@ -57,7 +57,7 @@ class PrivDeafMode : public ModeHandler
 			return MODEACTION_DENY;
 
 		if (adding)
-			dest->WriteNotice("*** You have enabled usermode +D, private deaf mode. This mode means you WILL NOT receive any messages and notices from any nicks. If you did NOT mean to do this, use /mode " + dest->nick + " -D.");
+			dest->WriteNotice("*** You have enabled user mode +D, private deaf mode. This mode means you WILL NOT receive any messages and notices from any nicks. If you did NOT mean to do this, use /mode " + dest->nick + " -D.");
 
 		dest->SetMode(this, adding);
 		return MODEACTION_ALLOW;
@@ -89,50 +89,58 @@ class ModuleDeaf : public Module
 
 	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		if (target.type == MessageTarget::TYPE_CHANNEL)
+		switch (target.type)
 		{
-			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)
-			// Then it is obviously going to get through +d, no exemption list required
-			if (deaf_bypasschars_uline.empty() && is_bypasschar)
-				return MOD_RES_PASSTHRU;
-			// If it matches both bypasschar and bypasschar_uline, it will get through.
-			if (is_bypasschar && is_bypasschar_uline)
-				return MOD_RES_PASSTHRU;
-
-			const Channel::MemberMap& ulist = chan->GetUsers();
-			for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
+			case MessageTarget::TYPE_CHANNEL:
 			{
-				// not +d
-				if (!i->first->IsModeSet(deafmode))
-					continue;
-
-				bool is_a_uline = i->first->server->IsULine();
-				// matched a U-line only bypass
-				if (is_bypasschar_uline && is_a_uline)
-					continue;
-				// matched a regular bypass
-				if (is_bypasschar && !is_a_uline)
-					continue;
-
-				// don't deliver message!
-				details.exemptions.insert(i->first);
+				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)
+				// Then it is obviously going to get through +d, no exemption list required
+				if (deaf_bypasschars_uline.empty() && is_bypasschar)
+					return MOD_RES_PASSTHRU;
+				// If it matches both bypasschar and bypasschar_uline, it will get through.
+				if (is_bypasschar && is_bypasschar_uline)
+					return MOD_RES_PASSTHRU;
+
+				const Channel::MemberMap& ulist = chan->GetUsers();
+				for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
+				{
+					// not +d
+					if (!i->first->IsModeSet(deafmode))
+						continue;
+
+					bool is_a_uline = i->first->server->IsULine();
+					// matched a U-line only bypass
+					if (is_bypasschar_uline && is_a_uline)
+						continue;
+					// matched a regular bypass
+					if (is_bypasschar && !is_a_uline)
+						continue;
+
+					// don't deliver message!
+					details.exemptions.insert(i->first);
+				}
+				break;
 			}
-		}
-		else if (target.type == MessageTarget::TYPE_USER)
-		{
-			User* targ = target.Get<User>();
-			if (!targ->IsModeSet(privdeafmode))
-				return MOD_RES_PASSTHRU;
+			case MessageTarget::TYPE_USER:
+			{
+				User* targ = target.Get<User>();
+				if (!targ->IsModeSet(privdeafmode))
+					return MOD_RES_PASSTHRU;
 
-			if (!privdeafuline && user->server->IsULine())
-				return MOD_RES_DENY;
+				if (!privdeafuline && user->server->IsULine())
+					return MOD_RES_DENY;
 
-			if (!user->HasPrivPermission("users/privdeaf-override"))
-				return MOD_RES_DENY;
+				if (!user->HasPrivPermission("users/ignore-privdeaf"))
+					return MOD_RES_DENY;
+
+				break;
+			}
+			case MessageTarget::TYPE_SERVER:
+				break;
 		}
 
 		return MOD_RES_PASSTHRU;
@@ -140,7 +148,7 @@ class ModuleDeaf : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides usermodes +dD to block channel and/or user messages and notices", VF_VENDOR);
+		return Version("Provides user modes +d and +D to block channel and user messages/notices", VF_VENDOR);
 	}
 };