X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_deaf.cpp;h=43b24cfae9c6dba39b0f6ce6b0a64c40164c792b;hb=9f69e159adcc0892f0bdef16ac4617630737b156;hp=12ef0ddda83804811f8437c03ba666cd01d3814e;hpb=1155f2492cc9e457681cd4530c0c5358392e6d7c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp index 12ef0ddda..43b24cfae 100644 --- a/src/modules/m_deaf.cpp +++ b/src/modules/m_deaf.cpp @@ -1,37 +1,42 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2006, 2008 Craig Edwards + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2006-2007 Dennis Friis * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #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) */ +/* $ModDesc: Provides usermode +d to block channel messages and channel notices */ /** User mode +d - filter out channel messages and channel notices */ class User_d : public ModeHandler { public: - User_d(InspIRCd* Instance) : ModeHandler(Instance, 'd', 0, 0, false, MODETYPE_USER, false) { } + User_d(Module* Creator) : ModeHandler(Creator, "deaf", 'd', PARAM_NONE, MODETYPE_USER) { } - 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) { 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,85 +55,117 @@ 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) + ModuleDeaf() + : m1(this) { - m1 = new User_d(ServerInstance); - if (!ServerInstance->AddMode(m1, 'd')) - throw ModuleException("Could not add new modes!"); } - void Implements(char* List) + void init() { - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnBuildExemptList] = 1; - } + ServerInstance->Modules->AddService(m1); - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - return PreText(user, dest, target_type, text, status, exempt_list); + OnRehash(NULL); + Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual void OnRehash(User* user) { - return PreText(user, dest, target_type, text, status, exempt_list); + ConfigTag* tag = ServerInstance->Config->ConfValue("deaf"); + deaf_bypasschars = tag->getString("bypasschars"); + deaf_bypasschars_uline = tag->getString("bypasscharsuline"); } - virtual void OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list) + virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { - CUList *ulist; - switch (status) + if (target_type == TYPE_CHANNEL) { - case '@': - ulist = chan->GetOppedUsers(); - break; - case '%': - ulist = chan->GetHalfoppedUsers(); - break; - case '+': - ulist = chan->GetVoicedUsers(); - break; - default: - ulist = chan->GetUsers(); - break; + Channel* chan = (Channel*)dest; + if (chan) + this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list); } - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + return MOD_RES_PASSTHRU; + } + + virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + { + if (target_type == TYPE_CHANNEL) { - if (IS_LOCAL(i->first)) - { - if (i->first->IsModeSet('d')) - { - exempt_list[i->first] = i->first->nick; - } - } + Channel* chan = (Channel*)dest; + if (chan) + this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list); } + + return MOD_RES_PASSTHRU; } - virtual int PreText(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list) { - if (target_type == TYPE_CHANNEL) + const UserMembList *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()) + { + is_bypasschar_avail = 1; + if (deaf_bypasschars.find(text[0], 0) != std::string::npos) + is_bypasschar = 1; + } + if (!deaf_bypasschars_uline.empty()) { - chanrec* chan = (chanrec*)dest; + is_bypasschar_uline_avail = 1; + if (deaf_bypasschars_uline.find(text[0], 0) != std::string::npos) + is_bypasschar_uline = 1; + } - if (chan) - { - this->OnBuildExemptList(MSG_PRIVMSG, chan, user, status, exempt_list); - } + /* + * 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 (UserMembCIter i = ulist->begin(); i != ulist->end(); i++) + { + /* 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.insert(i->first); } - return 0; } virtual ~ModuleDeaf() { - ServerInstance->Modes->DelMode(m1); - DELETE(m1); } virtual Version GetVersion() { - return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Provides usermode +d to block channel messages and channel notices", VF_VENDOR); } };