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

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index ac5730374b3aa30c9d51ca1a724cfcac477394c4..c3f7155a6ff239e3e632676cee1ccd349b31060f 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -25,9 +25,16 @@
 #include "inspircd.h"
 #include "modules/account.h"
 #include "modules/exemption.h"
+#include "modules/whois.h"
 
 enum
 {
+       // From UnrealIRCd.
+       RPL_WHOISREGNICK = 307,
+
+       // From ircu.
+       RPL_WHOISACCOUNT = 330,
+
        // From ircd-hybrid?
        ERR_NEEDREGGEDNICK = 477,
 
@@ -43,7 +50,7 @@ class Channel_r : public ModeHandler
  public:
        Channel_r(Module* Creator) : ModeHandler(Creator, "c_registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
        {
                // only a u-lined server may add or remove the +r mode.
                if (!IS_LOCAL(source))
@@ -71,7 +78,7 @@ class User_r : public ModeHandler
  public:
        User_r(Module* Creator) : ModeHandler(Creator, "u_registered", 'r', PARAM_NONE, MODETYPE_USER) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
        {
                if (!IS_LOCAL(source))
                {
@@ -89,30 +96,6 @@ class User_r : public ModeHandler
        }
 };
 
-/** Channel mode +R - unidentified users cannot join
- */
-class AChannel_R : public SimpleChannelModeHandler
-{
- public:
-       AChannel_R(Module* Creator) : SimpleChannelModeHandler(Creator, "reginvite", 'R') { }
-};
-
-/** User mode +R - unidentified users cannot message
- */
-class AUser_R : public SimpleUserModeHandler
-{
- public:
-       AUser_R(Module* Creator) : SimpleUserModeHandler(Creator, "regdeaf", 'R') { }
-};
-
-/** Channel mode +M - unidentified users cannot message channel
- */
-class AChannel_M : public SimpleChannelModeHandler
-{
- public:
-       AChannel_M(Module* Creator) : SimpleChannelModeHandler(Creator, "regmoderated", 'M') { }
-};
-
 class AccountExtItemImpl : public AccountExtItem
 {
        Events::ModuleEventProvider eventprov;
@@ -124,7 +107,7 @@ class AccountExtItemImpl : public AccountExtItem
        {
        }
 
-       void unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+       void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE
        {
                User* user = static_cast<User*>(container);
 
@@ -155,9 +138,9 @@ class AccountExtItemImpl : public AccountExtItem
 class ModuleServicesAccount : public Module, public Whois::EventListener
 {
        CheckExemption::EventProvider exemptionprov;
-       AChannel_R m1;
-       AChannel_M m2;
-       AUser_R m3;
+       SimpleChannelModeHandler m1;
+       SimpleChannelModeHandler m2;
+       SimpleUserModeHandler m3;
        Channel_r m4;
        User_r m5;
        AccountExtItemImpl accountname;
@@ -166,7 +149,11 @@ class ModuleServicesAccount : public Module, public Whois::EventListener
        ModuleServicesAccount()
                : Whois::EventListener(this)
                , exemptionprov(this)
-               , m1(this), m2(this), m3(this), m4(this), m5(this)
+               , m1(this, "reginvite", 'R')
+               , m2(this, "regmoderated", 'M')
+               , m3(this, "regdeaf", 'R')
+               , m4(this)
+               , m5(this)
                , accountname(this)
                , checking_ban(false)
        {
@@ -185,13 +172,13 @@ class ModuleServicesAccount : public Module, public Whois::EventListener
 
                if (account)
                {
-                       whois.SendLine(330, *account, "is logged in as");
+                       whois.SendLine(RPL_WHOISACCOUNT, *account, "is logged in as");
                }
 
                if (whois.GetTarget()->IsModeSet(m5))
                {
                        /* user is registered */
-                       whois.SendLine(307, "is a registered nick");
+                       whois.SendLine(RPL_WHOISREGNICK, "is a registered nick");
                }
        }
 
@@ -202,7 +189,7 @@ class ModuleServicesAccount : public Module, public Whois::EventListener
                        m5.RemoveMode(user);
        }
 
-       ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
        {
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
@@ -210,11 +197,10 @@ class ModuleServicesAccount : public Module, public Whois::EventListener
                std::string *account = accountname.get(user);
                bool is_registered = account && !account->empty();
 
-               if (target_type == TYPE_CHANNEL)
+               if (target.type == MessageTarget::TYPE_CHANNEL)
                {
-                       Channel* c = (Channel*)dest;
-                       ModResult res;
-                       FIRST_MOD_RESULT_CUSTOM(exemptionprov, CheckExemption::EventListener, OnCheckExemption, res, (user, c, "regmoderated"));
+                       Channel* c = target.Get<Channel>();
+                       ModResult res = CheckExemption::Call(exemptionprov, user, c, "regmoderated");
 
                        if (c->IsModeSet(m2) && !is_registered && res != MOD_RES_ALLOW)
                        {
@@ -223,9 +209,9 @@ class ModuleServicesAccount : public Module, public Whois::EventListener
                                return MOD_RES_DENY;
                        }
                }
-               else if (target_type == TYPE_USER)
+               else if (target.type == MessageTarget::TYPE_USER)
                {
-                       User* u = (User*)dest;
+                       User* u = target.Get<User>();
 
                        if (u->IsModeSet(m3) && !is_registered)
                        {