X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=985762872cc88c17fe16db33ef8adbf721299189;hb=f2e3fd5952b23209b084bde4f464e6643c8a00ff;hp=0ff180a8338abfcf9ef6c6831471146fa885348f;hpb=c6e40d36b42a7ebf832c3a57d2816a47ee9c9a76;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 0ff180a83..985762872 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -46,6 +46,7 @@ ModuleSpanningTree::ModuleSpanningTree()
 	, currmembid(0)
 	, eventprov(this, "event/server")
 	, DNS(this, "DNS")
+	, tagevprov(this, "event/messagetag")
 	, loopCall(false)
 {
 }
@@ -410,6 +411,7 @@ void ModuleSpanningTree::OnUserPostMessage(User* user, const MessageTarget& targ
 		if (!IS_LOCAL(d))
 		{
 			CmdBuilder params(user, message_type);
+			params.push_tags(details.tags_out);
 			params.push_back(d->uuid);
 			params.push_last(details.text);
 			params.Unicast(d);
@@ -417,12 +419,13 @@ void ModuleSpanningTree::OnUserPostMessage(User* user, const MessageTarget& targ
 	}
 	else if (target.type == MessageTarget::TYPE_CHANNEL)
 	{
-		Utils->SendChannelMessage(user->uuid, target.Get<Channel>(), details.text, target.status, details.exemptions, message_type);
+		Utils->SendChannelMessage(user->uuid, target.Get<Channel>(), details.text, target.status, details.tags_out, details.exemptions, message_type);
 	}
 	else if (target.type == MessageTarget::TYPE_SERVER)
 	{
 		const std::string* serverglob = target.Get<std::string>();
 		CmdBuilder par(user, message_type);
+		par.push_tags(details.tags_out);
 		par.push_back(*serverglob);
 		par.push_last(details.text);
 		par.Broadcast();
@@ -582,9 +585,6 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s
 
 void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 {
-	if (loopCall)
-		return; // Don't generate a REHASH here if we're in the middle of processing a message that generated this one
-
 	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "OnPreRehash called with param %s", parameter.c_str());
 
 	// Send out to other servers