MetaData rework

[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 873ec7ed24cbac3abcf4930bf31e76d424e94aef..29ba7fd6022f2c113a1e7365519f35df5012115f 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -56,14 +56,14 @@ class callerid_data : public classbase
                }
        }
 
-       std::string ToString(bool displayable) const
+       std::string ToString(Module* proto) const
        {
                std::ostringstream oss;
                oss << lastnotify;
                for (std::set<User*>::const_iterator i = accepting.begin(); i != accepting.end(); ++i)
                {
                        // Encode UIDs.
-                       oss << "," << (displayable ? (*i)->nick : (*i)->uuid);
+                       oss << "," << proto->ProtoTranslate(*i);
                }
                oss << std::ends;
                return oss.str();
@@ -307,8 +307,8 @@ public:
 class ModuleCallerID : public Module
 {
 private:
-       CommandAccept *mycommand;
-       User_g* myumode;
+       CommandAccept mycommand;
+       User_g myumode;
 
        // Configuration variables:
        unsigned int maxaccepts; // Maximum ACCEPT entries.
@@ -342,28 +342,14 @@ private:
        }
 
 public:
-       ModuleCallerID(InspIRCd* Me) : Module(Me)
+       ModuleCallerID(InspIRCd* Me) : Module(Me), mycommand(Me, maxaccepts), myumode(Me)
        {
                OnRehash(NULL);
-               mycommand = new CommandAccept(ServerInstance, maxaccepts);
-               myumode = new User_g(ServerInstance);
 
-               if (!ServerInstance->Modes->AddMode(myumode))
-               {
-                       delete mycommand;
-                       delete myumode;
+               if (!ServerInstance->Modes->AddMode(&myumode))
                        throw ModuleException("Could not add usermode +g");
-               }
-               try
-               {
-                       ServerInstance->AddCommand(mycommand);
-               }
-               catch (const ModuleException& e)
-               {
-                       delete mycommand;
-                       delete myumode;
-                       throw ModuleException("Could not add command!");
-               }
+
+               ServerInstance->AddCommand(&mycommand);
 
                Implementation eventlist[] = { I_OnRehash, I_OnUserPreNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnCleanup };
                ServerInstance->Modules->Attach(eventlist, this, 7);
@@ -371,8 +357,7 @@ public:
 
        virtual ~ModuleCallerID()
        {
-               ServerInstance->Modes->DelMode(myumode);
-               delete myumode;
+               ServerInstance->Modes->DelMode(&myumode);
        }
 
        virtual Version GetVersion()
@@ -400,14 +385,18 @@ public:
                {
                        time_t now = ServerInstance->Time();
                        /* +g and *not* accepted */
-                       if (IS_LOCAL(user))
-                               user->WriteNumeric(716, "%s %s :is in +g mode (server-side ignore).", user->nick.c_str(), dest->nick.c_str());
-                       else
-                               ServerInstance->PI->PushToClient(user, std::string("::") + ServerInstance->Config->ServerName + " 716 " + user->nick + dest->nick + " :is in +g mode (server-side ignore).");
+                       user->WriteNumeric(716, "%s %s :is in +g mode (server-side ignore).", user->nick.c_str(), dest->nick.c_str());
                        if (now > (dat->lastnotify + (time_t)notify_cooldown))
                        {
                                user->WriteNumeric(717, "%s %s :has been informed that you messaged them.", user->nick.c_str(), dest->nick.c_str());
-                               dest->WriteNumeric(718, "%s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.", dest->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), user->nick.c_str());
+                               if (IS_LOCAL(dest))
+                               {
+                                       dest->WriteNumeric(718, "%s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.", dest->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), user->nick.c_str());
+                               }
+                               else
+                               {
+                                       ServerInstance->PI->PushToClient(dest, std::string("::") + ServerInstance->Config->ServerName + " 718 " + dest->nick + " " + user->nick + " " + user->ident + "@" + user->dhost + " :is messaging you,  and you have umode +g. Use /ACCEPT +" + user->nick + " to allow.");
+                               }
                                dat->lastnotify = now;
                        }
                        return 1;
@@ -441,24 +430,21 @@ public:
                RemoveData(u);
        }
 
-       virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string& extname, bool displayable)
+       virtual void OnSyncUser(User* user, Module* proto, void* opaque)
        {
-               if (extname == "callerid_data")
+               callerid_data* dat = GetData(user, false);
+               if (dat)
                {
-                       callerid_data* dat = GetData(user, false);
-                       if (dat)
-                       {
-                               std::string str = dat->ToString(displayable);
-                               proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, str);
-                       }
+                       std::string str = dat->ToString(proto);
+                       proto->ProtoSendMetaData(opaque, user, "callerid_data", str);
                }
        }
 
-       virtual void OnDecodeMetaData(int target_type, void* target, const std::string& extname, const std::string& extdata)
+       virtual void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata)
        {
-               if (target_type == TYPE_USER && extname == "callerid_data")
+               User* u = dynamic_cast<User*>(target);
+               if (u && extname == "callerid_data")
                {
-                       User* u = (User*)target;
                        callerid_data* dat = new callerid_data(extdata, ServerInstance);
                        u->Extend("callerid_data", dat);
                }