#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
+
#include "hashcomp.h"
#include "inspircd.h"
/* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */
-extern time_t TIME;
-extern InspIRCd* ServerInstance;
-
enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOPERS, IBLOCK_SILENT };
+/** Holds a blocked message's details
+ */
class BlockedMessage : public classbase
{
public:
class ModuleBlockAmsg : public Module
{
- Server* Srv;
+
int ForgetDelay;
BlockAction action;
public:
- ModuleBlockAmsg(Server* Me) : Module::Module(Me)
+ ModuleBlockAmsg(InspIRCd* Me) : Module::Module(Me)
{
- Srv = Me;
+
this->OnRehash("");
}
virtual void OnRehash(const std::string ¶meter)
{
- ConfigReader* Conf = new ConfigReader;
+ ConfigReader* Conf = new ConfigReader(ServerInstance);
ForgetDelay = Conf->ReadInteger("blockamsg", "delay", 0, false);
if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
// OR
// The number of target channels is equal to the number of channels the sender is on..a little suspicious.
// Check it's more than 1 too, or else users on one channel would have fun.
- if((m && (m->message == parameters[1]) && (m->target != parameters[0]) && (ForgetDelay != -1) && (m->sent >= TIME-ForgetDelay)) || ((targets > 1) && (targets == userchans)))
+ if((m && (m->message == parameters[1]) && (m->target != parameters[0]) && (ForgetDelay != -1) && (m->sent >= ServerInstance->Time()-ForgetDelay)) || ((targets > 1) && (targets == userchans)))
{
// Block it...
if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
// If there's already a BlockedMessage allocated, use it.
m->message = parameters[1];
m->target = parameters[0];
- m->sent = TIME;
+ m->sent = ServerInstance->Time();
}
else
{
- m = new BlockedMessage(parameters[1], parameters[0], TIME);
+ m = new BlockedMessage(parameters[1], parameters[0], ServerInstance->Time());
user->Extend("amsgblock", (char*)m);
}
}
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleBlockAmsg(Me);
}