X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_deaf.cpp;h=43b24cfae9c6dba39b0f6ce6b0a64c40164c792b;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=f08a32d1c8dd007d002b1e6c234cebb3ad0a6927;hpb=53afaa7cadcdf222dcf761441727305f79b4c557;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp index f08a32d1c..43b24cfae 100644 --- a/src/modules/m_deaf.cpp +++ b/src/modules/m_deaf.cpp @@ -1,29 +1,34 @@ -/* +------------------------------------+ - * | 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(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { @@ -31,7 +36,7 @@ class User_d : public ModeHandler { 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,35 +55,34 @@ 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)) - 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); } - - virtual void OnRehash(User* user, const std::string&) + void init() { - ConfigReader* conf = new ConfigReader(ServerInstance); - deaf_bypasschars = conf->ReadValue("deaf", "bypasschars", 0); - deaf_bypasschars_uline = conf->ReadValue("deaf", "bypasscharsuline", 0); + ServerInstance->Modules->AddService(m1); - delete conf; + OnRehash(NULL); + Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + } + + virtual void OnRehash(User* user) + { + ConfigTag* tag = ServerInstance->Config->ConfValue("deaf"); + deaf_bypasschars = tag->getString("bypasschars"); + deaf_bypasschars_uline = tag->getString("bypasscharsuline"); } - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_CHANNEL) { @@ -87,10 +91,10 @@ class ModuleDeaf : public Module this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list); } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (target_type == TYPE_CHANNEL) { @@ -99,17 +103,12 @@ class ModuleDeaf : public Module this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list); } - return 0; - } - - virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text) - { - BuildDeafList(message_type, chan, sender, status, text, exempt_list); + return MOD_RES_PASSTHRU; } virtual void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list) { - CUList *ulist; + const UserMembList *ulist = chan->GetUsers(); bool is_a_uline; bool is_bypasschar, is_bypasschar_avail; bool is_bypasschar_uline, is_bypasschar_uline_avail; @@ -118,13 +117,13 @@ class ModuleDeaf : public Module if (!deaf_bypasschars.empty()) { is_bypasschar_avail = 1; - if (deaf_bypasschars.find(text[0], 0) != string::npos) + if (deaf_bypasschars.find(text[0], 0) != std::string::npos) is_bypasschar = 1; } if (!deaf_bypasschars_uline.empty()) { is_bypasschar_uline_avail = 1; - if (deaf_bypasschars_uline.find(text[0], 0) != string::npos) + if (deaf_bypasschars_uline.find(text[0], 0) != std::string::npos) is_bypasschar_uline = 1; } @@ -135,23 +134,7 @@ class ModuleDeaf : public Module if (!is_bypasschar_uline_avail && is_bypasschar) return; - 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++) + for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++) { /* not +d ? */ if (!i->first->IsModeSet('d')) @@ -168,20 +151,21 @@ class ModuleDeaf : public Module 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; + exempt_list.insert(i->first); } } 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); } };