CAP LS
:alfred.staticbox.net CAP * LS :multi-prefix sasl
CAP REQ :multi-prefix
-:alfred.staticbox.net CAP * ACK :multi-prefix
+:alfred.staticbox.net CAP * ACK :multi-prefix
CAP CLEAR
:alfred.staticbox.net CAP * ACK :-multi-prefix
CAP REQ :multi-prefix
-:alfred.staticbox.net CAP * ACK :multi-prefix
+:alfred.staticbox.net CAP * ACK :multi-prefix
CAP LIST
:alfred.staticbox.net CAP * LIST :multi-prefix
CAP END
this->source = "m_cap.so";
}
- CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+ CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
{
- irc::string subcommand = parameters[0];
+ /* Ignore CAP from registered clients */
+ if (user->registered == REG_ALL)
+ return CMD_FAILURE;
+
+ irc::string subcommand = parameters[0].c_str();
if (subcommand == "REQ")
{
Data.user = user;
Data.creator = this->Creator;
- if (pcnt < 2)
+ if (parameters.size() < 2)
return CMD_FAILURE;
// tokenize the input into a nice list of requested caps
user->WriteServ("CAP * ACK :%s", AckResult.c_str());
}
- if (Data.nak.size() > 0)
+ if (Data.wanted.size() > 0)
{
- std::string NakResult = irc::stringjoiner(" ", Data.nak, 0, Data.nak.size() - 1).GetJoined();
+ std::string NakResult = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
user->WriteServ("CAP * NAK :%s", NakResult.c_str());
}
}
}
else
{
- user->WriteServ("410 * %s :Invalid CAP subcommand", subcommand.c_str());
+ user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "* %s :Invalid CAP subcommand", subcommand.c_str());
}
return CMD_FAILURE;
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+ return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
}
};