X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=70fb99b9a25acd68924c14ab45cec9c276b08131;hb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;hp=bb95127544b492c3a2790cd9afbdb504bd88ccd9;hpb=68da120812b1e593c76ea75d0d591f47b6a4f402;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index bb9512754..70fb99b9a 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -2,64 +2,55 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ - -/* <3's to Lauren for original info on mIRC's weird behaviour */ -#include -#include -#include "inspircd_config.h" -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" -#include "hashcomp.h" +#include "inspircd.h" /* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */ -extern time_t TIME; - 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. + * IBLOCK_NOTICEOPERS - Send a notice to the user informing them and send an oper notice. + * IBLOCK_SILENT - Generate no output, silently drop messages. + * IBLOCK_KILL - Kill the user with the reason "Global message (/amsg or /ame) detected". + * IBLOCK_KILLOPERS - As above, but send an oper notice as well. This is the default. + */ -class BlockedMessage +/** Holds a blocked message's details + */ +class BlockedMessage : public classbase { public: std::string message; irc::string target; time_t sent; - - BlockedMessage(std::string msg, irc::string tgt, time_t when) : message(msg), target(tgt), sent(when) + + BlockedMessage(const std::string &msg, const irc::string &tgt, time_t when) + : message(msg), target(tgt), sent(when) { } }; class ModuleBlockAmsg : public Module { - Server* Srv; int ForgetDelay; BlockAction action; -public: - ModuleBlockAmsg(Server* Me) : Module::Module(Me) + + public: + ModuleBlockAmsg(InspIRCd* Me) : Module(Me) { - Srv = Me; - this->OnRehash(""); + this->OnRehash(NULL,""); + Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_OnCleanup }; + ServerInstance->Modules->Attach(eventlist, this, 3); } - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnPreCommand] = List[I_OnCleanup] = 1; - } virtual ~ModuleBlockAmsg() { @@ -67,18 +58,19 @@ public: virtual Version GetVersion() { - return Version(1,0,0,0,VF_VENDOR); + return Version(1,1,0,0,VF_VENDOR,API_VERSION); } - virtual void OnRehash(std::string parameter) + virtual void OnRehash(User* user, const std::string ¶meter) { - ConfigReader* Conf = new ConfigReader; + ConfigReader Conf(ServerInstance); - ForgetDelay = Conf->ReadInteger("blockamsg", "delay", 0, false); - if(Conf->GetError() == CONF_VALUE_NOT_FOUND) + ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false); + + if(Conf.GetError() == CONF_VALUE_NOT_FOUND) ForgetDelay = -1; - std::string act = Conf->ReadValue("blockamsg", "action", 0); + std::string act = Conf.ReadValue("blockamsg", "action", 0); if(act == "notice") action = IBLOCK_NOTICE; @@ -90,14 +82,12 @@ public: action = IBLOCK_KILL; else action = IBLOCK_KILLOPERS; - - delete Conf; } - virtual int OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user, bool validated) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { // Don't do anything with unregistered users, or remote ones. - if(!user || (user->registered != 7) || !IS_LOCAL(user)) + if(!user || (user->registered != REG_ALL) || !IS_LOCAL(user)) return 0; // We want case insensitive command comparison. @@ -112,37 +102,47 @@ public: int targets = 1; int userchans = 0; - - // Decrement if the first target wasn't a channel. + if(*parameters[0] != '#') + { + // Decrement if the first target wasn't a channel. targets--; + } - for(char* c = parameters[0]; *c; c++) + for(const char* c = parameters[0]; *c; c++) if((*c == ',') && *(c+1) && (*(c+1) == '#')) targets++; + + /* targets should now contain the number of channel targets the msg/notice was pointed at. + * If the msg/notice was a PM there should be no channel targets and 'targets' should = 0. + * We don't want to block PMs so... + */ + if(targets == 0) + { + return 0; + } - for(std::vector::iterator f = user->chans.begin(); f != user->chans.end(); f++) - if(((ucrec*)(*f))->channel) - userchans++; + userchans = user->chans.size(); // Check that this message wasn't already sent within a few seconds. - BlockedMessage* m = (BlockedMessage*)user->GetExt("amsgblock"); + BlockedMessage* m; + user->GetExt("amsgblock", m); // 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... // OR // The number of target channels is equal to the number of channels the sender is on..a little suspicious. // Check it's more than 1 too, or else users on one channel would have fun. - if((m && (m->message == parameters[1]) && (m->target != parameters[0]) && (ForgetDelay != -1) && (m->sent >= TIME-ForgetDelay)) || ((targets > 1) && (targets == userchans))) + if((m && (m->message == parameters[1]) && (m->target != parameters[0]) && (ForgetDelay != -1) && (m->sent >= ServerInstance->Time()-ForgetDelay)) || ((targets > 1) && (targets == userchans))) { // Block it... if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS) - WriteOpers("*** %s had an /amsg or /ame denied", user->nick); + ServerInstance->WriteOpers("*** %s had an /amsg or /ame denied", user->nick); if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS) - Srv->QuitUser(user, "Global message (/amsg or /ame) detected"); + User::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected"); else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS) - WriteServ(user->fd, "NOTICE %s :Global message (/amsg or /ame) detected", user->nick); + user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick); return 1; } @@ -152,11 +152,11 @@ public: // If there's already a BlockedMessage allocated, use it. m->message = parameters[1]; m->target = parameters[0]; - m->sent = TIME; + m->sent = ServerInstance->Time(); } else { - m = new BlockedMessage(parameters[1], parameters[0], TIME); + m = new BlockedMessage(parameters[1], parameters[0], ServerInstance->Time()); user->Extend("amsgblock", (char*)m); } } @@ -167,8 +167,9 @@ public: { if(target_type == TYPE_USER) { - userrec* user = (userrec*)item; - BlockedMessage* m = (BlockedMessage*)user->GetExt("amsgblock"); + User* user = (User*)item; + BlockedMessage* m; + user->GetExt("amsgblock", m); if(m) { delete m; @@ -179,25 +180,4 @@ public: }; -class ModuleBlockAmsgFactory : public ModuleFactory -{ - public: - ModuleBlockAmsgFactory() - { - } - - ~ModuleBlockAmsgFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleBlockAmsg(Me); - } -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleBlockAmsgFactory; -} +MODULE_INIT(ModuleBlockAmsg)