Some more text fixes and improvements (#1618).

[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 767af29017b7dde4751342f3918a479e3fac4564..acfcb1801260b7a6b145a59393ea2b1524bfcff6 100644 (file)
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -19,54 +19,67 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
 
-/* $ModDesc: Implements extban +b m: - mute bans */
-
-class ModuleQuietBan : public Module
+class ModuleQuietBan
+       : public Module
+       , public CTCTags::EventListener
 {
  private:
+       bool notifyuser;
+
  public:
-       void init()
+       ModuleQuietBan()
+               : CTCTags::EventListener(this)
        {
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual ~ModuleQuietBan()
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
+               ConfigTag* tag = ServerInstance->Config->ConfValue("muteban");
+               notifyuser = tag->getBool("notifyuser", true);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Implements extban +b m: - mute bans",VF_OPTCOMMON|VF_VENDOR);
+               return Version("Provides extban 'm', mute bans", VF_OPTCOMMON|VF_VENDOR);
        }
 
-       virtual ModResult OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+       ModResult HandleMessage(User* user, const MessageTarget& target, bool& echo_original)
        {
-               if (!IS_LOCAL(user) || target_type != TYPE_CHANNEL)
+               if (!IS_LOCAL(user) || target.type != MessageTarget::TYPE_CHANNEL)
                        return MOD_RES_PASSTHRU;
 
-               Channel* chan = static_cast<Channel*>(dest);
+               Channel* chan = target.Get<Channel>();
                if (chan->GetExtBanStatus(user, 'm') == MOD_RES_DENY && chan->GetPrefixValue(user) < VOICE_VALUE)
                {
-                       user->WriteNumeric(404, "%s %s :Cannot send to channel (you're muted)", user->nick.c_str(), chan->name.c_str());
+                       if (!notifyuser)
+                       {
+                               echo_original = true;
+                               return MOD_RES_DENY;
+                       }
+
+                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (you're muted)");
                        return MOD_RES_DENY;
                }
 
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
-               return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
+               return HandleMessage(user, target, details.echo_original);
        }
 
-       virtual void On005Numeric(std::string &output)
+       ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
        {
-               ServerInstance->AddExtBanChar('m');
+               return HandleMessage(user, target, details.echo_original);
        }
-};
 
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
+       {
+               tokens["EXTBAN"].push_back('m');
+       }
+};
 
 MODULE_INIT(ModuleQuietBan)
-