Fix the message sent when SSL profiles are rehashed.

[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 b79e126a3e5658b0f8cb03f0eb295b7d585eb36f..0acdc4d6c0dc7ea8a4f86846d37b9cf688454481 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -1,10 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2008-2009 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -60,31 +64,26 @@ 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 = details.text.begin();
-                               std::string::const_iterator text_end = details.text.end();
-                               if (details.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 (details.text.compare(0, 8, "\1ACTION ", 8))
+                                       if (!irc::equals(ctcpname, "ACTION"))
                                                return MOD_RES_PASSTHRU;
-
-                                       // Skip the CTCP message characters.
-                                       text_begin += 8;
-                                       if (*details.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)
                                {
                                        unsigned char chr = static_cast<unsigned char>(*iter);
                                        if (uppercase.test(chr))
@@ -98,7 +97,8 @@ public:
                                // any upper case letters.
                                if (length > 0 && round((upper * 100) / length) >= percent)
                                {
-                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, InspIRCd::Format("Your message cannot contain %d%% or more capital letters if it's longer than %d characters", percent, minlen));
+                                       const std::string msg = InspIRCd::Format("Your message cannot contain %d%% or more capital letters if it's longer than %d characters", percent, minlen);
+                                       user->WriteNumeric(Numerics::CannotSendTo(c, msg));
                                        return MOD_RES_DENY;
                                }
                        }
@@ -118,14 +118,14 @@ public:
                        lowercase.set(static_cast<unsigned char>(*iter));
 
                uppercase.reset();
-               const std::string upper = tag->getString("uppercase", tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"));
+               const std::string upper = tag->getString("uppercase", tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1));
                for (std::string::const_iterator iter = upper.begin(); iter != upper.end(); ++iter)
                        uppercase.set(static_cast<unsigned char>(*iter));
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR);
+               return Version("Adds channel mode B (blockcaps) which allows channels to block messages which are excessively capitalised.", VF_VENDOR);
        }
 };