-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ * Copyright (C) 2013, 2017, 2021 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-/* $ModDesc: Provides support for ircu style usermode +d (deaf to channel messages and channel notices) */
+#include "inspircd.h"
+#include "modules/ctctags.h"
-/** User mode +d - filter out channel messages and channel notices
- */
-class User_d : public ModeHandler
+// User mode +d - filter out channel messages and channel notices
+class DeafMode : public ModeHandler
{
public:
- User_d(InspIRCd* Instance) : ModeHandler(Instance, 'd', 0, 0, false, MODETYPE_USER, false) { }
+ DeafMode(Module* Creator) : ModeHandler(Creator, "deaf", 'd', PARAM_NONE, MODETYPE_USER) { }
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
{
+ if (adding == dest->IsModeSet(this))
+ return MODEACTION_DENY;
+
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.c_str(), dest->nick.c_str());
- dest->SetMode('d',true);
- return MODEACTION_ALLOW;
- }
- }
- else
- {
- if (dest->IsModeSet('d'))
- {
- dest->SetMode('d',false);
- return MODEACTION_ALLOW;
- }
- }
- return MODEACTION_DENY;
+ 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;
}
};
-class ModuleDeaf : public Module
+// User mode +D - filter out user messages and user notices
+class PrivDeafMode : public ModeHandler
{
- User_d m1;
-
- std::string deaf_bypasschars;
- std::string deaf_bypasschars_uline;
-
public:
- ModuleDeaf(InspIRCd* Me)
- : Module(Me), m1(Me)
+ PrivDeafMode(Module* Creator) : ModeHandler(Creator, "privdeaf", 'D', PARAM_NONE, MODETYPE_USER)
{
- 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);
+ if (!ServerInstance->Config->ConfValue("deaf")->getBool("enableprivdeaf"))
+ DisableAutoRegister();
}
-
- virtual void OnRehash(User* user)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
{
- ConfigReader* conf = new ConfigReader(ServerInstance);
- deaf_bypasschars = conf->ReadValue("deaf", "bypasschars", 0);
- deaf_bypasschars_uline = conf->ReadValue("deaf", "bypasscharsuline", 0);
+ if (adding == dest->IsModeSet(this))
+ return MODEACTION_DENY;
- delete conf;
+ if (adding)
+ 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
+ , public CTCTags::EventListener
+{
+ private:
+ DeafMode deafmode;
+ PrivDeafMode privdeafmode;
+ std::string deaf_bypasschars;
+ std::string deaf_bypasschars_uline;
+ bool privdeafuline;
- virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+ ModResult HandleChannel(User* source, Channel* target, CUList& exemptions, bool is_bypasschar, bool is_bypasschar_uline)
{
- if (target_type == TYPE_CHANNEL)
+ const Channel::MemberMap& ulist = target->GetUsers();
+ for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
{
- Channel* chan = (Channel*)dest;
- if (chan)
- this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list);
+ 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 0;
+ return MOD_RES_PASSTHRU;
}
- virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+ ModResult HandleUser(User* source, User* target)
{
- if (target_type == TYPE_CHANNEL)
- {
- Channel* chan = (Channel*)dest;
- if (chan)
- this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list);
- }
+ // 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 0;
+ return MOD_RES_ALLOW;
}
- virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
+ public:
+ ModuleDeaf()
+ : CTCTags::EventListener(this)
+ , deafmode(this)
+ , privdeafmode(this)
{
- BuildDeafList(message_type, chan, sender, status, text, exempt_list);
}
- virtual void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list)
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
- CUList *ulist = chan->GetUsers();
- bool is_a_uline;
- bool is_bypasschar, is_bypasschar_avail;
- bool is_bypasschar_uline, is_bypasschar_uline_avail;
+ ConfigTag* tag = ServerInstance->Config->ConfValue("deaf");
+ deaf_bypasschars = tag->getString("bypasschars");
+ deaf_bypasschars_uline = tag->getString("bypasscharsuline");
+ privdeafuline = tag->getBool("privdeafuline", true);
+ }
- 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())
+ ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+ {
+ switch (target.type)
{
- is_bypasschar_uline_avail = 1;
- if (deaf_bypasschars_uline.find(text[0], 0) != std::string::npos)
- is_bypasschar_uline = 1;
+ case MessageTarget::TYPE_CHANNEL:
+ return HandleChannel(user, target.Get<Channel>(), details.exemptions, false, false);
+
+ case MessageTarget::TYPE_USER:
+ return HandleUser(user, target.Get<User>());
+
+ case MessageTarget::TYPE_SERVER:
+ break;
}
- /*
- * 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;
+ return MOD_RES_PASSTHRU;
+ }
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+ {
+ switch (target.type)
{
- /* 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;
+ case MessageTarget::TYPE_CHANNEL:
+ {
+ // 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<Channel>(), details.exemptions, is_bypasschar, is_bypasschar_uline);
+ }
+
+ case MessageTarget::TYPE_USER:
+ return HandleUser(user, target.Get<User>());
- /* don't deliver message! */
- exempt_list[i->first] = i->first->nick;
+ case MessageTarget::TYPE_SERVER:
+ break;
}
- }
- virtual ~ModuleDeaf()
- {
- ServerInstance->Modes->DelMode(&m1);
+ return MOD_RES_PASSTHRU;
}
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("Adds user mode d (deaf) which prevents users from receiving channel messages.", VF_VENDOR);
}
-
};
MODULE_INIT(ModuleDeaf)
projects / user / henk / code / inspircd.git / blobdiff