X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_ircv3_ctctags.cpp;h=5b53d668e38b93c8d493a6b5c4a901beeca3385f;hb=9982ec4e5b027ed24b1fda5e6fd3ab35b98de1a7;hp=e46646703622a700d090ed27837e5301f2b263ee;hpb=90541be8d666483cc802db35ed321b50d7c5f1dc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp
index e46646703..5b53d668e 100644
--- a/src/modules/m_ircv3_ctctags.cpp
+++ b/src/modules/m_ircv3_ctctags.cpp
@@ -75,7 +75,8 @@ class CommandTagMsg : public Command
 			return CMD_FAILURE;
 
 		unsigned int minrank = pm ? pm->GetPrefixRank() : 0;
-		CTCTags::TagMessage message(source, chan, parameters.GetTags());
+		CTCTags::TagMessage message(source, chan, msgdetails.tags_out);
+		message.SetSideEffect(true);
 		const Channel::MemberMap& userlist = chan->GetUsers();
 		for (Channel::MemberMap::const_iterator iter = userlist.begin(); iter != userlist.end(); ++iter)
 		{
@@ -116,7 +117,8 @@ class CommandTagMsg : public Command
 		// the message out to the local users.
 		if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
 		{
-			CTCTags::TagMessage message(source, "$*", parameters.GetTags());
+			CTCTags::TagMessage message(source, "$*", msgdetails.tags_out);
+			message.SetSideEffect(true);
 			const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
 			for (UserManager::LocalList::const_iterator iter = list.begin(); iter != list.end(); ++iter)
 			{
@@ -183,7 +185,8 @@ class CommandTagMsg : public Command
 		if (localtarget && cap.get(localtarget))
 		{
 			// Send to the target if they have the capability and are a local user.
-			CTCTags::TagMessage message(source, localtarget, parameters.GetTags());
+			CTCTags::TagMessage message(source, localtarget, msgdetails.tags_out);
+			message.SetSideEffect(true);
 			localtarget->Send(msgevprov, message);
 		}
 
@@ -230,7 +233,11 @@ class CommandTagMsg : public Command
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		return ROUTE_MESSAGE(parameters[0]);
+		if (IS_LOCAL(user))
+			// This is handled by the OnUserPostTagMessage hook to split the LoopCall pieces
+			return ROUTE_LOCALONLY;
+		else
+			return ROUTE_MESSAGE(parameters[0]);
 	}
 };