Merge insp20

[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 5dea7ffaed2de601db06543c09bd2385cdbddd38..f758754b475b311e106b317691659b39f08fb6b7 100644 (file)
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -35,16 +35,13 @@ CmdResult CommandMetadata::Handle(User* srcuser, std::vector<std::string>& param
                // Channel METADATA has an additional parameter: the channel TS
                // :22D METADATA #channel 12345 extname :extdata
                if (params.size() < 3)
-                       return CMD_INVALID;
+                       throw ProtocolException("Insufficient parameters for channel METADATA");
 
                Channel* c = ServerInstance->FindChan(params[0]);
                if (!c)
                        return CMD_FAILURE;
 
-               time_t ChanTS = ConvToInt(params[1]);
-               if (!ChanTS)
-                       return CMD_INVALID;
-
+               time_t ChanTS = ServerCommand::ExtractTS(params[1]);
                if (c->age < ChanTS)
                        // Their TS is newer than ours, discard this command and do not propagate
                        return CMD_FAILURE;
@@ -52,7 +49,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, std::vector<std::string>& param
                std::string value = params.size() < 4 ? "" : params[3];
 
                ExtensionItem* item = ServerInstance->Extensions.GetItem(params[2]);
-               if (item)
+               if ((item) && (item->type == ExtensionItem::EXT_CHANNEL))
                        item->unserialize(FORMAT_NETWORK, c, value);
                FOREACH_MOD(OnDecodeMetaData, (c,params[2],value));
        }
@@ -64,7 +61,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, std::vector<std::string>& param
                        ExtensionItem* item = ServerInstance->Extensions.GetItem(params[1]);
                        std::string value = params.size() < 3 ? "" : params[2];
 
-                       if (item)
+                       if ((item) && (item->type == ExtensionItem::EXT_USER))
                                item->unserialize(FORMAT_NETWORK, u, value);
                        FOREACH_MOD(OnDecodeMetaData, (u,params[1],value));
                }