ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-13 12:39:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add <watch maxentries> and <silence maxentries>

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6969 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2007-05-10 21:45:16 +00:00
parent 8cc3fd44a6
commit 2b2c61df8e
3 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/m_silence.cpp
View File

@ -30,8 +30,9 @@ typedef std::map<irc::string, time_t> silencelist;
class cmd_silence : public command_t class cmd_silence : public command_t
{ {
unsigned int& maxsilence;
public: public:
cmd_silence (InspIRCd* Instance) : command_t(Instance,"SILENCE", 0, 0) cmd_silence (InspIRCd* Instance, unsigned int &max) : command_t(Instance,"SILENCE", 0, 0), maxsilence(max)
{ {
this->source = "m_silence.so"; this->source = "m_silence.so";
syntax = "{[+|-]<mask>}"; syntax = "{[+|-]<mask>}";
@ -113,6 +114,11 @@ class cmd_silence : public command_t
user->WriteServ("952 %s %s :%s is already on your silence list",user->nick, user->nick, mask.c_str()); user->WriteServ("952 %s %s :%s is already on your silence list",user->nick, user->nick, mask.c_str());
return CMD_FAILURE; return CMD_FAILURE;
} }
if (sl->size() >= maxsilence)
{
user->WriteServ("952 %s %s :Your silence list is full",user->nick, user->nick, mask.c_str());
return CMD_FAILURE;
}
sl->insert(std::make_pair<irc::string, time_t>(mask.c_str(), ServerInstance->Time())); sl->insert(std::make_pair<irc::string, time_t>(mask.c_str(), ServerInstance->Time()));
user->WriteServ("951 %s %s :Added %s to silence list",user->nick, user->nick, mask.c_str()); user->WriteServ("951 %s %s :Added %s to silence list",user->nick, user->nick, mask.c_str());
return CMD_SUCCESS; return CMD_SUCCESS;
@ -126,19 +132,28 @@ class ModuleSilence : public Module
{ {
cmd_silence* mycommand; cmd_silence* mycommand;
unsigned int maxsilence;
public: public:
ModuleSilence(InspIRCd* Me) ModuleSilence(InspIRCd* Me)
: Module::Module(Me) : Module::Module(Me), maxsilence(32)
{ {
OnRehash(NULL, "");
mycommand = new cmd_silence(ServerInstance); mycommand = new cmd_silence(ServerInstance, maxsilence);
ServerInstance->AddCommand(mycommand); ServerInstance->AddCommand(mycommand);
} }
void Implements(char* List) void Implements(char* List)
{ {
List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1; List[I_OnRehash] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
}
virtual void OnRehash(userrec* user, const std::string &parameter)
{
ConfigReader Conf(ServerInstance);
maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true);
if (!maxsilence)
maxsilence = 32;
} }
virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
@ -157,7 +172,7 @@ class ModuleSilence : public Module
virtual void On005Numeric(std::string &output) virtual void On005Numeric(std::string &output)
{ {
// we don't really have a limit... // we don't really have a limit...
output = output + " SILENCE=999"; output = output + " SILENCE=" + ConvToStr(maxsilence);
} }
virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)

36
src/modules/m_silence_ext.cpp
View File

@ -61,8 +61,9 @@ static int SILENCE_EXCLUDE = 0x0040; /* x exclude this pattern */
class cmd_silence : public command_t class cmd_silence : public command_t
{ {
unsigned int& maxsilence;
public: public:
cmd_silence (InspIRCd* Instance) : command_t(Instance,"SILENCE", 0, 0) cmd_silence (InspIRCd* Instance, unsigned int &max) : command_t(Instance,"SILENCE", 0, 0), maxsilence(max)
{ {
this->source = "m_silence_ext.so"; this->source = "m_silence_ext.so";
syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}"; syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}";
@ -86,7 +87,7 @@ class cmd_silence : public command_t
} }
user->WriteServ("272 %s :End of Silence List",user->nick); user->WriteServ("272 %s :End of Silence List",user->nick);
return CMD_SUCCESS; return CMD_LOCALONLY;
} }
else if (pcnt > 0) else if (pcnt > 0)
{ {
@ -147,13 +148,18 @@ class cmd_silence : public command_t
sl = new silencelist; sl = new silencelist;
user->Extend("silence_list", sl); user->Extend("silence_list", sl);
} }
if (sl->size() > maxsilence)
{
user->WriteServ("952 %s %s :Your silence list is full",user->nick, user->nick);
return CMD_FAILURE;
}
for (silencelist::iterator n = sl->begin(); n != sl->end(); n++) for (silencelist::iterator n = sl->begin(); n != sl->end(); n++)
{ {
irc::string listitem = n->first.c_str(); irc::string listitem = n->first.c_str();
if (listitem == mask && n->second == pattern) if (listitem == mask && n->second == pattern)
{ {
user->WriteServ("952 %s %s :%s %s is already on your silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str()); user->WriteServ("952 %s %s :%s %s is already on your silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str());
return CMD_SUCCESS; return CMD_FAILURE;
} }
} }
if (((pattern & SILENCE_EXCLUDE) > 0)) if (((pattern & SILENCE_EXCLUDE) > 0))
@ -165,10 +171,10 @@ class cmd_silence : public command_t
sl->push_back(silenceset(mask,pattern)); sl->push_back(silenceset(mask,pattern));
} }
user->WriteServ("951 %s %s :Added %s %s to silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str()); user->WriteServ("951 %s %s :Added %s %s to silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str());
return CMD_SUCCESS; return CMD_LOCALONLY;
} }
} }
return CMD_SUCCESS; return CMD_LOCALONLY;
} }
/* turn the nice human readable pattern into a mask */ /* turn the nice human readable pattern into a mask */
@ -232,21 +238,29 @@ class cmd_silence : public command_t
class ModuleSilence : public Module class ModuleSilence : public Module
{ {
cmd_silence* mycommand; cmd_silence* mycommand;
unsigned int maxsilence;
public: public:
ModuleSilence(InspIRCd* Me) ModuleSilence(InspIRCd* Me)
: Module::Module(Me) : Module::Module(Me), maxsilence(32)
{ {
OnRehash(NULL, "");
mycommand = new cmd_silence(ServerInstance); mycommand = new cmd_silence(ServerInstance,maxsilence);
ServerInstance->AddCommand(mycommand); ServerInstance->AddCommand(mycommand);
} }
virtual void OnRehash(userrec* user, const std::string &parameter)
{
ConfigReader Conf(ServerInstance);
maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true);
if (!maxsilence)
maxsilence = 32;
}
void Implements(char* List) void Implements(char* List)
{ {
List[I_OnBuildExemptList] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = List[I_OnUserPreInvite] = 1; List[I_OnRehash] = List[I_OnBuildExemptList] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = List[I_OnUserPreInvite] = 1;
} }
virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
@ -264,7 +278,7 @@ class ModuleSilence : public Module
virtual void On005Numeric(std::string &output) virtual void On005Numeric(std::string &output)
{ {
// we don't really have a limit... // we don't really have a limit...
output = output + " ESILENCE SILENCE=999"; output = output + " ESILENCE SILENCE=" + ConvToStr(maxsilence);
} }
virtual void OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list) virtual void OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list)

