Include untranslated user/channel metadata in CHECK output

[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 7aebaa1b986bef896210c56ee26eeef6eb570129..30baccadf0db10aaa6b008af4386875d8cb6d145 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -99,25 +99,23 @@ class AChannel_M : public SimpleChannelModeHandler
 
 class ModuleServicesAccount : public Module
 {
-       AChannel_R* m1;
-       AChannel_M* m2;
-       AUser_R* m3;
-       Channel_r *m4;
-       User_r *m5;
+       AChannel_R m1;
+       AChannel_M m2;
+       AUser_R m3;
+       Channel_r m4;
+       User_r m5;
  public:
-       ModuleServicesAccount(InspIRCd* Me) : Module(Me)
+       ModuleServicesAccount(InspIRCd* Me) : Module(Me),
+               m1(Me), m2(Me), m3(Me), m4(Me), m5(Me)
        {
-               m1 = new AChannel_R(ServerInstance);
-               m2 = new AChannel_M(ServerInstance);
-               m3 = new AUser_R(ServerInstance);
-               m4 = new Channel_r(ServerInstance);
-               m5 = new User_r(ServerInstance);
 
-               if (!ServerInstance->Modes->AddMode(m1) || !ServerInstance->Modes->AddMode(m2) || !ServerInstance->Modes->AddMode(m3) || !ServerInstance->Modes->AddMode(m4) || !ServerInstance->Modes->AddMode(m5))
+               if (!ServerInstance->Modes->AddMode(&m1) || !ServerInstance->Modes->AddMode(&m2) ||
+                       !ServerInstance->Modes->AddMode(&m3) || !ServerInstance->Modes->AddMode(&m4) ||
+                       !ServerInstance->Modes->AddMode(&m5))
                        throw ModuleException("Some other module has claimed our modes!");
 
                Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan,
-                       I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick };
+                       I_OnSyncUser, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick };
 
                ServerInstance->Modules->Attach(eventlist, this, 10);
        }
@@ -256,23 +254,19 @@ class ModuleServicesAccount : public Module
        // this method is called. We should use the ProtoSendMetaData function after we've
        // corrected decided how the data should look, to send the metadata on its way if
        // it is ours.
-       virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+       virtual void OnSyncUser(User* user, Module* proto, void* opaque)
        {
-               // check if the linking module wants to know about OUR metadata
-               if (extname == "accountname")
+               // check if this user has an swhois field to send
+               std::string* account;
+               user->GetExt("accountname", account);
+               if (account)
                {
-                       // check if this user has an swhois field to send
-                       std::string* account;
-                       user->GetExt("accountname", account);
-                       if (account)
-                       {
-                               // remove any accidental leading/trailing spaces
-                               trim(*account);
+                       // remove any accidental leading/trailing spaces
+                       trim(*account);
 
-                               // call this function in the linking module, let it format the data how it
-                               // sees fit, and send it on its way. We dont need or want to know how.
-                               proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*account);
-                       }
+                       // call this function in the linking module, let it format the data how it
+                       // sees fit, and send it on its way. We dont need or want to know how.
+                       proto->ProtoSendMetaData(opaque,user,"accountname",*account);
                }
        }
 
@@ -311,13 +305,12 @@ class ModuleServicesAccount : public Module
        // In our case we're only sending a single string around, so we just construct a std::string.
        // Some modules will probably get much more complex and format more detailed structs and classes
        // in a textual way for sending over the link.
-       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)
        {
+               User* dest = dynamic_cast<User*>(target);
                // check if its our metadata key, and its associated with a user
-               if ((target_type == TYPE_USER) && (extname == "accountname"))
+               if (dest && (extname == "accountname"))
                {
-                       User* dest = (User*)target;
-
                        std::string* account;
                        if (dest->GetExt("accountname", account)) {
                                // remove old account so that we can set new (or leave unset)
@@ -347,16 +340,11 @@ class ModuleServicesAccount : public Module
 
        virtual ~ModuleServicesAccount()
        {
-               ServerInstance->Modes->DelMode(m1);
-               ServerInstance->Modes->DelMode(m2);
-               ServerInstance->Modes->DelMode(m3);
-               ServerInstance->Modes->DelMode(m4);
-               ServerInstance->Modes->DelMode(m5);
-               delete m1;
-               delete m2;
-               delete m3;
-               delete m4;
-               delete m5;
+               ServerInstance->Modes->DelMode(&m1);
+               ServerInstance->Modes->DelMode(&m2);
+               ServerInstance->Modes->DelMode(&m3);
+               ServerInstance->Modes->DelMode(&m4);
+               ServerInstance->Modes->DelMode(&m5);
        }
 
        virtual Version GetVersion()