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 f2cf112bf6581b15f2b0200286da651f5821dc3e..d772b4c6800a0f94724caec7c07b5558ef7948a6 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -54,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;
@@ -62,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();
        }
@@ -75,22 +75,20 @@ 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(NULL, old);
@@ -392,7 +390,7 @@ public:
 
        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
@@ -422,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;
                        }