* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
class CensorUser : public SimpleUserModeHandler
{
public:
- CensorUser(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'G') { }
+ CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, "u_censor", 'G') { }
};
/** Handles channel mode +G
class CensorChannel : public SimpleChannelModeHandler
{
public:
- CensorChannel(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'G') { }
+ CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, "censor", 'G') { }
};
class ModuleCensor : public Module
{
censor_t censors;
- CensorUser *cu;
- CensorChannel *cc;
+ CensorUser cu;
+ CensorChannel cc;
public:
- ModuleCensor(InspIRCd* Me)
- : Module(Me)
+ ModuleCensor() : cu(this), cc(this) { }
+
+ void init()
{
/* Read the configuration file on startup.
*/
- OnRehash(NULL,"");
- cu = new CensorUser(ServerInstance);
- cc = new CensorChannel(ServerInstance);
- if (!ServerInstance->Modes->AddMode(cu) || !ServerInstance->Modes->AddMode(cc))
- {
- delete cu;
- delete cc;
- throw ModuleException("Could not add new modes!");
- }
- Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRunTestSuite };
- ServerInstance->Modules->Attach(eventlist, this, 4);
+ OnRehash(NULL);
+ ServerInstance->Modules->AddService(cu);
+ ServerInstance->Modules->AddService(cc);
+ Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
+ ServerInstance->Modules->Attach(eventlist, this, 3);
}
virtual ~ModuleCensor()
{
- ServerInstance->Modes->DelMode(cu);
- ServerInstance->Modes->DelMode(cc);
- delete cu;
- delete cc;
}
// format of a config entry is <badword text="shit" replace="poo">
- virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+ virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
if (!IS_LOCAL(user))
- return 0;
+ return MOD_RES_PASSTHRU;
bool active = false;
{
active = ((Channel*)dest)->IsModeSet('G');
Channel* c = (Channel*)dest;
- if (CHANOPS_EXEMPT(ServerInstance, 'G') && c->GetStatus(user) == STATUS_OP)
- {
- return 0;
- }
+ ModResult res = ServerInstance->OnCheckExemption(user,c,"censor");
+
+ if (res == MOD_RES_ALLOW)
+ return MOD_RES_PASSTHRU;
}
if (!active)
- return 0;
+ return MOD_RES_PASSTHRU;
irc::string text2 = text.c_str();
for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
if (index->second.empty())
{
user->WriteNumeric(ERR_WORDFILTERED, "%s %s %s :Your message contained a censored word, and was blocked", user->nick.c_str(), ((Channel*)dest)->name.c_str(), index->first.c_str());
- return 1;
+ return MOD_RES_DENY;
}
SearchAndReplace(text2, index->first, index->second);
}
}
text = text2.c_str();
- return 0;
+ return MOD_RES_PASSTHRU;
}
- virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+ virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
/*
* reload our config file on rehash - we must destroy and re-allocate the classes
* to call the constructor again and re-read our data.
*/
- ConfigReader* MyConf = new ConfigReader(ServerInstance);
+ ConfigReader MyConf;
censors.clear();
- for (int index = 0; index < MyConf->Enumerate("badword"); index++)
+ for (int index = 0; index < MyConf.Enumerate("badword"); index++)
{
- irc::string pattern = (MyConf->ReadValue("badword","text",index)).c_str();
- irc::string replace = (MyConf->ReadValue("badword","replace",index)).c_str();
+ irc::string pattern = (MyConf.ReadValue("badword","text",index)).c_str();
+ irc::string replace = (MyConf.ReadValue("badword","replace",index)).c_str();
censors[pattern] = replace;
}
-
- delete MyConf;
}
virtual Version GetVersion()
{
- return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("Provides user and channel +G mode",VF_VENDOR);
}
};