X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence.cpp;h=86f12633d60b587f4418f5fb3d5708805ab80b6b;hb=43fe72edad4c5dfd1a3a700bea17c8ee7a7c3d8e;hp=3ac1719e9695e92e3c27f6920c7b23878f006173;hpb=1e1e483f9199bb8745aa7a5613305bc9bd3294bf;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 3ac1719e9..86f12633d 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -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,93 +33,115 @@ // 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 = new Server; - Srv->AddCommand("SILENCE",handle_silence,0,0); + Srv = Me; + mycommand = new cmd_silence(); + Srv->AddCommand(mycommand); } - virtual void OnUserQuit(userrec* user) + virtual void OnUserQuit(userrec* user, 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! @@ -126,6 +152,12 @@ class ModuleSilence : public Module user->Shrink("silence_list"); } } + + virtual void On005Numeric(std::string &output) + { + // we don't really have a limit... + output = output + " SILENCE=999"; + } virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text) { @@ -141,7 +173,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; } @@ -161,7 +195,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; } @@ -173,12 +209,11 @@ class ModuleSilence : public Module virtual ~ModuleSilence() { - delete Srv; } virtual Version GetVersion() { - return Version(1,0,0,0); + return Version(1,0,0,1,VF_VENDOR); } }; @@ -194,9 +229,9 @@ class ModuleSilenceFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(Server* Me) { - return new ModuleSilence; + return new ModuleSilence(Me); } };