- CapData Data;
- Data.type = parameters[1];
- Data.user = user;
- Data.creator = this->Creator;
- Data.parameter = (pcnt > 1 ? parameters[1] : "");
-
- 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 (parameters.size() < 2)
+ return CMD_FAILURE;
+
+ CapEvent Data(creator, user, CapEvent::CAPEVENT_REQ);
+
+ // tokenize the input into a nice list of requested caps
+ std::string cap_;
+ irc::spacesepstream cap_stream(parameters[1]);
+
+ while (cap_stream.GetToken(cap_))
+ {
+ // Whilst the handling of extraneous spaces is not currently defined in the CAP specification
+ // every single other implementation ignores extraneous spaces. Lets copy them for
+ // compatibility purposes.
+ trim(cap_);
+ if (!cap_.empty())
+ Data.wanted.push_back(cap_);
+ }
+
+ reghold.set(user, 1);
+ Data.Send();
+
+ if (Data.wanted.empty())
+ {
+ user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), parameters[1].c_str());
+ return CMD_SUCCESS;
+ }
+
+ // HACK: reset all of the caps which were enabled on this user because a cap request is atomic.
+ for (std::vector<std::pair<GenericCap*, int> >::iterator iter = Data.changed.begin(); iter != Data.changed.end(); ++iter)
+ iter->first->ext.set(user, iter->second);
+
+ user->WriteServ("CAP %s NAK :%s", user->nick.c_str(), parameters[1].c_str());