X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=6ea279422e4f9b237d606e5c4640a5a3f5cc978f;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=4c5e7c0282641cc018b2176746dcfe0b60ee1774;hpb=2630a87bb13b089e6d0fdcff4bcd0f3a9612e52f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index 4c5e7c028..6ea279422 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -1,144 +1,96 @@ -/* +------------------------------------+ - * | 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) 2004, 2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 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. * - * --------------------------------------------------- - */ - -#include "inspircd.h" - -/* $ModDesc: Provides channel +S mode (strip ansi colour) */ - -/** Handles channel mode +S + * 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 . */ -class ChannelStripColor : public SimpleChannelModeHandler -{ - public: - ChannelStripColor(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'S') { } -}; -/** Handles user mode +S - */ -class UserStripColor : public SimpleUserModeHandler -{ - public: - UserStripColor(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'S') { } -}; +#include "inspircd.h" +#include "modules/exemption.h" class ModuleStripColor : public Module { - bool AllowChanOps; - ChannelStripColor csc; - UserStripColor usc; + CheckExemption::EventProvider exemptionprov; + SimpleChannelModeHandler csc; + SimpleUserModeHandler usc; public: - ModuleStripColor(InspIRCd* Me) : Module(Me), csc(Me), usc(Me) + ModuleStripColor() + : exemptionprov(this) + , csc(this, "stripcolor", 'S') + , usc(this, "u_stripcolor", 'S') { - if (!ServerInstance->Modes->AddMode(&usc) || !ServerInstance->Modes->AddMode(&csc)) - throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric }; - ServerInstance->Modules->Attach(eventlist, this, 3); } - virtual ~ModuleStripColor() + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(&usc); - ServerInstance->Modes->DelMode(&csc); + tokens["EXTBAN"].push_back('S'); } - virtual void On005Numeric(std::string &output) - { - ServerInstance->AddExtBanChar('S'); - } - - virtual void ReplaceLine(std::string &sentence) - { - /* refactor this completely due to SQUIT bug since the old code would strip last char and replace with \0 --peavey */ - int seq = 0; - std::string::iterator i,safei; - for (i = sentence.begin(); i != sentence.end();) - { - if ((*i == 3)) - seq = 1; - else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) )) - { - seq++; - if ( (seq <= 4) && (*i == ',') ) - seq = 1; - else if (seq > 3) - seq = 0; - } - else - seq = 0; - - if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31))) - { - if (i != sentence.begin()) - { - safei = i; - --i; - sentence.erase(safei); - ++i; - } - else - { - sentence.erase(i); - i = sentence.begin(); - } - } - else - ++i; - } - } - - virtual int 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 0; + return MOD_RES_PASSTHRU; bool active = false; - if (target_type == TYPE_USER) + if (target.type == MessageTarget::TYPE_USER) { - User* t = (User*)dest; - active = t->IsModeSet('S'); + User* t = target.Get(); + active = t->IsModeSet(usc); } - else if (target_type == TYPE_CHANNEL) + else if (target.type == MessageTarget::TYPE_CHANNEL) { - Channel* t = (Channel*)dest; + Channel* t = target.Get(); + ModResult res = CheckExemption::Call(exemptionprov, user, t, "stripcolor"); - // check if we allow ops to bypass filtering, if we do, check if they're opped accordingly. - // note: short circut logic here, don't wreck it. -- w00t - if (CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) == STATUS_OP) - { - return 0; - } + if (res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; - active = t->IsModeSet('S') || t->GetExtBanStatus(user, 'S') < 0; + active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet(csc)); } if (active) { - this->ReplaceLine(text); + InspIRCd::StripColor(details.text); } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + void OnUserPart(Membership* memb, std::string& partmessage, CUList& except_list) CXX11_OVERRIDE { - return OnUserPreMessage(user,dest,target_type,text,status,exempt_list); + User* user = memb->user; + Channel* channel = memb->chan; + + if (!IS_LOCAL(user)) + return; + + if (channel->GetExtBanStatus(user, 'S').check(!user->IsModeSet(csc))) + { + ModResult res = CheckExemption::Call(exemptionprov, user, channel, "stripcolor"); + + if (res != MOD_RES_ALLOW) + InspIRCd::StripColor(partmessage); + } } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides channel mode +S, strip ansi color", VF_VENDOR); } };