X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=c8b6b73a8836cda49cd90107e3bc31c995e46457;hb=b9e11915a976daaf790ebc763aff56e19fd49e0f;hp=1c7a9999c99bba516c67285cf37bc81512ac9cdb;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 1c7a9999c..c8b6b73a8 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -1,197 +1,119 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2004, 2008-2009 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2005, 2007 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#define _CRT_SECURE_NO_DEPRECATE -#define _SCL_SECURE_NO_DEPRECATE #include "inspircd.h" -typedef std::map censor_t; - -/* $ModDesc: Provides user and channel +G mode */ +typedef insp::flat_map censor_t; /** Handles usermode +G */ -class CensorUser : public ModeHandler +class CensorUser : public SimpleUserModeHandler { public: - CensorUser(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_USER, false) { } - - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) - { - if (adding) - { - if (!dest->IsModeSet('G')) - { - dest->SetMode('G',true); - return MODEACTION_ALLOW; - } - } - else - { - if (dest->IsModeSet('G')) - { - dest->SetMode('G',false); - return MODEACTION_ALLOW; - } - } - - return MODEACTION_DENY; - } + CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, "u_censor", 'G') { } }; /** Handles channel mode +G */ -class CensorChannel : public ModeHandler +class CensorChannel : public SimpleChannelModeHandler { public: - CensorChannel(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_CHANNEL, false) { } - - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) - { - if (adding) - { - if (!channel->IsModeSet('G')) - { - channel->SetMode('G',true); - return MODEACTION_ALLOW; - } - } - else - { - if (channel->IsModeSet('G')) - { - channel->SetMode('G',false); - return MODEACTION_ALLOW; - } - } - - return MODEACTION_ALLOW; - } + CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, "censor", 'G') { } }; class ModuleCensor : public Module { - - censor_t censors; - CensorUser *cu; - CensorChannel *cc; - - public: - ModuleCensor(InspIRCd* Me) - : Module(Me) - { - /* Read the configuration file on startup. - */ - OnRehash(NULL,""); - cu = new CensorUser(ServerInstance); - cc = new CensorChannel(ServerInstance); - if (!ServerInstance->AddMode(cu) || !ServerInstance->AddMode(cc)) - { - delete cu; - delete cc; - throw ModuleException("Could not add new modes!"); - } - 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; - } + CensorUser cu; + CensorChannel cc; - virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace) - { - if ((!pattern.empty()) && (!text.empty())) - { - std::string::size_type pos; - while ((pos = text.find(pattern)) != irc::string::npos) - { - text.erase(pos,pattern.length()); - text.insert(pos,replace); - } - } - } + public: + ModuleCensor() : cu(this), cc(this) { } // format of a config entry is - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE { if (!IS_LOCAL(user)) - return 0; + return MOD_RES_PASSTHRU; bool active = false; if (target_type == TYPE_USER) - active = ((User*)dest)->IsModeSet('G'); + active = ((User*)dest)->IsModeSet(cu); else if (target_type == TYPE_CHANNEL) - active = ((Channel*)dest)->IsModeSet('G'); + { + Channel* c = (Channel*)dest; + active = c->IsModeSet(cc); + 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 (text2.find(index->first) != irc::string::npos) { if (index->second.empty()) { - user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((Channel*)dest)->name, index->first.c_str()); - return 1; + user->WriteNumeric(ERR_WORDFILTERED, ((target_type == TYPE_CHANNEL) ? ((Channel*)dest)->name : ((User*)dest)->nick), index->first, "Your message contained a censored word, and was blocked"); + return MOD_RES_DENY; } - - this->ReplaceLine(text2,index->first,index->second); + + 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) - { - return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); - } - - virtual void OnRehash(User* user, const std::string ¶meter) + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { /* * 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); censors.clear(); - for (int index = 0; index < MyConf->Enumerate("badword"); index++) + ConfigTagList badwords = ServerInstance->Config->ConfTags("badword"); + for (ConfigIter i = badwords.first; i != badwords.second; ++i) { - irc::string pattern = (MyConf->ReadValue("badword","text",index)).c_str(); - irc::string replace = (MyConf->ReadValue("badword","replace",index)).c_str(); - censors[pattern] = replace; + ConfigTag* tag = i->second; + std::string str = tag->getString("text"); + irc::string pattern(str.c_str()); + str = tag->getString("replace"); + censors[pattern] = irc::string(str.c_str()); } - - delete MyConf; } - - virtual Version GetVersion() + + Version GetVersion() CXX11_OVERRIDE { - return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Provides user and channel +G mode",VF_VENDOR); } - + }; MODULE_INIT(ModuleCensor)