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 9709ca54cb1752ae7cac9ef246d4a03890c019a7..f758754b475b311e106b317691659b39f08fb6b7 100644 (file)
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -21,12 +21,12 @@
 #include "inspircd.h"
 #include "commands.h"
 
-CmdResult CommandMetadata::Handle(const std::vector<std::string>& params, User *srcuser)
+CmdResult CommandMetadata::Handle(User* srcuser, std::vector<std::string>& params)
 {
        if (params[0] == "*")
        {
                std::string value = params.size() < 3 ? "" : params[2];
-               FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(NULL,params[1],value));
+               FOREACH_MOD(OnDecodeMetaData, (NULL,params[1],value));
                return CMD_SUCCESS;
        }
 
@@ -35,16 +35,13 @@ CmdResult CommandMetadata::Handle(const std::vector<std::string>& params, User *
                // 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,9 +49,9 @@ CmdResult CommandMetadata::Handle(const std::vector<std::string>& params, User *
                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(I_OnDecodeMetaData,OnDecodeMetaData(c,params[2],value));
+               FOREACH_MOD(OnDecodeMetaData, (c,params[2],value));
        }
        else
        {
@@ -64,12 +61,36 @@ CmdResult CommandMetadata::Handle(const std::vector<std::string>& params, User *
                        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(I_OnDecodeMetaData,OnDecodeMetaData(u,params[1],value));
+                       FOREACH_MOD(OnDecodeMetaData, (u,params[1],value));
                }
        }
 
        return CMD_SUCCESS;
 }
 
+CommandMetadata::Builder::Builder(User* user, const std::string& key, const std::string& val)
+       : CmdBuilder("METADATA")
+{
+       push(user->uuid);
+       push(key);
+       push_last(val);
+}
+
+CommandMetadata::Builder::Builder(Channel* chan, const std::string& key, const std::string& val)
+       : CmdBuilder("METADATA")
+{
+       push(chan->name);
+       push_int(chan->age);
+       push(key);
+       push_last(val);
+}
+
+CommandMetadata::Builder::Builder(const std::string& key, const std::string& val)
+       : CmdBuilder("METADATA")
+{
+       push("*");
+       push(key);
+       push_last(val);
+}