X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ircv3_echomessage.cpp;h=f6eae5a00741c92038d8ca61c3811ad8831b026a;hb=dccf47d0a091be2395257d401f8ed55eaa258bc7;hp=c2818700faa2bbfa0c5177cc3813fd59a0c989e7;hpb=2fcb5ff4389a9a82d253acdff02a388ddcf14653;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ircv3_echomessage.cpp b/src/modules/m_ircv3_echomessage.cpp
index c2818700f..f6eae5a00 100644
--- 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,35 +33,46 @@ 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;
 		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(details.tags_in);
+			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(details.tags_in);
+			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(details.tags_in);
+			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.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);
 	}
 };