From 2b2c61df8e55a331768d54cdef738c4c5179ca10 Mon Sep 17 00:00:00 2001 From: brain Date: Thu, 10 May 2007 21:45:16 +0000 Subject: Add and git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6969 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_silence.cpp | 27 +++++++++++++++++++++------ src/modules/m_silence_ext.cpp | 36 +++++++++++++++++++++++++----------- src/modules/m_watch.cpp | 13 +++++++++++-- 3 files changed, 57 insertions(+), 19 deletions(-) diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 72dbc6a73..42b7f96e9 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -30,8 +30,9 @@ typedef std::map silencelist; class cmd_silence : public command_t { + unsigned int& maxsilence; 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"; syntax = "{[+|-]}"; @@ -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()); 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(mask.c_str(), ServerInstance->Time())); user->WriteServ("951 %s %s :Added %s to silence list",user->nick, user->nick, mask.c_str()); return CMD_SUCCESS; @@ -126,19 +132,28 @@ class ModuleSilence : public Module { cmd_silence* mycommand; + unsigned int maxsilence; public: ModuleSilence(InspIRCd* Me) - : Module::Module(Me) + : Module::Module(Me), maxsilence(32) { - - mycommand = new cmd_silence(ServerInstance); + OnRehash(NULL, ""); + mycommand = new cmd_silence(ServerInstance, maxsilence); ServerInstance->AddCommand(mycommand); } 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 ¶meter) + { + 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) @@ -157,7 +172,7 @@ class ModuleSilence : public Module virtual void On005Numeric(std::string &output) { // 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) diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp index ef7a46cd1..e58e626c7 100644 --- a/src/modules/m_silence_ext.cpp +++ b/src/modules/m_silence_ext.cpp @@ -61,8 +61,9 @@ static int SILENCE_EXCLUDE = 0x0040; /* x exclude this pattern */ class cmd_silence : public command_t { + unsigned int& maxsilence; 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"; syntax = "{[+|-] }"; @@ -86,7 +87,7 @@ class cmd_silence : public command_t } user->WriteServ("272 %s :End of Silence List",user->nick); - return CMD_SUCCESS; + return CMD_LOCALONLY; } else if (pcnt > 0) { @@ -147,13 +148,18 @@ class cmd_silence : public command_t sl = new silencelist; 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++) { irc::string listitem = n->first.c_str(); 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()); - return CMD_SUCCESS; + return CMD_FAILURE; } } if (((pattern & SILENCE_EXCLUDE) > 0)) @@ -165,10 +171,10 @@ class cmd_silence : public command_t 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()); - return CMD_SUCCESS; + return CMD_LOCALONLY; } } - return CMD_SUCCESS; + return CMD_LOCALONLY; } /* turn the nice human readable pattern into a mask */ @@ -232,21 +238,29 @@ class cmd_silence : public command_t class ModuleSilence : public Module { - cmd_silence* mycommand; + unsigned int maxsilence; public: ModuleSilence(InspIRCd* Me) - : Module::Module(Me) + : Module::Module(Me), maxsilence(32) { - - mycommand = new cmd_silence(ServerInstance); + OnRehash(NULL, ""); + mycommand = new cmd_silence(ServerInstance,maxsilence); ServerInstance->AddCommand(mycommand); } + virtual void OnRehash(userrec* user, const std::string ¶meter) + { + ConfigReader Conf(ServerInstance); + maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true); + if (!maxsilence) + maxsilence = 32; + } + 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) @@ -264,7 +278,7 @@ class ModuleSilence : public Module virtual void On005Numeric(std::string &output) { // 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) diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index 170585737..b46d80b54 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -303,14 +303,23 @@ class Modulewatch : public Module Modulewatch(InspIRCd* Me) : Module::Module(Me), maxwatch(32) { + OnRehash(NULL, ""); whos_watching_me = new watchentries(); mycommand = new cmd_watch(ServerInstance, maxwatch); ServerInstance->AddCommand(mycommand); } + virtual void OnRehash(userrec* user, const std::string ¶meter) + { + ConfigReader Conf(ServerInstance); + maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true); + if (!maxwatch) + maxwatch = 32; + } + 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) @@ -437,7 +446,7 @@ class Modulewatch : public Module virtual void On005Numeric(std::string &output) { // we don't really have a limit... - output = output + " WATCH=32"; + output = output + " WATCH=" + ConvToStr(maxwatch); } virtual ~Modulewatch() -- cgit v1.2.3