Also synchronise the prefix rank between servers.

[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 2d1354affcf07ca7fcd95632656886ea603d11b5..99c54514007fcd615d1c39556e3e2d38b741d5a7 100644 (file)
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -51,7 +51,7 @@ 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
        {
                if (method == SF_NUMERIC)
                {
@@ -63,13 +63,14 @@ class CommandShowFile : public Command
 
                        user->WriteRemoteNumeric(endnumeric, endtext.c_str());
                }
-               else
+               else if (IS_LOCAL(user))
                {
-                       const char* msgcmd = (method == SF_MSG ? "PRIVMSG" : "NOTICE");
+                       LocalUser* const localuser = IS_LOCAL(user);
                        for (file_cache::const_iterator i = contents.begin(); i != contents.end(); ++i)
                        {
                                const std::string& line = *i;
-                               user->WriteCommand(msgcmd, ":" + line);
+                               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;
@@ -91,8 +92,7 @@ class CommandShowFile : public Command
                        method = SF_NOTICE;
 
                contents = filecontents;
-               if (tag->getBool("colors"))
-                       InspIRCd::ProcessColors(contents);
+               InspIRCd::ProcessColors(contents);
        }
 };