From aabaca020b76c6d78b3ddb7c65e1b1d627f7276c Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sun, 4 Jul 2021 21:12:29 +0100
Subject: Stop sending RPL_WHOISSERVICE as it conflicts with RPL_WHOISHELPOP.

Both Anope and Atheme send an oper type for services clients so
this numeric is unnecessary. In cases where genericoper is enabled
we now send "is a network service" in RPL_WHOISOPERATOR.
---
 src/modules/m_servprotect.cpp | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'src/modules/m_servprotect.cpp')

diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 6a0474099..98b5983f6 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -27,9 +27,6 @@
 
 enum
 {
-	// From AustHex.
-	RPL_WHOISSERVICE = 310,
-
 	// From UnrealIRCd.
 	ERR_KILLDENY = 485
 };
@@ -55,13 +52,14 @@ class ServProtectMode : public ModeHandler
 	}
 };
 
-class ModuleServProtectMode : public Module, public Whois::EventListener, public Whois::LineEventListener
+class ModuleServProtectMode CXX11_FINAL
+	: public Module
+	, public Whois::LineEventListener
 {
 	ServProtectMode bm;
  public:
 	ModuleServProtectMode()
-		: Whois::EventListener(this)
-		, Whois::LineEventListener(this)
+		: Whois::LineEventListener(this)
 		, bm(this)
 	{
 	}
@@ -71,14 +69,6 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public
 		return Version("Adds user mode k (servprotect) which protects services pseudoclients from being kicked, being killed, or having their channel prefix modes changed.", VF_VENDOR);
 	}
 
-	void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
-	{
-		if (whois.GetTarget()->IsModeSet(bm))
-		{
-			whois.SendLine(RPL_WHOISSERVICE, "is a Network Service on " + ServerInstance->Config->Network);
-		}
-	}
-
 	ModResult OnRawMode(User* user, Channel* chan, ModeHandler* mh, const std::string& param, bool adding) CXX11_OVERRIDE
 	{
 		/* Check that the mode is not a server mode, it is being removed, the user making the change is local, there is a parameter,
-- 
cgit v1.3.1-10-gc9f91