Remove the deprecated blockcaps module.

This commit is contained in:
Sadie Powell 2019-01-25 03:29:36 +00:00
parent b4685e06d4
commit 1529f1fd5c
2 changed files with 1 additions and 157 deletions

View File

@ -170,10 +170,7 @@
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Anticaps module: Adds channel mode +B which allows you to punish
# users that send overly capitalised messages to channels. Unlike the
# blockcaps module this module is more flexible as it has more options
# for punishment and allows channels to configure their own punishment
# policies.
# users that send overly capitalised messages to channels.
#<module name="anticaps">
#
# You may also configure the characters which anticaps considers to be
@ -246,32 +243,6 @@
#
#<blockamsg delay="3" action="killopers">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Block CAPS module: Adds channel mode +B, blocks all-CAPS messages.
#
# NOTE: This module is deprecated and will be removed in a future version
# of InspIRCd. You should use the anticaps module shown above instead.
#<module name="blockcaps">
#
#-#-#-#-#-#-#-#-#-#-#- BLOCKCAPS CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#
# #
# percent - The percentage of a message which must be upper #
# case before it will be blocked. #
# #
# minlen - The minimum length a message must be before it #
# will be blocked. #
# #
# lowercase - The characters which will be considered lower #
# case. #
# #
# uppercase - The characters which will be considered upper #
# case. #
#
#<blockcaps percent="50"
# minlen="5"
# lowercase="abcdefghijklmnopqrstuvwxyz"
# uppercase="ABCDEFGHIJKLMNOPQRSTUVWXYZ">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Block color module: Blocking color-coded messages with chan mode +c.
#<module name="blockcolor">

View File

@ -1,127 +0,0 @@
/*
* 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>
*
* 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
* License as published by the Free Software Foundation, version 2.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "inspircd.h"
#include "modules/exemption.h"
class ModuleBlockCAPS : public Module
{
CheckExemption::EventProvider exemptionprov;
SimpleChannelModeHandler bc;
unsigned int percent;
unsigned int minlen;
std::bitset<UCHAR_MAX> lowercase;
std::bitset<UCHAR_MAX> uppercase;
public:
ModuleBlockCAPS()
: exemptionprov(this)
, bc(this, "blockcaps", 'B')
{
}
void On005Numeric(std::map<std::string, std::string>& tokens) override
{
tokens["EXTBAN"].push_back('B');
}
ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override
{
if (target.type == MessageTarget::TYPE_CHANNEL)
{
if (!IS_LOCAL(user))
return MOD_RES_PASSTHRU;
Channel* c = target.Get<Channel>();
ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcaps");
if (res == MOD_RES_ALLOW)
return MOD_RES_PASSTHRU;
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 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 (!irc::equals(ctcpname, "ACTION"))
return MOD_RES_PASSTHRU;
}
// If the message is shorter than the minimum length
// then we don't need to do anything else.
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 = message.begin(); iter != message.end(); ++iter)
{
unsigned char chr = static_cast<unsigned char>(*iter);
if (uppercase.test(chr))
upper += 1;
else if (!lowercase.test(chr))
length -= 1;
}
// Calculate the percentage which is upper case. If the
// message was entirely symbols then it can't contain
// 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));
return MOD_RES_DENY;
}
}
}
return MOD_RES_PASSTHRU;
}
void ReadConfig(ConfigStatus& status) override
{
ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps");
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(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(static_cast<unsigned char>(*iter));
}
Version GetVersion() override
{
return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR);
}
};
MODULE_INIT(ModuleBlockCAPS)