/*
* 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
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)
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;
}
// 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;
}
}
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"));
+ 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(*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);
}
};
projects / user / henk / code / inspircd.git / blobdiff