#include "inspircd.h"
+enum
+{
+ // From UnrealIRCd.
+ RPL_RULES = 232,
+ RPL_RULESTART = 308,
+ RPL_RULESEND = 309,
+ ERR_NORULES = 434
+};
+
class CommandShowFile : public Command
{
enum Method
{
}
- CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+ CmdResult Handle(User* user, const Params& parameters) 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());
+ if (!introtext.empty() && intronumeric)
+ 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());
+ if (!endtext.empty() && endnumeric)
+ user->WriteRemoteNumeric(endnumeric, endtext.c_str());
}
- else
+ else if (IS_LOCAL(user))
{
- const char* msgcmd = (method == SF_MSG ? "PRIVMSG" : "NOTICE");
- std::string header = InspIRCd::Format(":%s %s %s :", sn.c_str(), msgcmd, user->nick.c_str());
+ LocalUser* const localuser = IS_LOCAL(user);
for (file_cache::const_iterator i = contents.begin(); i != contents.end(); ++i)
- user->SendText(header + *i);
+ {
+ const std::string& line = *i;
+ ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, localuser, line, ((method == SF_MSG) ? MSG_PRIVMSG : MSG_NOTICE));
+ localuser->Send(ServerInstance->GetRFCEvents().privmsg, msg);
+ }
}
return CMD_SUCCESS;
}
{
introtext = tag->getString("introtext", "Showing " + name);
endtext = tag->getString("endtext", "End of " + name);
- intronumeric = tag->getInt("intronumeric", RPL_RULESTART, 0, 999);
- textnumeric = tag->getInt("numeric", RPL_RULES, 0, 999);
- endnumeric = tag->getInt("endnumeric", RPL_RULESEND, 0, 999);
+ intronumeric = tag->getUInt("intronumeric", RPL_RULESTART, 0, 999);
+ textnumeric = tag->getUInt("numeric", RPL_RULES, 0, 999);
+ endnumeric = tag->getUInt("endnumeric", RPL_RULESEND, 0, 999);
std::string smethod = tag->getString("method");
method = SF_NUMERIC;
method = SF_NOTICE;
contents = filecontents;
- if (tag->getBool("colors"))
- InspIRCd::ProcessColors(contents);
+ InspIRCd::ProcessColors(contents);
}
};
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