Redo OnSetEndPoint logic to fix duplicate clones (#1549).

[user/henk/code/inspircd.git] / src / coremods / core_info / cmd_motd.cpp

diff --git a/src/coremods/core_info/cmd_motd.cpp b/src/coremods/core_info/cmd_motd.cpp
index 57616094ede4c9976291e24cd0c94bfcd83e275d..e4c57553947cac246fa3a881b2d92aa9432b76e9 100644 (file)
--- a/src/coremods/core_info/cmd_motd.cpp
+++ b/src/coremods/core_info/cmd_motd.cpp
@@ -22,14 +22,14 @@
 #include "core_info.h"
 
 CommandMotd::CommandMotd(Module* parent)
-       : Command(parent, "MOTD", 0, 1)
+       : ServerTargetCommand(parent, "MOTD")
 {
        syntax = "[<servername>]";
 }
 
 /** Handle /MOTD
  */
-CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandMotd::Handle(User* user, const Params& parameters)
 {
        if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName)
        {
@@ -45,28 +45,19 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
        if (localuser)
                tag = localuser->GetClass()->config;
        std::string motd_name = tag->getString("motd", "motd");
-       ConfigFileCache::iterator motd = ServerInstance->Config->Files.find(motd_name);
-       if (motd == ServerInstance->Config->Files.end())
+       ConfigFileCache::iterator motd = motds.find(motd_name);
+       if (motd == motds.end())
        {
-               user->SendText(":%s %03d %s :Message of the day file is missing.",
-                       ServerInstance->Config->ServerName.c_str(), ERR_NOMOTD, user->nick.c_str());
+               user->WriteRemoteNumeric(ERR_NOMOTD, "Message of the day file is missing.");
                return CMD_SUCCESS;
        }
 
-       user->SendText(":%s %03d %s :%s message of the day", ServerInstance->Config->ServerName.c_str(),
-               RPL_MOTDSTART, user->nick.c_str(), ServerInstance->Config->ServerName.c_str());
+       user->WriteRemoteNumeric(RPL_MOTDSTART, InspIRCd::Format("%s message of the day", ServerInstance->Config->ServerName.c_str()));
 
        for (file_cache::iterator i = motd->second.begin(); i != motd->second.end(); i++)
-               user->SendText(":%s %03d %s :- %s", ServerInstance->Config->ServerName.c_str(), RPL_MOTD, user->nick.c_str(), i->c_str());
+               user->WriteRemoteNumeric(RPL_MOTD, InspIRCd::Format("- %s", i->c_str()));
 
-       user->SendText(":%s %03d %s :End of message of the day.", ServerInstance->Config->ServerName.c_str(), RPL_ENDOFMOTD, user->nick.c_str());
+       user->WriteRemoteNumeric(RPL_ENDOFMOTD, "End of message of the day.");
 
        return CMD_SUCCESS;
 }
-
-RouteDescriptor CommandMotd::GetRouting(User* user, const std::vector<std::string>& parameters)
-{
-       if (parameters.size() > 0)
-               return ROUTE_UNICAST(parameters[0]);
-       return ROUTE_LOCALONLY;
-}