X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=d45526df9d63e53d2b67e49797c83b9de216a10f;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=c229ef7529350a2000e79b06352489469e047f02;hpb=638381c529a2f19c699718234d689e54ad459c97;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index c229ef752..d45526df9 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -18,32 +18,10 @@
 
 /** Handles the +P channel mode
  */
-class BlockCaps : public ModeHandler
+class BlockCaps : public SimpleChannelModeHandler
 {
  public:
-	BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-	{
-		if (adding)
-		{
-			if (!channel->IsModeSet('B'))
-			{
-				channel->SetMode('B',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('B'))
-			{
-				channel->SetMode('B',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
+	BlockCaps(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'B') { }
 };
 
 class ModuleBlockCAPS : public Module
@@ -90,8 +68,22 @@ public:
 			if (c->IsModeSet('B'))
 			{
 				int caps = 0;
+				const char* actstr = "\1ACTION ";
+				int act = 0;
+
 				for (std::string::iterator i = text.begin(); i != text.end(); i++)
+				{
+					/* Smart fix for suggestion from Jobe, ignore CTCP ACTION (part of /ME) */
+					if (*actstr && *i == *actstr++ && act != -1)
+					{
+						act++;
+						continue;
+					}
+					else
+						act = -1;
+
 					caps += capsmap[(unsigned char)*i];
+				}
 				if ( ((caps*100)/(int)text.length()) >= percent )
 				{
 					user->WriteServ( "404 %s %s :Your line cannot be more than %d%% capital letters if it is %d or more letters long", user->nick, c->name, percent, minlen);