X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=281c991e3a2b9c6a7d271fc5539ff717817b5cdb;hb=9ee588b23fd915255d2cea0c537e6938297dbe5b;hp=70fb99b9a25acd68924c14ab45cec9c276b08131;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index 70fb99b9a..281c991e3 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-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -25,7 +25,7 @@ enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOP /** Holds a blocked message's details */ -class BlockedMessage : public classbase +class BlockedMessage { public: std::string message; @@ -42,36 +42,38 @@ 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); + this->OnRehash(NULL); + ServerInstance->Extensions.Register(&blockamsg); + Implementation eventlist[] = { I_OnRehash, I_OnPreCommand }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - + virtual ~ModuleBlockAmsg() { } - + virtual Version GetVersion() { - return Version(1,1,0,0,VF_VENDOR,API_VERSION); + return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR); } - - virtual void OnRehash(User* user, const std::string ¶meter) + + virtual void OnRehash(User* user) { - ConfigReader Conf(ServerInstance); - + ConfigReader Conf; + ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false); - + if(Conf.GetError() == CONF_VALUE_NOT_FOUND) ForgetDelay = -1; - + std::string act = Conf.ReadValue("blockamsg", "action", 0); - + if(act == "notice") action = IBLOCK_NOTICE; else if(act == "noticeopers") @@ -84,50 +86,49 @@ class ModuleBlockAmsg : public Module action = IBLOCK_KILLOPERS; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) + virtual ModResult OnPreCommand(std::string &command, std::vector ¶meters, LocalUser *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; - + 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") && (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; - - 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; + 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... // OR @@ -137,45 +138,30 @@ class ModuleBlockAmsg : public Module { // 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) - User::QuitUser(ServerInstance, 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); - - return 1; + user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) denied", user->nick.c_str()); + + return MOD_RES_DENY; } - + 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()); - 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"); + m = new BlockedMessage(parameters[1], parameters[0].c_str(), ServerInstance->Time()); + blockamsg.set(user, m); } } + return MOD_RES_PASSTHRU; } };