* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
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
*/
class CommandCAP : public Command
{
- Module* Creator;
public:
- CommandCAP (InspIRCd* Instance, Module* mod) : Command(Instance,"CAP", 0, 1, true), Creator(mod)
+ CommandCAP (InspIRCd* Instance, Module* mod) : Command(Instance, mod, "CAP", 0, 1, true)
{
- this->source = "m_cap.so";
}
CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
{
- /* Ignore CAP from registered clients */
- if (user->registered == REG_ALL)
- return CMD_FAILURE;
-
irc::string subcommand = parameters[0].c_str();
if (subcommand == "REQ")
Data.type = subcommand;
Data.user = user;
- Data.creator = this->Creator;
+ Data.creator = this->creator;
if (parameters.size() < 2)
return CMD_FAILURE;
}
user->Extend("CAP_REGHOLD");
- Event event((char*) &Data, (Module*)this->Creator, "cap_req");
+ Event event((char*) &Data, this->creator, "cap_req");
event.Send(this->ServerInstance);
if (Data.ack.size() > 0)
Data.type = subcommand;
Data.user = user;
- Data.creator = this->Creator;
+ Data.creator = this->creator;
user->Extend("CAP_REGHOLD");
- Event event((char*) &Data, (Module*)this->Creator, subcommand == "LS" ? "cap_ls" : "cap_list");
+ Event event((char*) &Data, this->creator, subcommand == "LS" ? "cap_ls" : "cap_list");
event.Send(this->ServerInstance);
std::string Result;
Data.type = subcommand;
Data.user = user;
- Data.creator = this->Creator;
+ Data.creator = this->creator;
user->Extend("CAP_REGHOLD");
- Event event((char*) &Data, (Module*)this->Creator, "cap_clear");
+ Event event((char*) &Data, this->creator, "cap_clear");
event.Send(this->ServerInstance);
std::string Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
}
else
{
- user->WriteNumeric(410, "* %s :Invalid CAP subcommand", subcommand.c_str());
+ user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "* %s :Invalid CAP subcommand", subcommand.c_str());
}
return CMD_FAILURE;
class ModuleCAP : public Module
{
- CommandCAP* newcommand;
+ CommandCAP newcommand;
public:
ModuleCAP(InspIRCd* Me)
- : Module(Me)
+ : Module(Me), newcommand(Me, this)
{
- // Create a new command
- newcommand = new CommandCAP(ServerInstance, this);
- ServerInstance->AddCommand(newcommand);
+ ServerInstance->AddCommand(&newcommand);
Implementation eventlist[] = { I_OnCheckReady };
ServerInstance->Modules->Attach(eventlist, this, 1);
}
- virtual bool OnCheckReady(User* user)
+ virtual ModResult OnCheckReady(User* user)
{
/* Users in CAP state get held until CAP END */
if (user->GetExt("CAP_REGHOLD"))
- return false;
+ return MOD_RES_DENY;
- return true;
+ return MOD_RES_PASSTHRU;
}
virtual ~ModuleCAP()
virtual Version GetVersion()
{
- return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_VENDOR, API_VERSION);
}
};