class CommandSapart : public Command
{
public:
- CommandSapart (InspIRCd* Instance) : Command(Instance,"SAPART", 'o', 2, false, 0)
+ CommandSapart (InspIRCd* Instance) : Command(Instance,"SAPART", "o", 2, false, 0)
{
this->source = "m_sapart.so";
syntax = "<nick> <channel> [reason]";
TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
}
- CmdResult Handle (const char** parameters, int pcnt, User *user)
+ CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
User* dest = ServerInstance->FindNick(parameters[0]);
Channel* channel = ServerInstance->FindChan(parameters[1]);
- std::string reason;
+ std::string reason = "";
if (dest && channel)
{
- ServerInstance->Log(DEBUG, "SAPART: pcnt is %d", pcnt);
- if (pcnt == 3)
+ if (parameters.size() > 2)
reason = parameters[2];
- else
- reason = dest->nick;
if (ServerInstance->ULine(dest->server))
{
- user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+ user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
return CMD_FAILURE;
}
*/
if (IS_LOCAL(dest))
{
- if (!channel->PartUser(dest, reason.c_str()))
+ if (!channel->PartUser(dest, reason))
delete channel;
+
Channel* n = ServerInstance->FindChan(parameters[1]);
if (!n)
{
- ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+ ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
return CMD_SUCCESS;
}
else
{
if (!n->HasUser(dest))
{
- ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
+ ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
return CMD_SUCCESS;
}
else
{
- user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick, dest->nick, parameters[1]);
+ user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str());
return CMD_FAILURE;
}
}
}
else
{
- ServerInstance->WriteOpers("*** "+std::string(user->nick)+" sent remote SAPART to make "+dest->nick+" part "+parameters[1]);
+ ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" sent remote SAPART to make "+dest->nick+" part "+parameters[1]);
}
return CMD_SUCCESS;
}
else
{
- user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick);
+ user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick.c_str());
}
return CMD_FAILURE;
ModuleSapart(InspIRCd* Me)
: Module(Me)
{
-
+
mycommand = new CommandSapart(ServerInstance);
ServerInstance->AddCommand(mycommand);
}
-
+
virtual ~ModuleSapart()
{
}
-
+
virtual Version GetVersion()
{
- return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
}
-
+
};
MODULE_INIT(ModuleSapart)