Implement support for IRCv3 client-to-client tags.

[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 8773d718744603b7238e5c36fe460958456cf50a..3ec534e916725dd7359009e8abe992d49368754a 100644 (file)
--- a/src/modules/m_ircv3_echomessage.cpp
+++ b/src/modules/m_ircv3_echomessage.cpp
@@ -20,50 +20,103 @@
 
 #include "inspircd.h"
 #include "modules/cap.h"
+#include "modules/ctctags.h"
 
-static const char* MessageTypeStringSp[] = { "PRIVMSG ", "NOTICE " };
-
-class ModuleIRCv3EchoMessage : public Module
+class ModuleIRCv3EchoMessage
+       : public Module
+       , public CTCTags::EventListener
 {
+ private:
        Cap::Capability cap;
+       ClientProtocol::EventProvider tagmsgprov;
 
  public:
        ModuleIRCv3EchoMessage()
-               : cap(this, "echo-message")
+               : CTCTags::EventListener(this)
+               , cap(this, "echo-message")
+               , tagmsgprov(this, "TAGMSG")
        {
        }
 
-       void OnUserMessage(User* user, void* dest, int target_type, const std::string& text, char status, const CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+       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[msgtype];
-               if (target_type == TYPE_USER)
+               // 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 = static_cast<User*>(dest);
-                       msg.append(destuser->nick);
+                       User* destuser = target.Get<User>();
+                       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 == TYPE_CHANNEL)
+               else if (target.type == MessageTarget::TYPE_CHANNEL)
+               {
+                       Channel* chan = target.Get<Channel>();
+                       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
                {
-                       if (status)
-                               msg.push_back(status);
+                       const std::string* servername = target.Get<std::string>();
+                       ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, *servername, text, details.type);
+                       privmsg.AddTags(tags);
+                       localuser->Send(ServerInstance->GetRFCEvents().privmsg, privmsg);
+               }
+       }
+
+       void OnUserPostTagMessage(User* user, const MessageTarget& target, const CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+       {
+               if (!cap.get(user) || !details.echo)
+                       return;
 
-                       Channel* chan = static_cast<Channel*>(dest);
-                       msg.append(chan->name);
+               // Caps are only set on local users
+               LocalUser* const localuser = static_cast<LocalUser*>(user);
+
+               const ClientProtocol::TagMap& tags = details.echo_original ? details.tags_in : details.tags_out;
+               if (target.type == MessageTarget::TYPE_USER)
+               {
+                       User* destuser = target.Get<User>();
+                       CTCTags::TagMessage message(user, destuser, tags);
+                       localuser->Send(tagmsgprov, message);
+               }
+               else if (target.type == MessageTarget::TYPE_CHANNEL)
+               {
+                       Channel* chan = target.Get<Channel>();
+                       CTCTags::TagMessage message(user, chan, tags);
+                       localuser->Send(tagmsgprov, message);
                }
                else
                {
-                       const char* servername = static_cast<const char*>(dest);
-                       msg.append(servername);
+                       const std::string* servername = target.Get<std::string>();
+                       CTCTags::TagMessage message(user, servername->c_str(), tags);
+                       localuser->Send(tagmsgprov, message);
                }
-               msg.append(" :").append(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.echo_original)
+                       OnUserPostMessage(user, target, details);
+       }
+
+       void OnUserTagMessageBlocked(User* user, const MessageTarget& target, const CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+       {
+               // Prevent spammers from knowing that their spam was blocked.
+               if (details.echo_original)
+                       OnUserPostTagMessage(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);
        }
 };