Use CommandBase::Params instead of std::vector<std::string>.

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

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 875e7fb75652641ac6364f9b5134692edb4b1e9b..b1aeeb9d44678905a9d961ba592302adf238497c 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -20,28 +20,21 @@
 
 
 #include "inspircd.h"
-
-/* $ModDesc: Disallows /LIST for recently connected clients to hinder spam bots */
+#include "modules/account.h"
 
 class ModuleSecureList : public Module
 {
        std::vector<std::string> allowlist;
-       time_t WaitTime;
+       bool exemptregistered;
+       unsigned int WaitTime;
 
  public:
-       void init() CXX11_OVERRIDE
-       {
-               OnRehash(NULL);
-               Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                allowlist.clear();
 
@@ -49,7 +42,9 @@ class ModuleSecureList : public Module
                for (ConfigIter i = tags.first; i != tags.second; ++i)
                        allowlist.push_back(i->second->getString("exception"));
 
-               WaitTime = ServerInstance->Config->ConfValue("securelist")->getInt("waittime", 60);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("securelist");
+               exemptregistered = tag->getBool("exemptregistered");
+               WaitTime = tag->getDuration("waittime", 60, 1);
        }
 
 
@@ -57,7 +52,7 @@ class ModuleSecureList : public Module
         * OnPreCommand()
         *   Intercept the LIST command.
         */
-       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated, const std::string& original_line) CXX11_OVERRIDE
        {
                /* If the command doesnt appear to be valid, we dont want to mess with it. */
                if (!validated)
@@ -70,13 +65,17 @@ class ModuleSecureList : public Module
                                if (InspIRCd::Match(user->MakeHost(), *x, ascii_case_insensitive_map))
                                        return MOD_RES_PASSTHRU;
 
+                       const AccountExtItem* ext = GetAccountExtItem();
+                       if (exemptregistered && ext && ext->get(user))
+                               return MOD_RES_PASSTHRU;
+
                        /* Not exempt, BOOK EM DANNO! */
                        user->WriteNotice("*** You cannot list within the first " + ConvToStr(WaitTime) + " seconds of connecting. Please try again later.");
-                       /* Some crap clients (read: mIRC, various java chat applets) muck up if they don't
+                       /* Some clients (e.g. mIRC, various java chat applets) muck up if they don't
                         * receive these numerics whenever they send LIST, so give them an empty LIST to mull over.
                         */
-                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
-                       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
+                       user->WriteNumeric(RPL_LISTSTART, "Channel", "Users Name");
+                       user->WriteNumeric(RPL_LISTEND, "End of channel list.");
                        return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;