Add a config option for exempting classes from connflood.

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

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index e6f335a0ad194a7e97d7409a3e047182e1173bef..4bd230a7c649c1278717696dcb84feb4efc6d7df 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -124,12 +124,24 @@ class HistoryMode : public ParamMode<HistoryMode, SimpleExtItem<HistoryList> >
        }
 };
 
+class NoHistoryMode : public SimpleUserModeHandler
+{
+public:
+       NoHistoryMode(Module* Creator)
+               : SimpleUserModeHandler(Creator, "nohistory", 'N')
+       {
+               if (!ServerInstance->Config->ConfValue("chanhistory")->getBool("enableumode"))
+                       DisableAutoRegister();
+       }
+};
+
 class ModuleChanHistory
        : public Module
        , public ServerProtocol::BroadcastEventListener
 {
  private:
-       HistoryMode m;
+       HistoryMode historymode;
+       NoHistoryMode nohistorymode;
        bool prefixmsg;
        UserModeReference botmode;
        bool dobots;
@@ -183,7 +195,8 @@ class ModuleChanHistory
  public:
        ModuleChanHistory()
                : ServerProtocol::BroadcastEventListener(this)
-               , m(this)
+               , historymode(this)
+               , nohistorymode(this)
                , botmode(this, "bot")
                , batchcap(this)
                , batchmanager(this)
@@ -196,22 +209,23 @@ class ModuleChanHistory
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory");
-               m.maxlines = tag->getUInt("maxlines", 50, 1);
+               historymode.maxlines = tag->getUInt("maxlines", 50, 1);
                prefixmsg = tag->getBool("prefixmsg", tag->getBool("notice", true));
                dobots = tag->getBool("bots", true);
        }
 
        ModResult OnBroadcastMessage(Channel* channel, const Server* server) CXX11_OVERRIDE
        {
-               return channel->IsModeSet(m) ? MOD_RES_ALLOW : MOD_RES_PASSTHRU;
+               return channel->IsModeSet(historymode) ? MOD_RES_ALLOW : MOD_RES_PASSTHRU;
        }
 
        void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE
        {
-               if ((target.type == MessageTarget::TYPE_CHANNEL) && (target.status == 0) && !details.IsCTCP())
+               std::string ctcpname;
+               if ((target.type == MessageTarget::TYPE_CHANNEL) && (target.status == 0) && (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION")))
                {
                        Channel* c = target.Get<Channel>();
-                       HistoryList* list = m.ext.get(c);
+                       HistoryList* list = historymode.ext.get(c);
                        if (list)
                        {
                                list->lines.push_back(HistoryItem(user, details));
@@ -230,7 +244,10 @@ class ModuleChanHistory
                if (memb->user->IsModeSet(botmode) && !dobots)
                        return;
 
-               HistoryList* list = m.ext.get(memb->chan);
+               if (memb->user->IsModeSet(nohistorymode))
+                       return;
+
+               HistoryList* list = historymode.ext.get(memb->chan);
                if (!list)
                        return;
 
@@ -251,7 +268,7 @@ class ModuleChanHistory
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides channel mode +H, allows for the channel message history to be replayed on join", VF_VENDOR);
+               return Version("Adds channel mode H (history) which allows message history to be viewed on joining the channel.", VF_VENDOR);
        }
 };