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")
{
CapData Data;
- Data.type = parameters[1];
+
+ Data.type = subcommand;
Data.user = user;
Data.creator = this->Creator;
- Data.parameter = (pcnt > 1 ? parameters[1] : "");
+
+ if (parameters.size() < 2)
+ return CMD_FAILURE;
+
+ // tokenize the input into a nice list of requested caps
+ std::string param = parameters[1];
+ std::string cap_;
+ irc::spacesepstream cap_stream(param);
+
+ while (cap_stream.GetToken(cap_))
+ {
+ Data.wanted.push_back(cap_);
+ }
user->Extend("CAP_REGHOLD");
Event event((char*) &Data, (Module*)this->Creator, "cap_req");
event.Send(this->ServerInstance);
- user->WriteServ("CAP * ACK :%s", Data.parameter.c_str());
+ if (Data.ack.size() > 0)
+ {
+ std::string AckResult = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
+ user->WriteServ("CAP * ACK :%s", AckResult.c_str());
+ }
+
+ if (Data.wanted.size() > 0)
+ {
+ std::string NakResult = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
+ user->WriteServ("CAP * NAK :%s", NakResult.c_str());
+ }
}
else if (subcommand == "END")
{
Data.type = subcommand;
Data.user = user;
Data.creator = this->Creator;
- Data.parameter.clear();
user->Extend("CAP_REGHOLD");
Event event((char*) &Data, (Module*)this->Creator, subcommand == "LS" ? "cap_ls" : "cap_list");
event.Send(this->ServerInstance);
- user->WriteServ("CAP * LS :%s", Data.parameter.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")
{
Data.type = subcommand;
Data.user = user;
Data.creator = this->Creator;
- Data.parameter.clear();
user->Extend("CAP_REGHOLD");
Event event((char*) &Data, (Module*)this->Creator, "cap_clear");
event.Send(this->ServerInstance);
- user->WriteServ("CAP * ACK :%s", Data.parameter.c_str());
+ std::string Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
+ user->WriteServ("CAP * ACK :%s", Result.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;
newcommand = new CommandCAP(ServerInstance, this);
ServerInstance->AddCommand(newcommand);
- Implementation eventlist[] = { I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect, I_OnRequest };
- ServerInstance->Modules->Attach(eventlist, this, 5);
+ Implementation eventlist[] = { I_OnCheckReady };
+ ServerInstance->Modules->Attach(eventlist, this, 1);
}
virtual bool OnCheckReady(User* user)
{
/* 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);
}
};