* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*/
#include "inspircd.h"
-#include "wildcard.h"
/* $ModDesc: Provides support for the /SILENCE command */
*/
if (!ServerInstance->ULine(user->server))
return CMD_FAILURE;
-
+
User *u = ServerInstance->FindNick(parameters[0]);
if (!u)
return CMD_FAILURE;
-
+
if (IS_LOCAL(u))
{
ServerInstance->Parser->CallHandler("SILENCE", std::vector<std::string>(++parameters.begin(), parameters.end()), u);
}
-
+
return CMD_SUCCESS;
}
};
public:
CommandSilence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max)
{
- this->source = "m_silence_ext.so";
+ this->source = "m_silence.so";
syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}";
TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
}
if (parameters.size() > 1) {
pattern = CompilePattern(parameters[1].c_str());
}
-
+
if (!mask.length())
{
// 'SILENCE +' or 'SILENCE -', assume *!*@*
mask = "*!*@*";
}
-
+
ModeParser::CleanMask(mask);
if (action == '-')
case 'c':
p |= SILENCE_CHANNEL;
break;
- case 'i':
+ case 'i':
p |= SILENCE_INVITE;
break;
case 'n':
class ModuleSilence : public Module
{
- CommandSilence* cmdsilence;
- CommandSVSSilence *cmdsvssilence;
unsigned int maxsilence;
+ CommandSilence cmdsilence;
+ CommandSVSSilence cmdsvssilence;
public:
-
+
ModuleSilence(InspIRCd* Me)
- : Module(Me), maxsilence(32)
+ : Module(Me), maxsilence(32), cmdsilence(Me, maxsilence), cmdsvssilence(Me)
{
- OnRehash(NULL, "");
- cmdsilence = new CommandSilence(ServerInstance,maxsilence);
- cmdsvssilence = new CommandSVSSilence(ServerInstance);
- ServerInstance->AddCommand(cmdsilence);
- ServerInstance->AddCommand(cmdsvssilence);
+ OnRehash(NULL);
+ ServerInstance->AddCommand(&cmdsilence);
+ ServerInstance->AddCommand(&cmdsvssilence);
Implementation eventlist[] = { I_OnRehash, I_OnBuildExemptList, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnUserPreInvite };
ServerInstance->Modules->Attach(eventlist, this, 7);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
ConfigReader Conf(ServerInstance);
maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true);
virtual int PreText(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list, int silence_type)
{
- if (!IS_LOCAL(user))
- return 0;
-
- if (target_type == TYPE_USER)
+ if (target_type == TYPE_USER && IS_LOCAL(((User*)dest)))
{
return MatchPattern((User*)dest, user, silence_type);
}
{
for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++)
{
- if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (ServerInstance->MatchText(source->GetFullHost(), c->first)))
+ if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (InspIRCd::Match(source->GetFullHost(), c->first)))
return !(((c->second & SILENCE_EXCLUDE) > 0));
}
}
virtual ~ModuleSilence()
{
}
-
+
virtual Version GetVersion()
{
- return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
}
};