Fix for last nights blockcaps tweak to make it a little more accurate

[user/henk/code/inspircd.git] / src / modules / m_blockcaps.cpp

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 3e8fdccc5e6726996d86b2ba50ef752366706ed7..d45526df9d63e53d2b67e49797c83b9de216a10f 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -68,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);