X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=89728bdb9fe3b9fdc1b825bc1a7b57bc4e66a52c;hb=819147178db00008a215670992d0f532dd57f9e5;hp=31c536dd527784b4700f7d62af7fc45757a54b15;hpb=76d7e8a0684b38a82e6c05ebd7538b69660e1bef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index 31c536dd5..89728bdb9 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,14 +12,16 @@ */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "hashcomp.h" /* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */ 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. + */ /** Holds a blocked message's details */ @@ -30,47 +32,46 @@ public: irc::string target; time_t sent; - BlockedMessage(const std::string &msg, const 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 { - int ForgetDelay; BlockAction action; -public: + + public: ModuleBlockAmsg(InspIRCd* Me) : Module(Me) { - - this->OnRehash(NULL,""); + 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() { } - + virtual Version GetVersion() { - return Version(1,1,0,0,VF_VENDOR,API_VERSION); + return Version("$Id$",VF_VENDOR,API_VERSION); } - - virtual void OnRehash(userrec* user, const std::string ¶meter) + + virtual void OnRehash(User* user) { - ConfigReader* Conf = new ConfigReader(ServerInstance); - - ForgetDelay = Conf->ReadInteger("blockamsg", "delay", 0, false); - if(Conf->GetError() == CONF_VALUE_NOT_FOUND) + 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); - + + std::string act = Conf.ReadValue("blockamsg", "action", 0); + if(act == "notice") action = IBLOCK_NOTICE; else if(act == "noticeopers") @@ -81,43 +82,52 @@ public: action = IBLOCK_KILL; else action = IBLOCK_KILLOPERS; - - DELETE(Conf); } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) { // Don't do anything with unregistered users, or remote ones. if(!user || (user->registered != REG_ALL) || !IS_LOCAL(user)) return 0; - + // 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") && (pcnt >= 2)) + + if(validated && (cmd == "PRIVMSG" || cmd == "NOTICE") && (parameters.size() >= 2)) { // 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. // Most messages have a single target so... - + int targets = 1; int userchans = 0; - - // Decrement if the first target wasn't a channel. - if(*parameters[0] != '#') + + if(*parameters[0].c_str() != '#') + { + // Decrement if the first target wasn't a channel. targets--; - - for(const char* c = parameters[0]; *c; c++) + } + + for(const char* c = parameters[0].c_str(); *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; + } + userchans = user->chans.size(); // Check that this message wasn't already sent within a few seconds. 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 @@ -127,42 +137,42 @@ public: { // Block it... if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS) - ServerInstance->WriteOpers("*** %s had an /amsg or /ame denied", user->nick); + ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str()); if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS) - userrec::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected"); + ServerInstance->Users->QuitUser(user, "Global message (/amsg or /ame) detected"); else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS) - user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick); - + user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick.c_str()); + return 1; } - + if(m) { // If there's already a BlockedMessage allocated, use it. m->message = parameters[1]; - m->target = parameters[0]; + m->target = parameters[0].c_str(); m->sent = ServerInstance->Time(); } else { - m = new BlockedMessage(parameters[1], parameters[0], ServerInstance->Time()); + 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) { - userrec* user = (userrec*)item; + User* user = (User*)item; BlockedMessage* m; user->GetExt("amsgblock", m); if(m) { - DELETE(m); + delete m; user->Shrink("amsgblock"); } } @@ -170,25 +180,4 @@ public: }; -class ModuleBlockAmsgFactory : public ModuleFactory -{ - public: - ModuleBlockAmsgFactory() - { - } - - ~ModuleBlockAmsgFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleBlockAmsg(Me); - } -}; - - -extern "C" DllExport void * init_module( void ) -{ - return new ModuleBlockAmsgFactory; -} +MODULE_INIT(ModuleBlockAmsg)