X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence_ext.cpp;h=450cb14f846f4a5aa25ad28fca42dc514d227f0b;hb=52acbb466b84a1cd161b1c111f855d6f0419fff3;hp=4c92b3a47fa0125a6959b4e35ec9889e5dda56cb;hpb=69112caf3ae0230ba4538bbbae6d8f0579afd5a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp index 4c92b3a47..450cb14f8 100644 --- a/src/modules/m_silence_ext.cpp +++ b/src/modules/m_silence_ext.cpp @@ -2,35 +2,26 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 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. * * --------------------------------------------------- */ -using namespace std; - -#include -#include -#include -#include +#include "inspircd.h" #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 */ /* Improved drop-in replacement for the /SILENCE command - * syntax: /SILENCE [+|-] as in + * syntax: /SILENCE [+|-] as in * * example that blocks all except private messages * /SILENCE +*!*@* a @@ -66,8 +57,9 @@ static int SILENCE_EXCLUDE = 0x0040; /* x exclude this pattern */ class cmd_silence : public command_t { + unsigned int& maxsilence; public: - cmd_silence (InspIRCd* Instance) : command_t(Instance,"SILENCE", 0, 0) + cmd_silence (InspIRCd* Instance, unsigned int &max) : command_t(Instance,"SILENCE", 0, 0), maxsilence(max) { this->source = "m_silence_ext.so"; syntax = "{[+|-] }"; @@ -91,7 +83,7 @@ class cmd_silence : public command_t } user->WriteServ("272 %s :End of Silence List",user->nick); - return CMD_SUCCESS; + return CMD_LOCALONLY; } else if (pcnt > 0) { @@ -107,7 +99,7 @@ class cmd_silence : public command_t } if (!mask.length()) - { + { // 'SILENCE +' or 'SILENCE -', assume *!*@* mask = "*!*@*"; } @@ -122,28 +114,24 @@ class cmd_silence : public command_t // does it contain any entries and does it exist? if (sl) { - if (sl->size()) + for (silencelist::iterator i = sl->begin(); i != sl->end(); i++) { - for (silencelist::iterator i = sl->begin(); i != sl->end(); i++) + // search through for the item + irc::string listitem = i->first.c_str(); + if (listitem == mask && i->second == pattern) { - // search through for the item - irc::string listitem = i->first.c_str(); - if (listitem == mask && i->second == pattern) + sl->erase(i); + user->WriteServ("950 %s %s :Removed %s %s from silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str()); + if (!sl->size()) { - sl->erase(i); - user->WriteServ("950 %s %s :Removed %s %s from silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str()); - break; + DELETE(sl); + user->Shrink("silence_list"); } + break; } } - 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"); - } } + user->WriteServ("952 %s %s :%s %s does not exist on your silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str()); } else if (action == '+') { @@ -156,13 +144,18 @@ class cmd_silence : public command_t sl = new silencelist; user->Extend("silence_list", sl); } + if (sl->size() > maxsilence) + { + user->WriteServ("952 %s %s :Your silence list is full",user->nick, user->nick); + return CMD_FAILURE; + } for (silencelist::iterator n = sl->begin(); n != sl->end(); n++) { irc::string listitem = n->first.c_str(); if (listitem == mask && n->second == pattern) { user->WriteServ("952 %s %s :%s %s is already on your silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str()); - return CMD_SUCCESS; + return CMD_FAILURE; } } if (((pattern & SILENCE_EXCLUDE) > 0)) @@ -174,10 +167,10 @@ class cmd_silence : public command_t sl->push_back(silenceset(mask,pattern)); } user->WriteServ("951 %s %s :Added %s %s to silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str()); - return CMD_SUCCESS; + return CMD_LOCALONLY; } } - return CMD_SUCCESS; + return CMD_LOCALONLY; } /* turn the nice human readable pattern into a mask */ @@ -219,7 +212,7 @@ class cmd_silence : public command_t /* turn the mask into a nice human readable format */ std::string DecompPattern (const int pattern) { - std::string out = ""; + std::string out; if ((pattern & SILENCE_PRIVATE) > 0) out += ",privatemessages"; if ((pattern & SILENCE_CHANNEL) > 0) @@ -241,24 +234,32 @@ class cmd_silence : public command_t class ModuleSilence : public Module { - cmd_silence* mycommand; + unsigned int maxsilence; public: ModuleSilence(InspIRCd* Me) - : Module::Module(Me) + : Module(Me), maxsilence(32) { - - mycommand = new cmd_silence(ServerInstance); + OnRehash(NULL, ""); + mycommand = new cmd_silence(ServerInstance,maxsilence); ServerInstance->AddCommand(mycommand); } + virtual void OnRehash(userrec* user, const std::string ¶meter) + { + ConfigReader Conf(ServerInstance); + maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true); + if (!maxsilence) + maxsilence = 32; + } + void Implements(char* List) { - List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = List[I_OnUserPreInvite] = 1; + List[I_OnRehash] = List[I_OnBuildExemptList] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = List[I_OnUserPreInvite] = 1; } - virtual void OnUserQuit(userrec* user, const std::string &reason) + 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 silencelist* sl; @@ -273,12 +274,46 @@ class ModuleSilence : public Module virtual void On005Numeric(std::string &output) { // we don't really have a limit... - output = output + " ESILENCE SILENCE=999"; + output = output + " ESILENCE SILENCE=" + ConvToStr(maxsilence); } + virtual void OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list) + { + int public_silence = (message_type == MSG_PRIVMSG ? SILENCE_CHANNEL : SILENCE_CNOTICE); + CUList *ulist; + switch (status) + { + case '@': + ulist = chan->GetOppedUsers(); + break; + case '%': + ulist = chan->GetHalfoppedUsers(); + break; + case '+': + ulist = chan->GetVoicedUsers(); + break; + default: + ulist = chan->GetUsers(); + break; + } + + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + { + if (IS_LOCAL(i->first)) + { + if (MatchPattern(i->first, sender, public_silence) == 1) + { + exempt_list[i->first] = i->first->nick; + } + } + } + } virtual int PreText(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list, int silence_type) { + if (!IS_LOCAL(user)) + return 0; + if (target_type == TYPE_USER) { return MatchPattern((userrec*)dest, user, silence_type); @@ -286,37 +321,9 @@ class ModuleSilence : public Module else if (target_type == TYPE_CHANNEL) { chanrec* chan = (chanrec*)dest; - int public_silence = (silence_type == SILENCE_PRIVATE ? SILENCE_CHANNEL : SILENCE_CNOTICE); - if (chan) { - CUList *ulist; - switch (status) - { - case '@': - ulist = chan->GetOppedUsers(); - break; - case '%': - ulist = chan->GetHalfoppedUsers(); - break; - case '+': - ulist = chan->GetVoicedUsers(); - break; - default: - ulist = chan->GetUsers(); - break; - } - - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - if ((IS_LOCAL(i->second)) && (user != i->second)) - { - if (MatchPattern(i->second, user, public_silence) == 1) - { - exempt_list[i->second] = i->second; - } - } - } + this->OnBuildExemptList((silence_type == SILENCE_PRIVATE ? MSG_PRIVMSG : MSG_NOTICE), chan, user, status, exempt_list); } } return 0; @@ -345,16 +352,8 @@ class ModuleSilence : public Module { for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) { - if ((match(source->GetFullHost(), c->first.c_str())) && ( ((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) - { - if (((c->second & SILENCE_EXCLUDE) > 0)) - { - return 0; - } - else { - return 1; - } - } + if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (ServerInstance->MatchText(source->GetFullHost(), c->first))) + return !(((c->second & SILENCE_EXCLUDE) > 0)); } } return 0; @@ -390,7 +389,7 @@ class ModuleSilenceFactory : public ModuleFactory }; -extern "C" void * init_module( void ) +extern "C" DllExport void * init_module( void ) { return new ModuleSilenceFactory; }