class ModuleBlockCAPS : public Module
{
BlockCaps bc;
- int percent;
+ unsigned int percent;
unsigned int minlen;
char capsmap[256];
{
}
- void init() CXX11_OVERRIDE
- {
- OnRehash(NULL);
- ServerInstance->Modules->AddService(bc);
- }
-
void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
{
tokens["EXTBAN"].push_back('B');
}
- void OnRehash(User* user) CXX11_OVERRIDE
- {
- ReadConf();
- }
-
ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
{
if (target_type == TYPE_CHANNEL)
if (!c->GetExtBanStatus(user, 'B').check(!c->IsModeSet(bc)))
{
- 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;
+ std::string::size_type caps = 0;
+ unsigned int offset = 0;
+ // Ignore the beginning of the text if it's a CTCP ACTION (/me)
+ if (!text.compare(0, 8, "\1ACTION ", 8))
+ offset = 8;
+ for (std::string::const_iterator i = text.begin() + offset; i != text.end(); ++i)
caps += capsmap[(unsigned char)*i];
- }
- if ( ((caps*100)/(int)text.length()) >= percent )
+
+ if (((caps * 100) / text.length()) >= percent)
{
- user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Your message cannot contain more than %d%% capital letters if it's longer than %d characters", user->nick.c_str(), c->name.c_str(), percent, minlen);
+ user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s :Your message cannot contain %d%% or more capital letters if it's longer than %d characters", c->name.c_str(), percent, minlen);
return MOD_RES_DENY;
}
}
return MOD_RES_PASSTHRU;
}
- void ReadConf()
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps");
percent = tag->getInt("percent", 100, 1, 100);