X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=833828233e7f6a89db5846b5b4c07db5d8b764d5;hb=3fef0ed889eecb40b96a597924254560c81d4a09;hp=b8090657cb685bc025a5f7737108ec3f0df4ac15;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index b8090657c..833828233 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -1,19 +1,27 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2006-2007 Oliver Lupton * - * 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 . */ -#include "inspircd.h" -/* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */ +#include "inspircd.h" enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOPERS, IBLOCK_SILENT }; /* IBLOCK_NOTICE - Send a notice to the user informing them of what happened. @@ -25,9 +33,9 @@ enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOP /** Holds a blocked message's details */ -class BlockedMessage : public classbase +class BlockedMessage { -public: + public: std::string message; irc::string target; time_t sent; @@ -42,35 +50,23 @@ class ModuleBlockAmsg : public Module { int ForgetDelay; BlockAction action; + SimpleExtItem blockamsg; public: - ModuleBlockAmsg(InspIRCd* Me) : Module(Me) + ModuleBlockAmsg() : blockamsg("blockamsg", this) { - this->OnRehash(NULL,""); - Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_OnCleanup }; - ServerInstance->Modules->Attach(eventlist, this, 3); } - - virtual ~ModuleBlockAmsg() + Version GetVersion() CXX11_OVERRIDE { + return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR); } - virtual Version GetVersion() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - return Version("$Id$",VF_VENDOR,API_VERSION); - } - - virtual void OnRehash(User* user, const std::string ¶meter) - { - ConfigReader Conf(ServerInstance); - - ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false); - - if(Conf.GetError() == CONF_VALUE_NOT_FOUND) - ForgetDelay = -1; - - std::string act = Conf.ReadValue("blockamsg", "action", 0); + ConfigTag* tag = ServerInstance->Config->ConfValue("blockamsg"); + ForgetDelay = tag->getInt("delay", -1); + std::string act = tag->getString("action"); if(act == "notice") action = IBLOCK_NOTICE; @@ -84,17 +80,13 @@ class ModuleBlockAmsg : public Module action = IBLOCK_KILLOPERS; } - virtual int OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) + ModResult OnPreCommand(std::string &command, std::vector ¶meters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE { - // Don't do anything with unregistered users, or remote ones. - if(!user || (user->registered != REG_ALL) || !IS_LOCAL(user)) - return 0; + // Don't do anything with unregistered users + if (user->registered != REG_ALL) + return MOD_RES_PASSTHRU; - // We want case insensitive command comparison. - // Add std::string contructor for irc::string :x - irc::string cmd = command.c_str(); - - if(validated && (cmd == "PRIVMSG" || cmd == "NOTICE") && (parameters.size() >= 2)) + if ((validated) && (parameters.size() >= 2) && ((command == "PRIVMSG") || (command == "NOTICE"))) { // parameters[0] should have the target(s) in it. // I think it will be faster to first check if there are any commas, and if there are then try and parse it out. @@ -119,14 +111,13 @@ class ModuleBlockAmsg : public Module */ if(targets == 0) { - return 0; + return MOD_RES_PASSTHRU; } userchans = user->chans.size(); // Check that this message wasn't already sent within a few seconds. - BlockedMessage* m; - user->GetExt("amsgblock", m); + BlockedMessage* m = blockamsg.get(user); // If the message is identical and within the time. // We check the target is *not* identical, that'd straying into the realms of flood control. Which isn't what we're doing... @@ -137,14 +128,14 @@ class ModuleBlockAmsg : public Module { // Block it... if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS) - ServerInstance->SNO->WriteToSnoMask('A', "%s had an /amsg or /ame denied", user->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str()); if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS) - ServerInstance->Users->QuitUser(user, "Global message (/amsg or /ame) detected"); + ServerInstance->Users->QuitUser(user, "Attempted to global message (/amsg or /ame)"); else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS) - user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick.c_str()); + user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) denied", user->nick.c_str()); - return 1; + return MOD_RES_DENY; } if(m) @@ -157,27 +148,11 @@ class ModuleBlockAmsg : public Module else { m = new BlockedMessage(parameters[1], parameters[0].c_str(), ServerInstance->Time()); - user->Extend("amsgblock", (char*)m); - } - } - return 0; - } - - void OnCleanup(int target_type, void* item) - { - if(target_type == TYPE_USER) - { - User* user = (User*)item; - BlockedMessage* m; - user->GetExt("amsgblock", m); - if(m) - { - delete m; - user->Shrink("amsgblock"); + blockamsg.set(user, m); } } + return MOD_RES_PASSTHRU; } }; - MODULE_INIT(ModuleBlockAmsg)