Convert InspIRCd::SetSignals to a static function.

[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 b0ec3b8ff900d9642b723a5ab7dbe515ad7f6fec..d772b4c6800a0f94724caec7c07b5558ef7948a6 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
 {
@@ -52,7 +54,7 @@ class callerid_data
 
        callerid_data() : lastnotify(0) { }
 
-       std::string ToString(SerializeFormat format) const
+       std::string ToString(bool human) const
        {
                std::ostringstream oss;
                oss << lastnotify;
@@ -60,7 +62,7 @@ class callerid_data
                {
                        User* u = *i;
                        // Encode UIDs.
-                       oss << "," << (format == FORMAT_USER ? u->nick : u->uuid);
+                       oss << "," << (human ? u->nick : u->uuid);
                }
                return oss.str();
        }
@@ -73,32 +75,30 @@ struct CallerIDExtInfo : public ExtensionItem
        {
        }
 
-       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE
+       std::string ToHuman(const Extensible* container, void* item) const CXX11_OVERRIDE
        {
-               std::string ret;
-               if (format != FORMAT_NETWORK)
-               {
-                       callerid_data* dat = static_cast<callerid_data*>(item);
-                       ret = dat->ToString(format);
-               }
-               return ret;
+               callerid_data* dat = static_cast<callerid_data*>(item);
+               return dat->ToString(true);
        }
 
-       void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE
+       std::string ToInternal(const Extensible* container, void* item) const CXX11_OVERRIDE
        {
-               if (format == FORMAT_NETWORK)
-                       return;
+               callerid_data* dat = static_cast<callerid_data*>(item);
+               return dat->ToString(false);
+       }
 
+       void FromInternal(Extensible* container, const std::string& value) CXX11_OVERRIDE
+       {
                void* old = get_raw(container);
                if (old)
-                       this->free(old);
+                       this->free(NULL, old);
                callerid_data* dat = new callerid_data;
                set_raw(container, dat);
 
                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))
                {
@@ -125,7 +125,7 @@ struct CallerIDExtInfo : public ExtensionItem
                return dat;
        }
 
-       void free(void* item) CXX11_OVERRIDE
+       void free(Extensible* container, void* item) CXX11_OVERRIDE
        {
                callerid_data* dat = static_cast<callerid_data*>(item);
 
@@ -178,7 +178,7 @@ public:
                extInfo(Creator)
        {
                allow_empty_last_param = false;
-               syntax = "*|(+|-)<nick>[,(+|-)<nick> ...]";
+               syntax = "*|(+|-)<nick>[,(+|-)<nick>]+";
                TRANSLATE1(TR_CUSTOM);
        }
 
@@ -188,7 +188,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 +324,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,14 +381,16 @@ class ModuleCallerID : public Module
 
 public:
        ModuleCallerID()
-               : cmd(this)
+               : CTCTags::EventListener(this)
+               , cmd(this)
+               , api(this, cmd.extInfo)
                , myumode(this, "callerid", 'g')
        {
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR);
+               return Version("Implementation of callerid, provides user mode +g and the ACCEPT command", VF_COMMON | VF_VENDOR);
        }
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -374,7 +399,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 +408,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);
@@ -395,7 +420,7 @@ public:
                        if (now > (dat->lastnotify + (time_t)notify_cooldown))
                        {
                                user->WriteNumeric(RPL_TARGNOTIFY, dest->nick, "has been informed that you messaged them.");
-                               dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick, InspIRCd::Format("%s@%s", user->ident.c_str(), user->GetDisplayedHost().c_str()), InspIRCd::Format("is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
+                               dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick, InspIRCd::Format("%s@%s", user->ident.c_str(), user->GetDisplayedHost().c_str()), InspIRCd::Format("is messaging you, and you have user mode +g set. Use /ACCEPT +%s to allow.",
                                                user->nick.c_str()));
                                dat->lastnotify = now;
                        }
@@ -404,6 +429,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 +453,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);
        }