X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence.cpp;h=5c8e5fdefec45ca275057044ad87642c5637df9f;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=b6d821bc4cd9bd718fe05396e1f3ec125a27e013;hpb=dac485fc0946c9b351e317d7233062b453696ead;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index b6d821bc4..5c8e5fdef 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -2,12 +2,9 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 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. * @@ -20,109 +17,140 @@ #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; -void handle_silence(char **parameters, int pcnt, userrec *user) +class cmd_silence : public command_t { - if (!pcnt) + public: + cmd_silence (InspIRCd* Instance) : command_t(Instance,"SILENCE", 0, 0) { - // no parameters, show the current silence list. - // Use Extensible::GetExt to fetch the silence list - silencelist* sl = (silencelist*)user->GetExt("silence_list"); - // 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++) - { - WriteServ(user->fd,"271 %s %s %s!*@*",user->nick, user->nick,c->c_str()); - } - } - WriteServ(user->fd,"272 %s :End of Silence List",user->nick); + this->source = "m_silence.so"; + syntax = "{[+|-]}"; } - else if (pcnt > 0) + + CmdResult Handle (const char** parameters, int pcnt, userrec *user) { - // one or more parameters, add or delete entry from the list (only the first parameter is used) - char *nick = parameters[0]; - if (nick[0] == '-') + if (!pcnt) { - // removing an item from the list - nick++; - // fetch their silence list - silencelist* sl = (silencelist*)user->GetExt("silence_list"); - // does it contain any entries and does it exist? + // no parameters, show the current silence list. + // Use Extensible::GetExt to fetch the silence list + silencelist* sl; + user->GetExt("silence_list", sl); + // if the user has a silence list associated with their user record, show it if (sl) { - if (sl->size()) - { - for (silencelist::iterator i = sl->begin(); i != sl->end(); i++) - { - // search through for the item - if (!strcasecmp(i->c_str(),nick)) - { - sl->erase(i); - WriteServ(user->fd,"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()) + for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) { - // 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"); + 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 (nick[0] == '+') + else if (pcnt > 0) { - nick++; - // fetch the user's current silence list - silencelist* sl = (silencelist*)user->GetExt("silence_list"); - // what, they dont have one??? WE'RE ALL GONNA DIE! ...no, we just create an empty one. - if (!sl) + // one or more parameters, add or delete entry from the list (only the first parameter is used) + std::string mask = parameters[0] + 1; + char action = *parameters[0]; + + if (!mask.length()) + { + // 'SILENCE +' or 'SILENCE -', assume *!*@* + mask = "*!*@*"; + } + + ModeParser::CleanMask(mask); + + if (action == '-') { - sl = new silencelist; - user->Extend(std::string("silence_list"),(char*)sl); + // 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()) + { + silencelist::iterator i = sl->find(mask.c_str()); + if (i != sl->end()) + { + sl->erase(i); + user->WriteServ("950 %s %s :Removed %s from silence list",user->nick, user->nick, mask.c_str()); + } + } + else + { + // 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 if (action == '+') + { + // fetch the user's current silence list + silencelist* sl; + user->GetExt("silence_list", sl); + // what, they dont have one??? WE'RE ALL GONNA DIE! ...no, we just create an empty one. + if (!sl) + { + sl = new silencelist; + user->Extend("silence_list", sl); + } + silencelist::iterator n = sl->find(mask.c_str()); + if (n != sl->end()) + { + user->WriteServ("952 %s %s :%s is already on your silence list",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; } - // add the nick to it -- silence only takes nicks for some reason even though its list shows masks - sl->push_back(std::string(nick)); - WriteServ(user->fd,"951 %s %s :Added %s!*@* to silence list",user->nick, user->nick,nick); - return; } + return CMD_SUCCESS; } - return; -} - +}; class ModuleSilence : public Module { - Server *Srv; + + cmd_silence* mycommand; public: - ModuleSilence() + ModuleSilence(InspIRCd* Me) + : Module::Module(Me) + { + + mycommand = new cmd_silence(ServerInstance); + ServerInstance->AddCommand(mycommand); + } + + void Implements(char* List) { - Srv = new Server; - Srv->AddCommand("SILENCE",handle_silence,0,0); + List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1; } - virtual void OnUserQuit(userrec* user) + 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! - silencelist* sl = (silencelist*)user->GetExt("silence_list"); + silencelist* sl; + user->GetExt("silence_list", sl); if (sl) { - delete sl; + DELETE(sl); user->Shrink("silence_list"); } } @@ -133,21 +161,22 @@ class ModuleSilence : public Module output = output + " SILENCE=999"; } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text) + 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 = (silencelist*)u->GetExt("silence_list"); + silencelist* sl; + u->GetExt("silence_list", sl); if (sl) { for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) { - if (!strcasecmp(c->c_str(),user->nick)) + if (match(user->GetFullHost(), c->first.c_str())) { return 1; } @@ -157,34 +186,18 @@ class ModuleSilence : public Module return 0; } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text) - { - if (target_type == TYPE_USER) - { - userrec* u = (userrec*)dest; - silencelist* sl = (silencelist*)u->GetExt("silence_list"); - if (sl) - { - for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) - { - if (!strcasecmp(c->c_str(),user->nick)) - { - return 1; - } - } - } - } - return 0; - } + 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,exempt_list); + } virtual ~ModuleSilence() { - delete Srv; } virtual Version GetVersion() { - return Version(1,0,0,0); + return Version(1,1,0,1,VF_VENDOR,API_VERSION); } }; @@ -200,9 +213,9 @@ class ModuleSilenceFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(InspIRCd* Me) { - return new ModuleSilence; + return new ModuleSilence(Me); } };