-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2006-2007 Oliver Lupton <oliverlupton@gmail.com>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
+
#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. */
/** Holds a blocked message's details
*/
-class BlockedMessage : public classbase
+class BlockedMessage
{
public:
std::string message;
{
int ForgetDelay;
BlockAction action;
-
+ SimpleExtItem<BlockedMessage> blockamsg;
+
public:
- ModuleBlockAmsg(InspIRCd* Me)
- : Module(Me)
+ ModuleBlockAmsg() : blockamsg("blockamsg", this)
{
-
- this->OnRehash(NULL,"");
}
- void Implements(char* List)
+ void init()
{
- List[I_OnRehash] = List[I_OnPreCommand] = List[I_OnCleanup] = 1;
+ this->OnRehash(NULL);
+ ServerInstance->Modules->AddService(blockamsg);
+ Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
-
+
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(userrec* user, const std::string ¶meter)
+
+ virtual void OnRehash(User* user)
{
- 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;
else if(act == "noticeopers")
action = IBLOCK_KILLOPERS;
}
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+ virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> ¶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;
-
- // 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))
+ // Don't do anything with unregistered users
+ if (user->registered != REG_ALL)
+ return MOD_RES_PASSTHRU;
+
+ 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.
// 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
{
// 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, "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)
- {
- userrec* user = (userrec*)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;
}
};
projects / user / henk / code / inspircd.git / blobdiff