13
src/modules/m_watch.cpp
View File

@ -303,14 +303,23 @@ class Modulewatch : public Module
Modulewatch(InspIRCd* Me) Modulewatch(InspIRCd* Me)
: Module::Module(Me), maxwatch(32) : Module::Module(Me), maxwatch(32)
{ {
OnRehash(NULL, "");
whos_watching_me = new watchentries(); whos_watching_me = new watchentries();
mycommand = new cmd_watch(ServerInstance, maxwatch); mycommand = new cmd_watch(ServerInstance, maxwatch);
ServerInstance->AddCommand(mycommand); ServerInstance->AddCommand(mycommand);
} }
virtual void OnRehash(userrec* user, const std::string &parameter)
{
ConfigReader Conf(ServerInstance);
maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true);
if (!maxwatch)
maxwatch = 32;
}
void Implements(char* List) void Implements(char* List)
{ {
List[I_OnGarbageCollect] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1; List[I_OnRehash] = List[I_OnGarbageCollect] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1;
} }
virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
@ -437,7 +446,7 @@ class Modulewatch : public Module
virtual void On005Numeric(std::string &output) virtual void On005Numeric(std::string &output)
{ {
// we don't really have a limit... // we don't really have a limit...
output = output + " WATCH=32"; output = output + " WATCH=" + ConvToStr(maxwatch);
} }
virtual ~Modulewatch() virtual ~Modulewatch()