Improve support for wildcards in <link:name>.

[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 c36eeabffd1711fc789304550fe296aaa220c740..fa780427cbaa051c5f7fd5cf31ee551a09857c9a 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -44,14 +44,14 @@ public:
                tokens["EXTBAN"].push_back('B');
        }
 
-       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)
                {
                        if (!IS_LOCAL(user))
                                return MOD_RES_PASSTHRU;
 
-                       Channel* c = (Channel*)dest;
+                       Channel* c = target.Get<Channel>();
                        ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcaps");
 
                        if (res == MOD_RES_ALLOW)
@@ -60,35 +60,31 @@ public:
                        if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet(bc)))
                        {
                                // If the message is a CTCP then we skip it unless it is
-                               // an ACTION in which case we strip the prefix and suffix.
-                               std::string::const_iterator text_begin = text.begin();
-                               std::string::const_iterator text_end = text.end();
-                               if (text[0] == '\1')
+                               // an ACTION in which case we just check against the body.
+                               std::string ctcpname;
+                               std::string message(details.text);
+                               if (details.IsCTCP(ctcpname, message))
                                {
                                        // If the CTCP is not an action then skip it.
-                                       if (text.compare(0, 8, "\1ACTION ", 8))
+                                       if (!irc::equals(ctcpname, "ACTION"))
                                                return MOD_RES_PASSTHRU;
-
-                                       // Skip the CTCP message characters.
-                                       text_begin += 8;
-                                       if (*text.rbegin() == '\1')
-                                               text_end -= 1;
                                }
 
                                // If the message is shorter than the minimum length
                                // then we don't need to do anything else.
-                               size_t length = std::distance(text_begin, text_end);
+                               size_t length = message.length();
                                if (length < minlen)
                                        return MOD_RES_PASSTHRU;
 
                                // Count the characters to see how many upper case and
                                // ignored (non upper or lower) characters there are.
                                size_t upper = 0;
-                               for (std::string::const_iterator iter = text_begin; iter != text_end; ++iter)
+                               for (std::string::const_iterator iter = message.begin(); iter != message.end(); ++iter)
                                {
-                                       if (uppercase.test(*iter))
+                                       unsigned char chr = static_cast<unsigned char>(*iter);
+                                       if (uppercase.test(chr))
                                                upper += 1;
-                                       else if (!lowercase.test(*iter))
+                                       else if (!lowercase.test(chr))
                                                length -= 1;
                                }
 
@@ -108,18 +104,18 @@ public:
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps");
-               percent = tag->getInt("percent", 100, 1, 100);
-               minlen = tag->getInt("minlen", 1, 1, ServerInstance->Config->Limits.MaxLine);
+               percent = tag->getUInt("percent", 100, 1, 100);
+               minlen = tag->getUInt("minlen", 1, 1, ServerInstance->Config->Limits.MaxLine);
 
                lowercase.reset();
                const std::string lower = tag->getString("lowercase", "abcdefghijklmnopqrstuvwxyz");
                for (std::string::const_iterator iter = lower.begin(); iter != lower.end(); ++iter)
-                       lowercase.set(*iter);
+                       lowercase.set(static_cast<unsigned char>(*iter));
 
                uppercase.reset();
                const std::string upper = tag->getString("uppercase", tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"));
                for (std::string::const_iterator iter = upper.begin(); iter != upper.end(); ++iter)
-                       uppercase.set(*iter);
+                       uppercase.set(static_cast<unsigned char>(*iter));
        }
 
        Version GetVersion() CXX11_OVERRIDE