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());
}
}
Event event((char*) &Data, (Module*)this->Creator, subcommand == "LS" ? "cap_ls" : "cap_list");
event.Send(this->ServerInstance);
- std::string Result = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
- user->WriteServ("CAP * LS :%s", Result.c_str());
+ std::string Result;
+ if (Data.wanted.size() > 0)
+ Result = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
+ else
+ Result = "";
+
+ user->WriteServ("CAP * %s :%s", subcommand.c_str(), Result.c_str());
}
else if (subcommand == "CLEAR")
{
}
else
{
- user->WriteServ("410 * %s :Invalid CAP subcommand", subcommand.c_str());
+ user->WriteNumeric(410, "* %s :Invalid CAP subcommand", subcommand.c_str());
}
return CMD_FAILURE;
{
/* Users in CAP state get held until CAP END */
if (user->GetExt("CAP_REGHOLD"))
- return true;
+ return false;
- return false;
+ return true;
}
virtual ~ModuleCAP()
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+ return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
}
};