X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ircv3_echomessage.cpp;h=62fee4c17b72ac90c0954aa918235354864d89e7;hb=HEAD;hp=3ec534e916725dd7359009e8abe992d49368754a;hpb=c495b5d9cf8bed4f07c0b77a1f9e98dcc1f62068;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ircv3_echomessage.cpp b/src/modules/m_ircv3_echomessage.cpp
index 3ec534e91..62fee4c17 100644
--- a/src/modules/m_ircv3_echomessage.cpp
+++ b/src/modules/m_ircv3_echomessage.cpp
@@ -1,8 +1,9 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2013-2015 Peter Powell <petpow@saberuk.com>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2015, 2018 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -48,26 +49,32 @@ class ModuleIRCv3EchoMessage
 
 		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)
+		switch (target.type)
 		{
-			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 == 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
-		{
-			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);
+			case MessageTarget::TYPE_USER:
+			{
+				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);
+				break;
+			}
+			case 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);
+				break;
+			}
+			case MessageTarget::TYPE_SERVER:
+			{
+				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);
+				break;
+			}
 		}
 	}
 
@@ -80,23 +87,29 @@ class ModuleIRCv3EchoMessage
 		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
+		switch (target.type)
 		{
-			const std::string* servername = target.Get<std::string>();
-			CTCTags::TagMessage message(user, servername->c_str(), tags);
-			localuser->Send(tagmsgprov, message);
+			case MessageTarget::TYPE_USER:
+			{
+				User* destuser = target.Get<User>();
+				CTCTags::TagMessage message(user, destuser, tags);
+				localuser->Send(tagmsgprov, message);
+				break;
+			}
+			case MessageTarget::TYPE_CHANNEL:
+			{
+				Channel* chan = target.Get<Channel>();
+				CTCTags::TagMessage message(user, chan, tags, target.status);
+				localuser->Send(tagmsgprov, message);
+				break;
+			}
+			case MessageTarget::TYPE_SERVER:
+			{
+				const std::string* servername = target.Get<std::string>();
+				CTCTags::TagMessage message(user, servername->c_str(), tags);
+				localuser->Send(tagmsgprov, message);
+				break;
+			}
 		}
 	}
 
@@ -116,7 +129,7 @@ class ModuleIRCv3EchoMessage
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the echo-message IRCv3 extension", VF_VENDOR);
+		return Version("Provides the IRCv3 echo-message client capability.", VF_VENDOR);
 	}
 };