X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=31c536dd527784b4700f7d62af7fc45757a54b15;hb=52acbb466b84a1cd161b1c111f855d6f0419fff3;hp=95dfa40c4fe185dad891455a0a8e6c924baf7c89;hpb=9a526c77cc57921d81f4d8617b7e42bdb72dc79c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index 95dfa40c4..31c536dd5 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -2,58 +2,49 @@ * | 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-2007 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 "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" #include "hashcomp.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 }; -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) + ModuleBlockAmsg(InspIRCd* Me) : Module(Me) { - Srv = Me; - this->OnRehash(""); + + this->OnRehash(NULL,""); } void Implements(char* List) @@ -67,12 +58,12 @@ 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(const std::string ¶meter) + virtual void OnRehash(userrec* user, const std::string ¶meter) { - ConfigReader* Conf = new ConfigReader; + ConfigReader* Conf = new ConfigReader(ServerInstance); ForgetDelay = Conf->ReadInteger("blockamsg", "delay", 0, false); if(Conf->GetError() == CONF_VALUE_NOT_FOUND) @@ -91,13 +82,13 @@ public: else action = IBLOCK_KILLOPERS; - delete Conf; + DELETE(Conf); } - virtual int OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated) + virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *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. @@ -117,32 +108,31 @@ public: if(*parameters[0] != '#') targets--; - for(char* c = parameters[0]; *c; c++) + for(const char* c = parameters[0]; *c; c++) if((*c == ',') && *(c+1) && (*(c+1) == '#')) targets++; - 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"); + userrec::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 +142,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); } } @@ -168,10 +158,11 @@ public: if(target_type == TYPE_USER) { userrec* user = (userrec*)item; - BlockedMessage* m = (BlockedMessage*)user->GetExt("amsgblock"); + BlockedMessage* m; + user->GetExt("amsgblock", m); if(m) { - delete m; + DELETE(m); user->Shrink("amsgblock"); } } @@ -190,14 +181,14 @@ class ModuleBlockAmsgFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleBlockAmsg(Me); } }; -extern "C" void * init_module( void ) +extern "C" DllExport void * init_module( void ) { return new ModuleBlockAmsgFactory; }