Move the inspircd.org/service tag to the services module.

4 files changed, 0 insertions, 24 deletions

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 999effda6..718ff83ae 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -57,7 +57,6 @@ ModuleSpanningTree::ModuleSpanningTree()
 	, synceventprov(this, "event/server-sync")
 	, sslapi(this)
 	, servertags(this)
-	, servicetag(this)
 	, DNS(this)
 	, tagevprov(this)
 {
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 6558feafb..52125ec26 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -114,9 +114,6 @@ public:
 	/** Tags for server to server messages. */
 	ServerTags servertags;
 
-	/** Tag for marking services pseudoclients. */
-	ServiceTag servicetag;
-
 	/** The DNS manager service provided by core_dns. */
 	DNS::ManagerRef DNS;
 
diff --git a/src/modules/m_spanningtree/tags.cpp b/src/modules/m_spanningtree/tags.cpp
index 1eba0e5d4..958581a44 100644
--- a/src/modules/m_spanningtree/tags.cpp
+++ b/src/modules/m_spanningtree/tags.cpp
@@ -38,15 +38,3 @@ bool ServerTags::ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTag
 	// Server tags should never be sent to users.
 	return false;
 }
-
-ServiceTag::ServiceTag(Module* mod)
-	: CTCTags::TagProvider(mod)
-{
-}
-
-void ServiceTag::OnPopulateTags(ClientProtocol::Message& msg)
-{
-	User* const user = msg.GetSourceUser();
-	if (user && user->server->IsService())
-		msg.AddTag("inspircd.org/service", this, "");
-}
diff --git a/src/modules/m_spanningtree/tags.h b/src/modules/m_spanningtree/tags.h
index 2fb99ccdd..7630214ef 100644
--- a/src/modules/m_spanningtree/tags.h
+++ b/src/modules/m_spanningtree/tags.h
@@ -29,11 +29,3 @@ public:
 	ModResult OnProcessTag(User* user, const std::string& tagname, std::string& tagvalue) override;
 	bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) override;
 };
-
-class ServiceTag final
-	: public CTCTags::TagProvider
-{
-public:
-	ServiceTag(Module* mod);
-	void OnPopulateTags(ClientProtocol::Message& msg) override;
-};