X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence.cpp;h=9361b9a67f1c032df15fd7853f9c10a1d798ffdc;hb=ccd95e668a3bcbd26c4cd2984cdd8809347f9815;hp=58188fd1f2ab76151d4511faa47f6e822851a032;hpb=ca431c5bc81957090c39107bb25a20aba0d94b5c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 58188fd1f..9361b9a67 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,13 +11,6 @@ * --------------------------------------------------- */ -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "hashcomp.h" #include "inspircd.h" #include "wildcard.h" @@ -28,16 +21,18 @@ // have one of these structures associated with their user record. typedef std::map silencelist; -class cmd_silence : public command_t +class CommandSilence : public Command { + unsigned int& maxsilence; public: - cmd_silence (InspIRCd* Instance) : command_t(Instance,"SILENCE", 0, 0) + CommandSilence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max) { this->source = "m_silence.so"; syntax = "{[+|-]}"; + TRANSLATE2(TR_TEXT, TR_END); } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char* const* parameters, int pcnt, User *user) { if (!pcnt) { @@ -64,7 +59,7 @@ class cmd_silence : public command_t char action = *parameters[0]; if (!mask.length()) - { + { // 'SILENCE +' or 'SILENCE -', assume *!*@* mask = "*!*@*"; } @@ -82,13 +77,13 @@ class cmd_silence : public command_t silencelist::iterator i = sl->find(mask.c_str()); if (i != sl->end()) { - sl->erase(i); + 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); + delete sl; user->Shrink("silence_list"); } } @@ -113,6 +108,11 @@ class cmd_silence : public command_t user->WriteServ("952 %s %s :%s is already on your silence list",user->nick, user->nick, mask.c_str()); return CMD_FAILURE; } + 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; @@ -125,23 +125,30 @@ class cmd_silence : public command_t class ModuleSilence : public Module { - cmd_silence* mycommand; + CommandSilence* mycommand; + unsigned int maxsilence; public: ModuleSilence(InspIRCd* Me) - : Module::Module(Me) + : Module(Me), maxsilence(32) { - - mycommand = new cmd_silence(ServerInstance); + OnRehash(NULL, ""); + mycommand = new CommandSilence(ServerInstance, maxsilence); ServerInstance->AddCommand(mycommand); + Implementation eventlist[] = { I_OnRehash, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage }; + ServerInstance->Modules->Attach(eventlist, this, 5); } - void Implements(char* List) + + virtual void OnRehash(User* user, const std::string ¶meter) { - List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1; + 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) + virtual void OnUserQuit(User* 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! @@ -149,7 +156,7 @@ class ModuleSilence : public Module user->GetExt("silence_list", sl); if (sl) { - DELETE(sl); + delete sl; user->Shrink("silence_list"); } } @@ -157,10 +164,10 @@ 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, CUList &exempt_list) + virtual int OnUserPreNotice(User* 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. @@ -168,7 +175,7 @@ class ModuleSilence : public Module // a channel when you've set an ignore on the two most talkative people?) if ((target_type == TYPE_USER) && (IS_LOCAL(user))) { - userrec* u = (userrec*)dest; + User* u = (User*)dest; silencelist* sl; u->GetExt("silence_list", sl); if (sl) @@ -185,7 +192,7 @@ class ModuleSilence : public Module return 0; } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { return OnUserPreNotice(user,dest,target_type,text,status,exempt_list); } @@ -196,32 +203,8 @@ class ModuleSilence : public Module virtual Version GetVersion() { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); - } -}; - - -class ModuleSilenceFactory : public ModuleFactory -{ - public: - ModuleSilenceFactory() - { - } - - ~ModuleSilenceFactory() - { + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSilence(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSilenceFactory; -} - +MODULE_INIT(ModuleSilence)