X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence.cpp;h=dea78c5268f74d4eb6c4e988ef985301786aee1d;hb=5d407fb44c759524881712a80febb86b4506ddbf;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..dea78c526 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -14,12 +14,16 @@ * --------------------------------------------------- */ +using namespace std; + #include #include #include #include "users.h" #include "channels.h" #include "modules.h" +#include "helperfuncs.h" +#include "hashcomp.h" /* $ModDesc: Provides support for the /SILENCE command */ @@ -29,100 +33,127 @@ // have one of these structures associated with their user record. typedef std::vector silencelist; - -void handle_silence(char **parameters, int pcnt, userrec *user) +class cmd_silence : public command_t { - if (!pcnt) + public: + cmd_silence() : command_t("SILENCE", 0, 1) { - // 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"; } - else if (pcnt > 0) + + void Handle (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 + // no parameters, show the current silence list. + // Use Extensible::GetExt to fetch the silence list silencelist* sl = (silencelist*)user->GetExt("silence_list"); - // does it contain any entries and does it exist? + // 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"); + 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); } - 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) + char *nick = parameters[0]; + if (nick[0] == '-') { - sl = new silencelist; - user->Extend(std::string("silence_list"),(char*)sl); + // 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? + 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); + 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()) + { + // 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 (nick[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) + { + sl = new silencelist; + user->Extend(std::string("silence_list"),(char*)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++) + { + irc::string listitem = n->c_str(); + irc::string target = nick; + if (listitem == target) + { + WriteServ(user->fd,"952 %s %s :%s is already on your silence list",user->nick, user->nick,nick); + return; + } + } + sl->push_back(std::string(nick)); + WriteServ(user->fd,"951 %s %s :Added %s!*@* to silence list",user->nick, user->nick,nick); + return; } - // 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; } - return; -} - +}; class ModuleSilence : public Module { Server *Srv; + cmd_silence* mycommand; public: - ModuleSilence() + ModuleSilence(Server* Me) + : Module::Module(Me) + { + Srv = Me; + mycommand = new cmd_silence(); + Srv->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) { // 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"); if (sl) { - delete sl; + DELETE(sl); user->Shrink("silence_list"); } } @@ -133,7 +164,7 @@ 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) { // 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. @@ -147,7 +178,9 @@ class ModuleSilence : public Module { for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) { - if (!strcasecmp(c->c_str(),user->nick)) + irc::string listitem = c->c_str(); + irc::string target = user->nick; + if (listitem == target) { return 1; } @@ -157,34 +190,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) + { + return OnUserPreNotice(user,dest,target_type,text,status); + } virtual ~ModuleSilence() { - delete Srv; } virtual Version GetVersion() { - return Version(1,0,0,0); + return Version(1,0,0,1,VF_VENDOR); } }; @@ -200,9 +217,9 @@ class ModuleSilenceFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(Server* Me) { - return new ModuleSilence; + return new ModuleSilence(Me); } };