Fix the cloaking module on C++98 compilers.

[user/henk/code/inspircd.git] / src / modules / m_muteban.cpp

diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index 7698835b17f5a7c8ccf628b01b673842b07dc9e7..13150b0d0fe8936e0d64fc4dfc704b4e07531721 100644 (file)
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -1,7 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2017, 2019-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2018-2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -19,16 +23,33 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
 
-class ModuleQuietBan : public Module
+class ModuleQuietBan
+       : public Module
+       , public CTCTags::EventListener
 {
+ private:
+       bool notifyuser;
+
  public:
+       ModuleQuietBan()
+               : CTCTags::EventListener(this)
+       {
+       }
+
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               ConfigTag* tag = ServerInstance->Config->ConfValue("muteban");
+               notifyuser = tag->getBool("notifyuser", true);
+       }
+
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Implements extban +b m: - mute bans",VF_OPTCOMMON|VF_VENDOR);
+               return Version("Adds extended ban m which bans specific masks from speaking in a channel.", VF_OPTCOMMON|VF_VENDOR);
        }
 
-       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+       ModResult HandleMessage(User* user, const MessageTarget& target, bool& echo_original)
        {
                if (!IS_LOCAL(user) || target.type != MessageTarget::TYPE_CHANNEL)
                        return MOD_RES_PASSTHRU;
@@ -36,20 +57,29 @@ class ModuleQuietBan : public Module
                Channel* chan = target.Get<Channel>();
                if (chan->GetExtBanStatus(user, 'm') == MOD_RES_DENY && chan->GetPrefixValue(user) < VOICE_VALUE)
                {
-                       bool notifyuser = ServerInstance->Config->ConfValue("muteban")->getBool("notifyuser", true);
                        if (!notifyuser)
                        {
-                               details.echo_original = true;
+                               echo_original = true;
                                return MOD_RES_DENY;
                        }
 
-                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (you're muted)");
+                       user->WriteNumeric(Numerics::CannotSendTo(chan, "messages", 'm', "mute"));
                        return MOD_RES_DENY;
                }
 
                return MOD_RES_PASSTHRU;
        }
 
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+       {
+               return HandleMessage(user, target, details.echo_original);
+       }
+
+       ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+       {
+               return HandleMessage(user, target, details.echo_original);
+       }
+
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
                tokens["EXTBAN"].push_back('m');