* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- * <omster@gmail.com>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2008 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 <string>
-#include <time.h>
-#include "inspircd_config.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
#include "inspircd.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
*/
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
{
-
int ForgetDelay;
BlockAction action;
-public:
- ModuleBlockAmsg(InspIRCd* Me) : Module::Module(Me)
+
+ public:
+ ModuleBlockAmsg(InspIRCd* Me) : Module(Me)
{
-
- this->OnRehash("");
+ 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,0,0,0,VF_VENDOR);
+ return Version(1,2,0,0,VF_VENDOR,API_VERSION);
}
- virtual void OnRehash(const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
- ConfigReader* Conf = new ConfigReader(ServerInstance);
+ ConfigReader Conf(ServerInstance);
+
+ ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false);
- ForgetDelay = Conf->ReadInteger("blockamsg", "delay", 0, false);
- if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
+ 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;
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)
+ virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, 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))
int targets = 1;
int userchans = 0;
-
- // Decrement if the first target wasn't a channel.
+
if(*parameters[0] != '#')
+ {
+ // Decrement if the first target wasn't a channel.
targets--;
+ }
for(const char* c = parameters[0]; *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;
+ }
- for(std::vector<ucrec*>::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;
{
// 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);
if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
- userrec::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected");
+ User::QuitUser(ServerInstance, 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);
{
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");
}
}
};
-class ModuleBlockAmsgFactory : public ModuleFactory
-{
- public:
- ModuleBlockAmsgFactory()
- {
- }
-
- ~ModuleBlockAmsgFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleBlockAmsg(Me);
- }
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleBlockAmsgFactory;
-}
+MODULE_INIT(ModuleBlockAmsg)
projects / user / henk / code / inspircd.git / blobdiff