#include "inspircd.h"
#include "commands.h"
-CmdResult CommandMetadata::Handle(User* srcuser, std::vector<std::string>& params)
+CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
{
if (params[0] == "*")
{
// 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;
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));
}
else
{
User* u = ServerInstance->FindUUID(params[0]);
- if ((u) && (!IS_SERVER(u)))
+ if (u)
{
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));
}