#include "inspircd.h"
#include "modules/exemption.h"
-/** Handles the +c channel mode
- */
-class BlockColor : public SimpleChannelModeHandler
-{
- public:
- BlockColor(Module* Creator) : SimpleChannelModeHandler(Creator, "blockcolor", 'c') { }
-};
-
class ModuleBlockColor : public Module
{
CheckExemption::EventProvider exemptionprov;
- BlockColor bc;
+ SimpleChannelModeHandler bc;
public:
ModuleBlockColor()
: exemptionprov(this)
- , bc(this)
+ , bc(this, "blockcolor", 'c')
{
}
tokens["EXTBAN"].push_back('c');
}
- 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) && (IS_LOCAL(user)))
+ if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user)))
{
- Channel* c = (Channel*)dest;
- ModResult res;
- FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, c, "blockcolor"));
+ Channel* c = target.Get<Channel>();
+ ModResult res = CheckExemption::Call(exemptionprov, user, c, "blockcolor");
if (res == MOD_RES_ALLOW)
return MOD_RES_PASSTHRU;
if (!c->GetExtBanStatus(user, 'c').check(!c->IsModeSet(bc)))
{
- for (std::string::iterator i = text.begin(); i != text.end(); i++)
+ for (std::string::iterator i = details.text.begin(); i != details.text.end(); i++)
{
- switch (*i)
+ // Block all control codes except \001 for CTCP
+ if ((*i >= 0) && (*i < 32) && (*i != 1))
{
- case 2:
- case 3:
- case 15:
- case 21:
- case 22:
- case 31:
- user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send colors to channel (+c set)");
- return MOD_RES_DENY;
- break;
+ user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send colors to channel (+c set)");
+ return MOD_RES_DENY;
}
}
}