X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=fedc0f7130f7d7a6e04760e48d02677b63063a6f;hb=b7716ed57704b2b2bcc665a590aecc8f02de631d;hp=4b08e3711020ec40ead30c5a709440cebd43df3b;hpb=579e707f017ca237d260165992f0b72bafba152c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 4b08e3711..fedc0f713 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -1,82 +1,60 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/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" -#include - -typedef std::map censor_t; - -/* $ModDesc: Provides user and channel +G mode */ +#include "modules/exemption.h" -/** Handles usermode +G - */ -class CensorUser : public SimpleUserModeHandler -{ - public: - CensorUser(Module* Creator) : SimpleUserModeHandler(Creator, "censor", 'G') { } -}; - -/** Handles channel mode +G - */ -class CensorChannel : public SimpleChannelModeHandler -{ - public: - CensorChannel(Module* Creator) : SimpleChannelModeHandler(Creator, "censor", 'G') { } -}; +typedef insp::flat_map censor_t; class ModuleCensor : public Module { + CheckExemption::EventProvider exemptionprov; censor_t censors; - CensorUser cu; - CensorChannel cc; + SimpleUserModeHandler cu; + SimpleChannelModeHandler cc; public: ModuleCensor() - : cu(this), cc(this) - { - /* Read the configuration file on startup. - */ - OnRehash(NULL); - if (!ServerInstance->Modes->AddMode(&cu) || !ServerInstance->Modes->AddMode(&cc)) - throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRunTestSuite }; - ServerInstance->Modules->Attach(eventlist, this, 4); - } - - - virtual ~ModuleCensor() + : exemptionprov(this) + , cu(this, "u_censor", 'G') + , cc(this, "censor", 'G') { } // format of a config entry is - virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; bool active = false; - if (target_type == TYPE_USER) - active = ((User*)dest)->IsModeSet('G'); - else if (target_type == TYPE_CHANNEL) + if (target.type == MessageTarget::TYPE_USER) + active = target.Get()->IsModeSet(cu); + else if (target.type == MessageTarget::TYPE_CHANNEL) { - active = ((Channel*)dest)->IsModeSet('G'); - Channel* c = (Channel*)dest; - ModResult res; - FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (c->GetUser(user),c,"censor")); + Channel* c = target.Get(); + active = c->IsModeSet(cc); + ModResult res = CheckExemption::Call(exemptionprov, user, c, "censor"); if (res == MOD_RES_ALLOW) return MOD_RES_PASSTHRU; @@ -85,51 +63,48 @@ class ModuleCensor : public Module if (!active) 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) + size_t censorpos; + while ((censorpos = irc::find(details.text, index->first)) != std::string::npos) { 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()); + const std::string targname = target.type == MessageTarget::TYPE_CHANNEL ? target.Get()->name : target.Get()->nick; + user->WriteNumeric(ERR_CANNOTSENDTOCHAN, targname, "Your message contained a censored word (" + index->first + "), and was blocked"); return MOD_RES_DENY; } - SearchAndReplace(text2, index->first, index->second); + details.text.replace(censorpos, index->first.size(), index->second); } } - text = text2.c_str(); return MOD_RES_PASSTHRU; } - 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) + 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; 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; + const std::string text = tag->getString("text"); + if (text.empty()) + continue; - delete MyConf; + const std::string replace = tag->getString("replace"); + censors[text] = replace; + } } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Provides user and channel +G mode",VF_VENDOR); } };