#include "inspircd.h"
+enum
+{
+ // From UnrealIRCd.
+ ERR_NOOPERMOTD = 425,
+
+ // From ircd-ratbox.
+ RPL_OMOTDSTART = 720,
+ RPL_OMOTD = 721,
+ RPL_ENDOFOMOTD = 722
+};
+
/** Handle /OPERMOTD
*/
class CommandOpermotd : public Command
flags_needed = 'o'; syntax = "[<servername>]";
}
- CmdResult Handle (const std::vector<std::string>& parameters, User* user)
+ CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
{
- if ((parameters.empty()) || (parameters[0] == ServerInstance->Config->ServerName))
- ShowOperMOTD(user);
+ if ((parameters.empty()) || (irc::equals(parameters[0], ServerInstance->Config->ServerName)))
+ ShowOperMOTD(user, true);
return CMD_SUCCESS;
}
- RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+ RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
{
if ((!parameters.empty()) && (parameters[0].find('.') != std::string::npos))
return ROUTE_OPT_UCAST(parameters[0]);
return ROUTE_LOCALONLY;
}
- void ShowOperMOTD(User* user)
+ void ShowOperMOTD(User* user, bool show_missing)
{
if (opermotd.empty())
{
- user->WriteRemoteNumeric(455, "OPERMOTD file is missing");
+ if (show_missing)
+ user->WriteRemoteNumeric(ERR_NOOPERMOTD, "OPERMOTD file is missing.");
return;
}
- user->WriteRemoteNumeric(375, "- IRC Operators Message of the Day");
+ user->WriteRemoteNumeric(RPL_OMOTDSTART, "Server operators message of the day");
for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i)
{
- user->WriteRemoteNumeric(372, InspIRCd::Format("- %s", i->c_str()));
+ user->WriteRemoteNumeric(RPL_OMOTD, InspIRCd::Format("- %s", i->c_str()));
}
- user->WriteRemoteNumeric(376, "- End of OPERMOTD");
+ user->WriteRemoteNumeric(RPL_ENDOFOMOTD, "End of OPERMOTD");
}
};
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR | VF_OPTCOMMON);
+ return Version("Shows a message to opers after oper-up and adds the OPERMOTD command", VF_VENDOR | VF_OPTCOMMON);
}
void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE
{
if (onoper && IS_LOCAL(user))
- cmd.ShowOperMOTD(user);
+ cmd.ShowOperMOTD(user, false);
}
void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
FileReader reader(conf->getString("file", "opermotd"));
cmd.opermotd = reader.GetVector();
+ InspIRCd::ProcessColors(cmd.opermotd);
}
catch (CoreException&)
{
// Nothing happens here as we do the error handling in ShowOperMOTD.
}
-
- if (conf->getBool("processcolors"))
- InspIRCd::ProcessColors(cmd.opermotd);
}
};