X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_stripcolor.cpp;h=0fea8bc5fed4aab76f5df2f3104f47d0b782ab12;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=aab506fdcb9bee24fabd84b74fa4ef1d931d292e;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp index aab506fdc..0fea8bc5f 100644 --- a/src/modules/m_stripcolor.cpp +++ b/src/modules/m_stripcolor.cpp @@ -1,9 +1,16 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2004, 2008 Craig Edwards + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2016 0x277F <0x277F@gmail.com> + * Copyright (C) 2013, 2017 Sadie Powell + * Copyright (C) 2013 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 Robin Burchell * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2004, 2006, 2010 Craig Edwards * * 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 @@ -20,132 +27,84 @@ #include "inspircd.h" - -/* $ModDesc: Provides channel +S mode (strip ansi color) */ - -/** Handles channel mode +S - */ -class ChannelStripColor : public SimpleChannelModeHandler -{ - public: - ChannelStripColor(Module* Creator) : SimpleChannelModeHandler(Creator, "stripcolor", 'S') { } -}; - -/** Handles user mode +S - */ -class UserStripColor : public SimpleUserModeHandler -{ - public: - UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, "u_stripcolor", 'S') { } -}; - +#include "modules/exemption.h" class ModuleStripColor : public Module { - bool AllowChanOps; - ChannelStripColor csc; - UserStripColor usc; + CheckExemption::EventProvider exemptionprov; + SimpleChannelModeHandler csc; + SimpleUserModeHandler usc; public: - ModuleStripColor() : csc(this), usc(this) - { - } - - void init() - { - ServerInstance->Modules->AddService(usc); - ServerInstance->Modules->AddService(csc); - Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric }; - ServerInstance->Modules->Attach(eventlist, this, 3); - } - - virtual ~ModuleStripColor() - { - } - - virtual void On005Numeric(std::string &output) + ModuleStripColor() + : exemptionprov(this) + , csc(this, "stripcolor", 'S') + , usc(this, "u_stripcolor", 'S') { - ServerInstance->AddExtBanChar('S'); } - virtual void ReplaceLine(std::string &sentence) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - /* 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; - } + tokens["EXTBAN"].push_back('S'); } - 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) - { - User* t = (User*)dest; - active = t->IsModeSet('S'); - } - else if (target_type == TYPE_CHANNEL) + switch (target.type) { - Channel* t = (Channel*)dest; - ModResult res = ServerInstance->OnCheckExemption(user,t,"stripcolor"); + case MessageTarget::TYPE_USER: + { + User* t = target.Get(); + active = t->IsModeSet(usc); + break; + } + case MessageTarget::TYPE_CHANNEL: + { + Channel* t = target.Get(); + ModResult res = CheckExemption::Call(exemptionprov, user, t, "stripcolor"); - if (res == MOD_RES_ALLOW) - return MOD_RES_PASSTHRU; + if (res == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; - active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet('S')); + active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet(csc)); + break; + } + case MessageTarget::TYPE_SERVER: + break; } if (active) { - this->ReplaceLine(text); + InspIRCd::StripColor(details.text); } return MOD_RES_PASSTHRU; } - virtual ModResult 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("Provides channel +S mode (strip ansi color)", VF_VENDOR); + return Version("Adds channel mode S (stripcolor) which allows channels to strip IRC formatting codes from messages.", VF_VENDOR); } };