Fall back to the most recent version supported on "CAP LS".

[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 05cc2b4167ce3b67cddcb2bd292fb3127f7021ea..4a06d8aeb205a9f6f41262190e103ca4898ec3fb 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -24,7 +24,10 @@
 
 #include "inspircd.h"
 #include "modules/account.h"
+#include "modules/callerid.h"
+#include "modules/ctctags.h"
 #include "modules/exemption.h"
+#include "modules/whois.h"
 
 enum
 {
@@ -63,7 +66,7 @@ class Channel_r : public ModeHandler
                }
                else
                {
-                       source->WriteNumeric(500, "Only a server may modify the +r channel mode");
+                       source->WriteNumeric(ERR_NOPRIVILEGES, "Only a server may modify the +r channel mode");
                }
                return MODEACTION_DENY;
        }
@@ -89,7 +92,7 @@ class User_r : public ModeHandler
                }
                else
                {
-                       source->WriteNumeric(500, "Only a server may modify the +r user mode");
+                       source->WriteNumeric(ERR_NOPRIVILEGES, "Only a server may modify the +r user mode");
                }
                return MODEACTION_DENY;
        }
@@ -134,8 +137,13 @@ class AccountExtItemImpl : public AccountExtItem
        }
 };
 
-class ModuleServicesAccount : public Module, public Whois::EventListener
+class ModuleServicesAccount
+       : public Module
+       , public Whois::EventListener
+       , public CTCTags::EventListener
 {
+ private:
+       CallerID::API calleridapi;
        CheckExemption::EventProvider exemptionprov;
        SimpleChannelModeHandler m1;
        SimpleChannelModeHandler m2;
@@ -144,9 +152,12 @@ class ModuleServicesAccount : public Module, public Whois::EventListener
        User_r m5;
        AccountExtItemImpl accountname;
        bool checking_ban;
+
  public:
        ModuleServicesAccount()
                : Whois::EventListener(this)
+               , CTCTags::EventListener(this)
+               , calleridapi(this)
                , exemptionprov(this)
                , m1(this, "reginvite", 'R')
                , m2(this, "regmoderated", 'M')
@@ -188,7 +199,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 HandleMessage(User* user, const MessageTarget& target)
        {
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
@@ -196,32 +207,46 @@ 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 = CheckExemption::Call(exemptionprov, user, c, "regmoderated");
+                       Channel* targchan = target.Get<Channel>();
 
-                       if (c->IsModeSet(m2) && !is_registered && res != MOD_RES_ALLOW)
-                       {
-                               // user messaging a +M channel and is not registered
-                               user->WriteNumeric(ERR_NEEDREGGEDNICK, c->name, "You need to be identified to a registered account to message this channel");
-                               return MOD_RES_DENY;
-                       }
+                       if (!targchan->IsModeSet(m2) || is_registered)
+                               return MOD_RES_PASSTHRU;
+
+                       if (CheckExemption::Call(exemptionprov, user, targchan, "regmoderated") == MOD_RES_ALLOW)
+                               return MOD_RES_PASSTHRU;
+
+                       // User is messaging a +M channel and is not registered or exempt.
+                       user->WriteNumeric(ERR_NEEDREGGEDNICK, targchan->name, "You need to be identified to a registered account to message this channel");
+                       return MOD_RES_DENY;
                }
-               else if (target_type == TYPE_USER)
+               else if (target.type == MessageTarget::TYPE_USER)
                {
-                       User* u = (User*)dest;
+                       User* targuser = target.Get<User>();
+                       if (!targuser->IsModeSet(m3)  || is_registered)
+                               return MOD_RES_PASSTHRU;
 
-                       if (u->IsModeSet(m3) && !is_registered)
-                       {
-                               // user messaging a +R user and is not registered
-                               user->WriteNumeric(ERR_NEEDREGGEDNICK, u->nick, "You need to be identified to a registered account to message this user");
-                               return MOD_RES_DENY;
-                       }
+                       if (calleridapi && calleridapi->IsOnAcceptList(user, targuser))
+                               return MOD_RES_PASSTHRU;
+
+                       // User is messaging a +R user and is not registered or on an accept list.
+                       user->WriteNumeric(ERR_NEEDREGGEDNICK, targuser->nick, "You need to be identified to a registered account to message this user");
+                       return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
        }
 
+       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+       {
+               return HandleMessage(user, target);
+       }
+
+       ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+       {
+               return HandleMessage(user, target);
+       }
+
        ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE
        {
                if (checking_ban)