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/coremods/core_whois.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/coremods')

diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index 7bbcb0c05..b1d03f0cc 100644
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -234,7 +234,7 @@ void CommandWhois::DoWhois(LocalUser* user, User* dest, time_t signon, unsigned
 	if (dest->IsOper())
 	{
 		if (genericoper)
-			whois.SendLine(RPL_WHOISOPERATOR, "is a server operator");
+			whois.SendLine(RPL_WHOISOPERATOR, dest->server->IsULine() ? "is a network service" : "is a server operator");
 		else
 			whois.SendLine(RPL_WHOISOPERATOR, InspIRCd::Format("is %s %s on %s", (strchr("AEIOUaeiou",dest->oper->name[0]) ? "an" : "a"), dest->oper->name.c_str(), ServerInstance->Config->Network.c_str()));
 	}
-- 
cgit v1.3.1-10-gc9f91