-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 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"
-/* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */
+#include "inspircd.h"
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.
/** Holds a blocked message's details
*/
-class BlockedMessage : public classbase
+class BlockedMessage
{
-public:
+ public:
std::string message;
irc::string target;
time_t sent;
{
int ForgetDelay;
BlockAction action;
+ SimpleExtItem<BlockedMessage> 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);
}
-
- virtual ~ModuleBlockAmsg()
+ void init() CXX11_OVERRIDE
{
+ this->OnRehash(NULL);
+ ServerInstance->Modules->AddService(blockamsg);
+ Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version("$Id$",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)
+ void OnRehash(User* user) CXX11_OVERRIDE
{
- 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;
action = IBLOCK_KILLOPERS;
}
- virtual int OnPreCommand(std::string &command, std::vector<std::string> ¶meters, User *user, bool validated, const std::string &original_line)
+ ModResult OnPreCommand(std::string &command, std::vector<std::string> ¶meters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
{
- // 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();
+ // Don't do anything with unregistered users
+ if (user->registered != REG_ALL)
+ return MOD_RES_PASSTHRU;
- if(validated && (cmd == "PRIVMSG" || cmd == "NOTICE") && (parameters.size() >= 2))
+ 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.
*/
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...
{
// Block it...
if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
- ServerInstance->SNO->WriteToSnoMask('A', "%s had an /amsg or /ame denied", user->nick.c_str());
+ ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str());
if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
- ServerInstance->Users->QuitUser(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.c_str());
+ user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) denied", user->nick.c_str());
- return 1;
+ return MOD_RES_DENY;
}
if(m)
else
{
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)
- {
- User* user = (User*)item;
- BlockedMessage* m;
- user->GetExt("amsgblock", m);
- if(m)
- {
- delete m;
- user->Shrink("amsgblock");
+ blockamsg.set(user, m);
}
}
+ return MOD_RES_PASSTHRU;
}
};
-
MODULE_INIT(ModuleBlockAmsg)
projects / user / henk / code / inspircd.git / blobdiff