WebSocket: use one WebSocket message per IRC message.

[user/henk/code/inspircd.git] / src / modules / m_opermotd.cpp

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index bd1853d43da43a37a78739e1420aa9ddc47d6e97..49409a1c05f5e90f33fe1f429a48d1a51d1a6cc3 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -34,37 +34,36 @@ 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);
                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())
+               if ((!parameters.empty()) && (parameters[0].find('.') != std::string::npos))
                        return ROUTE_OPT_UCAST(parameters[0]);
                return ROUTE_LOCALONLY;
        }
 
        void ShowOperMOTD(User* user)
        {
-               const std::string& servername = ServerInstance->Config->ServerName;
                if (opermotd.empty())
                {
-                       user->SendText(":%s 455 %s :OPERMOTD file is missing", servername.c_str(), user->nick.c_str());
+                       user->WriteRemoteNumeric(455, "OPERMOTD file is missing");
                        return;
                }
 
-               user->SendText(":%s 375 %s :- IRC Operators Message of the Day", servername.c_str(), user->nick.c_str());
+               user->WriteRemoteNumeric(RPL_MOTDSTART, "- IRC Operators Message of the Day");
 
                for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i)
                {
-                       user->SendText(":%s 372 %s :- %s", servername.c_str(), user->nick.c_str(), i->c_str());
+                       user->WriteRemoteNumeric(RPL_MOTD, InspIRCd::Format("- %s", i->c_str()));
                }
 
-               user->SendText(":%s 376 %s :- End of OPERMOTD", servername.c_str(), user->nick.c_str());
+               user->WriteRemoteNumeric(RPL_ENDOFMOTD, "- End of OPERMOTD");
        }
 };
 
@@ -101,14 +100,12 @@ class ModuleOpermotd : public Module
                {
                        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);
        }
 };