if (!IS_LOCAL(user))
return MOD_RES_PASSTHRU;
- bool active = false;
+ int numeric = 0;
+ const char* targetname = NULL;
- if (target.type == MessageTarget::TYPE_USER)
- active = target.Get<User>()->IsModeSet(cu);
- else if (target.type == MessageTarget::TYPE_CHANNEL)
+ switch (target.type)
{
- Channel* c = target.Get<Channel>();
- active = c->IsModeSet(cc);
- ModResult res = CheckExemption::Call(exemptionprov, user, c, "censor");
+ case MessageTarget::TYPE_USER:
+ {
+ User* targuser = target.Get<User>();
+ if (!targuser->IsModeSet(cu))
+ return MOD_RES_PASSTHRU;
+
+ numeric = ERR_CANTSENDTOUSER;
+ targetname = targuser->nick.c_str();
+ break;
+ }
+
+ case MessageTarget::TYPE_CHANNEL:
+ {
+ Channel* targchan = target.Get<Channel>();
+ if (!targchan->IsModeSet(cc))
+ return MOD_RES_PASSTHRU;
- if (res == MOD_RES_ALLOW)
+ ModResult result = CheckExemption::Call(exemptionprov, user, targchan, "censor");
+ if (result == MOD_RES_ALLOW)
+ return MOD_RES_PASSTHRU;
+
+ numeric = ERR_CANNOTSENDTOCHAN;
+ targetname = targchan->name.c_str();
+ break;
+ }
+
+ default:
return MOD_RES_PASSTHRU;
}
- if (!active)
- return MOD_RES_PASSTHRU;
-
for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
{
size_t censorpos;
{
if (index->second.empty())
{
- const std::string targname = target.type == MessageTarget::TYPE_CHANNEL ? target.Get<Channel>()->name : target.Get<User>()->nick;
- user->WriteNumeric(ERR_WORDFILTERED, targname, index->first.c_str(), "Your message contained a censored word, and was blocked");
+ user->WriteNumeric(numeric, targetname, "Your message contained a censored word (" + index->first + "), and was blocked");
return MOD_RES_DENY;
}
* reload our config file on rehash - we must destroy and re-allocate the classes
* to call the constructor again and re-read our data.
*/
- censors.clear();
+ censor_t newcensors;
ConfigTagList badwords = ServerInstance->Config->ConfTags("badword");
for (ConfigIter i = badwords.first; i != badwords.second; ++i)
ConfigTag* tag = i->second;
const std::string text = tag->getString("text");
if (text.empty())
- continue;
+ throw ModuleException("<badword:text> is empty! at " + tag->getTagLocation());
const std::string replace = tag->getString("replace");
- censors[text] = replace;
+ newcensors[text] = replace;
}
+ censors.swap(newcensors);
}
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Provides user and channel +G mode",VF_VENDOR);
+ return Version("Provides user and channel mode +G", VF_VENDOR);
}
};