Implement IRCv3 message tag support.

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

diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index cb51c4387cbf5e2a264d4120a015aaa63b01bc9f..99c54514007fcd615d1c39556e3e2d38b741d5a7 100644 (file)
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -19,6 +19,15 @@
 
 #include "inspircd.h"
 
+enum
+{
+       // From UnrealIRCd.
+       RPL_RULES = 232,
+       RPL_RULESTART = 308,
+       RPL_RULESEND = 309,
+       ERR_NORULES = 434
+};
+
 class CommandShowFile : public Command
 {
        enum Method
@@ -42,25 +51,27 @@ class CommandShowFile : public Command
        {
        }
 
-       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());
+                               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());
+                       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;
        }
@@ -69,9 +80,9 @@ class CommandShowFile : public Command
        {
                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;
@@ -81,8 +92,7 @@ class CommandShowFile : public Command
                        method = SF_NOTICE;
 
                contents = filecontents;
-               if (tag->getBool("colors"))
-                       InspIRCd::ProcessColors(contents);
+               InspIRCd::ProcessColors(contents);
        }
 };