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 4772f8d2c32a887372f58f17d7af05df2554dcd1..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,8 +45,8 @@ 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->WriteRemoteNumeric(ERR_NOMOTD, "Message of the day file is missing.");
                return CMD_SUCCESS;
@@ -61,10 +61,3 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
 
        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;
-}