X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_silence.cpp;h=b0568905676a0e337a9b704c844f1455c34c7ac4;hb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;hp=d3a5ca44ae2765edf30546462eb4aac0344ca09c;hpb=6050df73f498d05597fb37c6157868df1f6f4db2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index d3a5ca44a..b05689056 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -2,48 +2,40 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 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. * * --------------------------------------------------- */ -using namespace std; - -#include -#include -#include +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" - #include "hashcomp.h" -#include "inspircd.h" +#include "wildcard.h" /* $ModDesc: Provides support for the /SILENCE command */ - // This typedef holds a silence list. Each user may or may not have a // silencelist, if a silence list is empty for a user, he/she does not // have one of these structures associated with their user record. -typedef std::vector silencelist; +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 = "{[+|-]}"; + syntax = "{[+|-]}"; } - void Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, userrec *user) { if (!pcnt) { @@ -54,55 +46,56 @@ class cmd_silence : public command_t // if the user has a silence list associated with their user record, show it if (sl) { - for (silencelist::const_iterator c = sl->begin(); c < sl->end(); c++) + for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) { - user->WriteServ("271 %s %s %s!*@*",user->nick, user->nick,c->c_str()); + user->WriteServ("271 %s %s %s :%lu",user->nick, user->nick, c->first.c_str(), (unsigned long)c->second); } } user->WriteServ("272 %s :End of Silence List",user->nick); + + return CMD_SUCCESS; } else if (pcnt > 0) { // one or more parameters, add or delete entry from the list (only the first parameter is used) - const char *nick = parameters[0]; - if (nick[0] == '-') + std::string mask = parameters[0] + 1; + char action = *parameters[0]; + + if (!mask.length()) + { + // 'SILENCE +' or 'SILENCE -', assume *!*@* + mask = "*!*@*"; + } + + ModeParser::CleanMask(mask); + + if (action == '-') { - // removing an item from the list - nick++; // fetch their silence list silencelist* sl; user->GetExt("silence_list", sl); // does it contain any entries and does it exist? if (sl) { - if (sl->size()) - { - for (silencelist::iterator i = sl->begin(); i != sl->end(); i++) - { - // search through for the item - irc::string listitem = i->c_str(); - irc::string target = nick; - if (listitem == target) - { - sl->erase(i); - user->WriteServ("950 %s %s :Removed %s!*@* from silence list",user->nick, user->nick,nick); - // we have modified the vector from within a loop, we must now bail out - return; - } - } - } - if (!sl->size()) + silencelist::iterator i = sl->find(mask.c_str()); + if (i != sl->end()) { - // tidy up -- if a user's list is empty, theres no use having it - // hanging around in the user record. - DELETE(sl); - user->Shrink("silence_list"); + sl->erase(i); + user->WriteServ("950 %s %s :Removed %s from silence list",user->nick, user->nick, mask.c_str()); + if (!sl->size()) + { + // tidy up -- if a user's list is empty, theres no use having it + // hanging around in the user record. + DELETE(sl); + user->Shrink("silence_list"); + } } + else + user->WriteServ("952 %s %s :%s does not exist on your silence list",user->nick, user->nick, mask.c_str()); } } - else if (nick[0] == '+') + else if (action == '+') { - nick++; // fetch the user's current silence list silencelist* sl; user->GetExt("silence_list", sl); @@ -110,25 +103,25 @@ class cmd_silence : public command_t if (!sl) { sl = new silencelist; - user->Extend(std::string("silence_list"), sl); + user->Extend("silence_list", sl); } - // add the nick to it -- silence only takes nicks for some reason even though its list shows masks - for (silencelist::iterator n = sl->begin(); n != sl->end(); n++) + silencelist::iterator n = sl->find(mask.c_str()); + if (n != sl->end()) { - irc::string listitem = n->c_str(); - irc::string target = nick; - if (listitem == target) - { - user->WriteServ("952 %s %s :%s is already on your silence list",user->nick, user->nick,nick); - return; - } + user->WriteServ("952 %s %s :%s is already on your silence list",user->nick, user->nick, mask.c_str()); + return CMD_FAILURE; } - sl->push_back(std::string(nick)); - user->WriteServ("951 %s %s :Added %s!*@* to silence list",user->nick, user->nick,nick); - return; + 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; } } - return; + return CMD_SUCCESS; } }; @@ -136,22 +129,31 @@ class ModuleSilence : public Module { cmd_silence* mycommand; + unsigned int maxsilence; public: ModuleSilence(InspIRCd* Me) - : Module::Module(Me) + : 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 OnUserQuit(userrec* user, const std::string &reason) + 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) { // when the user quits tidy up any silence list they might have just to keep things tidy // and to prevent a HONKING BIG MEMORY LEAK! @@ -167,16 +169,16 @@ 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) + virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { // im not sure how unreal's silence operates but ours is sensible. It blocks notices and // privmsgs from people on the silence list, directed privately at the user. // channel messages are unaffected (ever tried to follow the flow of conversation in // a channel when you've set an ignore on the two most talkative people?) - if (target_type == TYPE_USER) + if ((target_type == TYPE_USER) && (IS_LOCAL(user))) { userrec* u = (userrec*)dest; silencelist* sl; @@ -185,9 +187,7 @@ class ModuleSilence : public Module { for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) { - irc::string listitem = c->c_str(); - irc::string target = user->nick; - if (listitem == target) + if (match(user->GetFullHost(), c->first.c_str())) { return 1; } @@ -197,9 +197,9 @@ class ModuleSilence : public Module return 0; } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) + virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { - return OnUserPreNotice(user,dest,target_type,text,status); + return OnUserPreNotice(user,dest,target_type,text,status,exempt_list); } virtual ~ModuleSilence() @@ -208,32 +208,8 @@ class ModuleSilence : public Module virtual Version GetVersion() { - return Version(1,0,0,1,VF_VENDOR); - } -}; - - -class ModuleSilenceFactory : public ModuleFactory -{ - public: - ModuleSilenceFactory() - { - } - - ~ModuleSilenceFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSilence(Me); + return Version(1,1,0,1,VF_VENDOR,API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSilenceFactory; -} - +MODULE_INIT(ModuleSilence)