CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
{
- const std::string& sn = ServerInstance->Config->ServerName;
if (method == SF_NUMERIC)
{
if (!introtext.empty())
- user->SendText(":%s %03d %s :%s %s", sn.c_str(), intronumeric, user->nick.c_str(), sn.c_str(), introtext.c_str());
+ user->WriteRemoteNumeric(intronumeric, introtext);
for (file_cache::const_iterator i = contents.begin(); i != contents.end(); ++i)
- user->SendText(":%s %03d %s :- %s", sn.c_str(), textnumeric, user->nick.c_str(), i->c_str());
+ user->WriteRemoteNumeric(textnumeric, InspIRCd::Format("- %s", i->c_str()));
- user->SendText(":%s %03d %s :%s", sn.c_str(), endnumeric, user->nick.c_str(), endtext.c_str());
+ user->WriteRemoteNumeric(endnumeric, endtext.c_str());
}
else
{
const char* msgcmd = (method == SF_MSG ? "PRIVMSG" : "NOTICE");
- std::string header = InspIRCd::Format(":%s %s %s :", sn.c_str(), msgcmd, user->nick.c_str());
for (file_cache::const_iterator i = contents.begin(); i != contents.end(); ++i)
- user->SendText(header + *i);
+ {
+ const std::string& line = *i;
+ user->WriteCommand(msgcmd, ":" + line);
+ }
}
return CMD_SUCCESS;
}
FileReader reader(file);
CommandShowFile* sfcmd;
- Command* handler = ServerInstance->Parser->GetHandler(cmdname);
+ Command* handler = ServerInstance->Parser.GetHandler(cmdname);
if (handler)
{
// Command exists, check if it is ours
// This is our command, make sure we don't have the same entry twice
sfcmd = static_cast<CommandShowFile*>(handler);
- if (std::find(newcmds.begin(), newcmds.end(), sfcmd) != newcmds.end())
+ if (stdalgo::isin(newcmds, sfcmd))
throw ModuleException("Command " + cmdname + " is already used in a <showfile> tag");
}
else
newcmds.push_back(sfcmd);
}
- static void DelAll(const std::vector<CommandShowFile*>& list)
- {
- for (std::vector<CommandShowFile*>::const_iterator i = list.begin(); i != list.end(); ++i)
- delete *i;
- }
-
public:
void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
std::sort(newcmds.begin(), newcmds.end());
std::set_difference(cmds.begin(), cmds.end(), newcmds.begin(), newcmds.end(), removed.begin());
- DelAll(removed);
+ stdalgo::delete_all(removed);
cmds.swap(newcmds);
}
~ModuleShowFile()
{
- DelAll(cmds);
+ stdalgo::delete_all(cmds);
}
Version GetVersion() CXX11_OVERRIDE