X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_deaf.cpp;h=7a810ae3174ac72b2df7c134cec050206b73569d;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=ad8b31714ee089e26f2633e846ec4b7e6b070295;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp index ad8b31714..7a810ae31 100644 --- a/src/modules/m_deaf.cpp +++ b/src/modules/m_deaf.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,9 +12,6 @@ */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" /* $ModDesc: Provides support for ircu style usermode +d (deaf to channel messages and channel notices) */ @@ -25,13 +22,13 @@ class User_d : public ModeHandler public: User_d(InspIRCd* Instance) : ModeHandler(Instance, 'd', 0, 0, false, MODETYPE_USER, false) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) { if (adding) { if (!dest->IsModeSet('d')) { - dest->WriteServ("NOTICE %s :*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode %s -d.", dest->nick, dest->nick); + dest->WriteServ("NOTICE %s :*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode %s -d.", dest->nick.c_str(), dest->nick.c_str()); dest->SetMode('d',true); return MODEACTION_ALLOW; } @@ -50,84 +47,123 @@ class User_d : public ModeHandler class ModuleDeaf : public Module { - User_d* m1; + User_d m1; + + std::string deaf_bypasschars; + std::string deaf_bypasschars_uline; + public: ModuleDeaf(InspIRCd* Me) - : Module(Me) + : Module(Me), m1(Me) { - m1 = new User_d(ServerInstance); - if (!ServerInstance->AddMode(m1, 'd')) + if (!ServerInstance->Modes->AddMode(&m1)) throw ModuleException("Could not add new modes!"); + + OnRehash(NULL); + Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_OnBuildExemptList }; + ServerInstance->Modules->Attach(eventlist, this, 4); } - void Implements(char* List) + + virtual void OnRehash(User* user) { - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnBuildExemptList] = 1; + ConfigReader* conf = new ConfigReader(ServerInstance); + deaf_bypasschars = conf->ReadValue("deaf", "bypasschars", 0); + deaf_bypasschars_uline = conf->ReadValue("deaf", "bypasscharsuline", 0); + + delete conf; } - 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) { - return PreText(user, dest, target_type, text, status, exempt_list); + if (target_type == TYPE_CHANNEL) + { + Channel* chan = (Channel*)dest; + if (chan) + this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list); + } + + return 0; + } + + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + { + if (target_type == TYPE_CHANNEL) + { + Channel* chan = (Channel*)dest; + if (chan) + this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list); + } + + return 0; } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text) { - return PreText(user, dest, target_type, text, status, exempt_list); + BuildDeafList(message_type, chan, sender, status, text, exempt_list); } - virtual void OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list) + virtual void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list) { - CUList *ulist; - switch (status) + CUList *ulist = chan->GetUsers(); + bool is_a_uline; + bool is_bypasschar, is_bypasschar_avail; + bool is_bypasschar_uline, is_bypasschar_uline_avail; + + is_bypasschar = is_bypasschar_avail = is_bypasschar_uline = is_bypasschar_uline_avail = 0; + if (!deaf_bypasschars.empty()) { - case '@': - ulist = chan->GetOppedUsers(); - break; - case '%': - ulist = chan->GetHalfoppedUsers(); - break; - case '+': - ulist = chan->GetVoicedUsers(); - break; - default: - ulist = chan->GetUsers(); - break; + is_bypasschar_avail = 1; + if (deaf_bypasschars.find(text[0], 0) != std::string::npos) + is_bypasschar = 1; } - - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + if (!deaf_bypasschars_uline.empty()) { - if (IS_LOCAL(i->first)) - { - if (i->first->IsModeSet('d')) - { - exempt_list[i->first] = i->first->nick; - } - } + is_bypasschar_uline_avail = 1; + if (deaf_bypasschars_uline.find(text[0], 0) != std::string::npos) + is_bypasschar_uline = 1; } - } - virtual int PreText(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - if ((target_type == TYPE_CHANNEL) & (IS_LOCAL(user))) + /* + * If we have no bypasschars_uline in config, and this is a bypasschar (regular) + * Than it is obviously going to get through +d, no build required + */ + if (!is_bypasschar_uline_avail && is_bypasschar) + return; + + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - chanrec* chan = (chanrec*)dest; - if (chan) - { - this->OnBuildExemptList(MSG_PRIVMSG, chan, user, status, exempt_list); - } + /* not +d ? */ + if (!i->first->IsModeSet('d')) + continue; /* deliver message */ + /* matched both U-line only and regular bypasses */ + if (is_bypasschar && is_bypasschar_uline) + continue; /* deliver message */ + + is_a_uline = ServerInstance->ULine(i->first->server); + /* matched a U-line only bypass */ + if (is_bypasschar_uline && is_a_uline) + continue; /* deliver message */ + /* matched a regular bypass */ + if (is_bypasschar && !is_a_uline) + continue; /* deliver message */ + + if (status && !strchr(chan->GetAllPrefixChars(i->first), status)) + continue; + + /* don't deliver message! */ + exempt_list[i->first] = i->first->nick; } - return 0; } virtual ~ModuleDeaf() { - ServerInstance->Modes->DelMode(m1); - DELETE(m1); + ServerInstance->Modes->DelMode(&m1); } virtual Version GetVersion() { - return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION); } };