Merge remote/local MODULES output

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

diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index eece14b0c08cd98a4a102396b31757f77eb5744e..ee26f0c73109f73315c4387b2d807df24570398a 100644 (file)
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -28,26 +28,31 @@ bool TreeSocket::MetaData(const std::string &prefix, parameterlist &params)
        else if (params.size() < 3)
                params.push_back("");
        TreeServer* ServerSource = Utils->FindServer(prefix);
+       ExtensionItem* item = Extensible::GetItem(params[1]);
        if (ServerSource)
        {
                if (params[0] == "*")
                {
-                       FOREACH_MOD_I(this->ServerInstance,I_OnDecodeMetaData,OnDecodeMetaData(TYPE_OTHER,NULL,params[1],params[2]));
+                       FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(NULL,params[1],params[2]));
                }
                else if (*(params[0].c_str()) == '#')
                {
-                       Channel* c = this->ServerInstance->FindChan(params[0]);
+                       Channel* c = ServerInstance->FindChan(params[0]);
                        if (c)
                        {
-                               FOREACH_MOD_I(this->ServerInstance,I_OnDecodeMetaData,OnDecodeMetaData(TYPE_CHANNEL,c,params[1],params[2]));
+                               if (item)
+                                       item->unserialize(FORMAT_NETWORK, c, params[2]);
+                               FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(c,params[1],params[2]));
                        }
                }
                else if (*(params[0].c_str()) != '#')
                {
-                       User* u = this->ServerInstance->FindNick(params[0]);
+                       User* u = ServerInstance->FindNick(params[0]);
                        if (u)
                        {
-                               FOREACH_MOD_I(this->ServerInstance,I_OnDecodeMetaData,OnDecodeMetaData(TYPE_USER,u,params[1],params[2]));
+                               if (item)
+                                       item->unserialize(FORMAT_NETWORK, u, params[2]);
+                               FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(u,params[1],params[2]));
                        }
                }
        }