X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_deaf.cpp;h=1a2ec9b226c54a5be4e00d3074ee5b094f640143;hb=HEAD;hp=a955275eece31cd95b501fd9a4f7e9c0b5cb4c57;hpb=cbb6b376c781024534d4ece31a4b5296894d7390;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp index a955275ee..1a2ec9b22 100644 --- a/src/modules/m_deaf.cpp +++ b/src/modules/m_deaf.cpp @@ -1,10 +1,15 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2006, 2008 Craig Edwards + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2013, 2017, 2021 Sadie Powell + * Copyright (C) 2012-2014, 2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008, 2010 Craig Edwards * Copyright (C) 2007 Robin Burchell * Copyright (C) 2006-2007 Dennis Friis - * Copyright (C) 2012 satmd * * 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 @@ -21,6 +26,7 @@ #include "inspircd.h" +#include "modules/ctctags.h" // User mode +d - filter out channel messages and channel notices class DeafMode : public ModeHandler @@ -34,7 +40,7 @@ class DeafMode : public ModeHandler return MODEACTION_DENY; if (adding) - dest->WriteNotice("*** 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 " + dest->nick + " -d."); + dest->WriteNotice("*** You have enabled user mode +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 " + dest->nick + " -d."); dest->SetMode(this, adding); return MODEACTION_ALLOW; @@ -57,24 +63,72 @@ class PrivDeafMode : public ModeHandler return MODEACTION_DENY; if (adding) - dest->WriteNotice("*** You have enabled usermode +D, private deaf mode. This mode means you WILL NOT receive any messages and notices from any nicks. If you did NOT mean to do this, use /mode " + dest->nick + " -D."); + dest->WriteNotice("*** You have enabled user mode +D, private deaf mode. This mode means you WILL NOT receive any messages and notices from any nicks. If you did NOT mean to do this, use /mode " + dest->nick + " -D."); dest->SetMode(this, adding); return MODEACTION_ALLOW; } }; -class ModuleDeaf : public Module +class ModuleDeaf + : public Module + , public CTCTags::EventListener { + private: DeafMode deafmode; PrivDeafMode privdeafmode; std::string deaf_bypasschars; std::string deaf_bypasschars_uline; bool privdeafuline; + ModResult HandleChannel(User* source, Channel* target, CUList& exemptions, bool is_bypasschar, bool is_bypasschar_uline) + { + const Channel::MemberMap& ulist = target->GetUsers(); + for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i) + { + User* member = i->first; + + // Allow if the user doesn't have the mode set. + if (!member->IsModeSet(deafmode)) + continue; + + // Allow if the message begins with a uline char and the + // user is on a ulined server. + if (is_bypasschar_uline && member->server->IsULine()) + continue; + + // Allow if the prefix begins with a normal char and the + // user is not on a ulined server. + if (is_bypasschar && !member->server->IsULine()) + continue; + + exemptions.insert(member); + } + + return MOD_RES_PASSTHRU; + } + + ModResult HandleUser(User* source, User* target) + { + // Allow if the mode is not set. + if (!target->IsModeSet(privdeafmode)) + return MOD_RES_PASSTHRU; + + // Reject if the source is ulined and privdeafuline is disaled. + if (!privdeafuline && source->server->IsULine()) + return MOD_RES_DENY; + + // Reject if the source doesn't have the right priv. + if (!source->HasPrivPermission("users/ignore-privdeaf")) + return MOD_RES_DENY; + + return MOD_RES_ALLOW; + } + public: ModuleDeaf() - : deafmode(this) + : CTCTags::EventListener(this) + , deafmode(this) , privdeafmode(this) { } @@ -87,52 +141,48 @@ class ModuleDeaf : public Module privdeafuline = tag->getBool("privdeafuline", true); } + ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE + { + switch (target.type) + { + case MessageTarget::TYPE_CHANNEL: + return HandleChannel(user, target.Get(), details.exemptions, false, false); + + case MessageTarget::TYPE_USER: + return HandleUser(user, target.Get()); + + case MessageTarget::TYPE_SERVER: + break; + } + + return MOD_RES_PASSTHRU; + } + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { - if (target.type == MessageTarget::TYPE_CHANNEL) + switch (target.type) { - Channel* chan = target.Get(); - bool is_bypasschar = (deaf_bypasschars.find(details.text[0]) != std::string::npos); - bool is_bypasschar_uline = (deaf_bypasschars_uline.find(details.text[0]) != std::string::npos); - - // If we have no bypasschars_uline in config, and this is a bypasschar (regular) - // Then it is obviously going to get through +d, no exemption list required - if (deaf_bypasschars_uline.empty() && is_bypasschar) - return MOD_RES_PASSTHRU; - // If it matches both bypasschar and bypasschar_uline, it will get through. - if (is_bypasschar && is_bypasschar_uline) - return MOD_RES_PASSTHRU; - - const Channel::MemberMap& ulist = chan->GetUsers(); - for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i) + case MessageTarget::TYPE_CHANNEL: { - // not +d - if (!i->first->IsModeSet(deafmode)) - continue; - - bool is_a_uline = i->first->server->IsULine(); - // matched a U-line only bypass - if (is_bypasschar_uline && is_a_uline) - continue; - // matched a regular bypass - if (is_bypasschar && !is_a_uline) - continue; - - // don't deliver message! - details.exemptions.insert(i->first); + // If we have no bypasschars_uline in config, and this is a bypasschar (regular) + // Then it is obviously going to get through +d, no exemption list required + bool is_bypasschar = (deaf_bypasschars.find(details.text[0]) != std::string::npos); + if (deaf_bypasschars_uline.empty() && is_bypasschar) + return MOD_RES_PASSTHRU; + + // If it matches both bypasschar and bypasschar_uline, it will get through. + bool is_bypasschar_uline = (deaf_bypasschars_uline.find(details.text[0]) != std::string::npos); + if (is_bypasschar && is_bypasschar_uline) + return MOD_RES_PASSTHRU; + + return HandleChannel(user, target.Get(), details.exemptions, is_bypasschar, is_bypasschar_uline); } - } - else if (target.type == MessageTarget::TYPE_USER) - { - User* targ = target.Get(); - if (!targ->IsModeSet(privdeafmode)) - return MOD_RES_PASSTHRU; - if (!privdeafuline && user->server->IsULine()) - return MOD_RES_DENY; + case MessageTarget::TYPE_USER: + return HandleUser(user, target.Get()); - if (!user->HasPrivPermission("users/ignore-privdeaf")) - return MOD_RES_DENY; + case MessageTarget::TYPE_SERVER: + break; } return MOD_RES_PASSTHRU; @@ -140,7 +190,7 @@ class ModuleDeaf : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides usermodes +dD to block channel and/or user messages and notices", VF_VENDOR); + return Version("Adds user mode d (deaf) which prevents users from receiving channel messages.", VF_VENDOR); } };