Expand searching in m_httpd_stats, add global handling of GET parameters (#1566)

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

diff --git a/src/modules/m_ircv3_echomessage.cpp b/src/modules/m_ircv3_echomessage.cpp
index 056b02194cb46f30e45a894d27f35b9a1e55ae75..b407aece4a1af3a4c29519f1424f204b8af0f7bd 100644 (file)
--- a/src/modules/m_ircv3_echomessage.cpp
+++ b/src/modules/m_ircv3_echomessage.cpp
@@ -21,8 +21,6 @@
 #include "inspircd.h"
 #include "modules/cap.h"
 
-static const char* MessageTypeStringSp[] = { "PRIVMSG ", "NOTICE " };
-
 class ModuleIRCv3EchoMessage : public Module
 {
        Cap::Capability cap;
@@ -35,42 +33,47 @@ class ModuleIRCv3EchoMessage : public Module
 
        void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE
        {
-               if (!cap.get(user))
+               if (!cap.get(user) || !details.echo)
                        return;
 
-               std::string msg = MessageTypeStringSp[details.type];
+               // Caps are only set on local users
+               LocalUser* const localuser = static_cast<LocalUser*>(user);
+
+               const std::string& text = details.echo_original ? details.original_text : details.text;
+               const ClientProtocol::TagMap& tags = details.echo_original ? details.tags_in : details.tags_out;
                if (target.type == MessageTarget::TYPE_USER)
                {
                        User* destuser = target.Get<User>();
-                       msg.append(destuser->nick);
+                       ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, destuser, text, details.type);
+                       privmsg.AddTags(tags);
+                       localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg);
                }
                else if (target.type == MessageTarget::TYPE_CHANNEL)
                {
-                       if (target.status)
-                               msg.push_back(target.status);
-
                        Channel* chan = target.Get<Channel>();
-                       msg.append(chan->name);
+                       ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, chan, text, details.type, target.status);
+                       privmsg.AddTags(tags);
+                       localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg);
                }
                else
                {
                        const std::string* servername = target.Get<std::string>();
-                       msg.append(*servername);
+                       ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, *servername, text, details.type);
+                       privmsg.AddTags(tags);
+                       localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg);
                }
-               msg.append(" :").append(details.echooriginal ? details.originaltext : details.text);
-               user->WriteFrom(user, msg);
        }
 
        void OnUserMessageBlocked(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE
        {
                // Prevent spammers from knowing that their spam was blocked.
-               if (details.echooriginal)
+               if (details.echo_original)
                        OnUserPostMessage(user, target, details);
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides the echo-message IRCv3.2 extension", VF_VENDOR);
+               return Version("Provides the echo-message IRCv3 extension", VF_VENDOR);
        }
 };