X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence.cpp;h=39b810dfe07bbc15187e7b8f687990dbdbba56ce;hb=cccc3895cc0784458d730997186d3c0bc5db1539;hp=86f12633d60b587f4418f5fb3d5708805ab80b6b;hpb=a5a8764bfe85e208a622a86295bdf56da575f21c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 86f12633d..39b810dfe 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: * * @@ -36,18 +36,19 @@ typedef std::vector silencelist; class cmd_silence : public command_t { public: - cmd_silence() : command_t("SILENCE", 0, 1) + cmd_silence() : command_t("SILENCE", 0, 0) { this->source = "m_silence.so"; } - void Handle (char **parameters, int pcnt, userrec *user) + void Handle (const char** parameters, int pcnt, userrec *user) { if (!pcnt) { // no parameters, show the current silence list. // Use Extensible::GetExt to fetch the silence list - silencelist* sl = (silencelist*)user->GetExt("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) { @@ -61,37 +62,38 @@ class cmd_silence : public command_t else if (pcnt > 0) { // one or more parameters, add or delete entry from the list (only the first parameter is used) - char *nick = parameters[0]; + const char *nick = parameters[0]; if (nick[0] == '-') { // removing an item from the list nick++; // fetch their silence list - silencelist* sl = (silencelist*)user->GetExt("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++) - { + 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); + { + 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; - } - } - } + 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; + DELETE(sl); user->Shrink("silence_list"); } } @@ -100,12 +102,13 @@ class cmd_silence : public command_t { nick++; // fetch the user's current silence list - silencelist* sl = (silencelist*)user->GetExt("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(std::string("silence_list"),(char*)sl); + user->Extend(std::string("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++) @@ -141,14 +144,20 @@ class ModuleSilence : public Module Srv->AddCommand(mycommand); } - virtual void OnUserQuit(userrec* user, std::string reason) + void Implements(char* List) + { + List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1; + } + + 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"); + silencelist* sl; + user->GetExt("silence_list", sl); if (sl) { - delete sl; + DELETE(sl); user->Shrink("silence_list"); } } @@ -159,7 +168,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. @@ -168,14 +177,15 @@ class ModuleSilence : public Module if (target_type == TYPE_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++) { - irc::string listitem = c->c_str(); - irc::string target = user->nick; - if (listitem == target) + irc::string listitem = c->c_str(); + irc::string target = user->nick; + if (listitem == target) { return 1; } @@ -185,27 +195,10 @@ 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++) - { - irc::string listitem = c->c_str(); - irc::string target = user->nick; - if (listitem == target) - { - 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() {