Fix broken linking over IPv4 on IPv6 capable systems.

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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index f50bdeedff3ca2b5e6e970d46a86de21d9f755e7..f2cf112bf6581b15f2b0200286da651f5821dc3e 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -21,6 +21,8 @@
 
 
 #include "inspircd.h"
+#include "modules/callerid.h"
+#include "modules/ctctags.h"
 
 enum
 {
@@ -98,7 +100,7 @@ struct CallerIDExtInfo : public ExtensionItem
                irc::commasepstream s(value);
                std::string tok;
                if (s.GetToken(tok))
-                       dat->lastnotify = ConvToInt(tok);
+                       dat->lastnotify = ConvToNum<time_t>(tok);
 
                while (s.GetToken(tok))
                {
@@ -178,7 +180,7 @@ public:
                extInfo(Creator)
        {
                allow_empty_last_param = false;
-               syntax = "*|(+|-)<nick>[,(+|-)<nick> ...]";
+               syntax = "*|(+|-)<nick>[,(+|-)<nick>]+";
                TRANSLATE1(TR_CUSTOM);
        }
 
@@ -188,7 +190,7 @@ public:
                if (parameter.find(',') != std::string::npos)
                        return;
 
-               // Convert a [+|-]<nick> into a [-]<uuid>
+               // Convert a (+|-)<nick> into a [-]<uuid>
                ACCEPTAction action = GetTargetAndAction(parameter);
                if (!action.first)
                        return;
@@ -324,9 +326,32 @@ public:
        }
 };
 
-class ModuleCallerID : public Module
+class CallerIDAPIImpl : public CallerID::APIBase
+{
+ private:
+       CallerIDExtInfo& ext;
+
+ public:
+       CallerIDAPIImpl(Module* Creator, CallerIDExtInfo& Ext)
+               : CallerID::APIBase(Creator)
+               , ext(Ext)
+       {
+       }
+
+       bool IsOnAcceptList(User* source, User* target) CXX11_OVERRIDE
+       {
+               callerid_data* dat = ext.get(target, true);
+               return dat->accepting.count(source);
+       }
+};
+
+
+class ModuleCallerID
+       : public Module
+       , public CTCTags::EventListener
 {
        CommandAccept cmd;
+       CallerIDAPIImpl api;
        SimpleUserModeHandler myumode;
 
        // Configuration variables:
@@ -358,7 +383,9 @@ class ModuleCallerID : public Module
 
 public:
        ModuleCallerID()
-               : cmd(this)
+               : CTCTags::EventListener(this)
+               , cmd(this)
+               , api(this, cmd.extInfo)
                , myumode(this, "callerid", 'g')
        {
        }
@@ -374,7 +401,7 @@ public:
                tokens["CALLERID"] = ConvToStr(myumode.GetModeChar());
        }
 
-       ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+       ModResult HandleMessage(User* user, const MessageTarget& target)
        {
                if (!IS_LOCAL(user) || target.type != MessageTarget::TYPE_USER)
                        return MOD_RES_PASSTHRU;
@@ -383,7 +410,7 @@ public:
                if (!dest->IsModeSet(myumode) || (user == dest))
                        return MOD_RES_PASSTHRU;
 
-               if (user->HasPrivPermission("users/callerid-override"))
+               if (user->HasPrivPermission("users/ignore-callerid"))
                        return MOD_RES_PASSTHRU;
 
                callerid_data* dat = cmd.extInfo.get(dest, true);
@@ -404,6 +431,16 @@ public:
                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);
+       }
+
        void OnUserPostNick(User* user, const std::string& oldnick) CXX11_OVERRIDE
        {
                if (!tracknick)
@@ -418,7 +455,7 @@ public:
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("callerid");
-               cmd.maxaccepts = tag->getUInt("maxaccepts", 16);
+               cmd.maxaccepts = tag->getUInt("maxaccepts", 30);
                tracknick = tag->getBool("tracknick");
                notify_cooldown = tag->getDuration("cooldown", 60);
        }