Replace <showwhois:showfromopers> with an operator privilege.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 5de3a3152..8dd1e6cc0 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -98,17 +98,16 @@ public:
 		auto tag = ServerInstance->Config->ConfValue("showwhois");
 
 		sw.SetOperOnly(tag->getBool("opersonly", true));
-		ShowWhoisFromOpers = tag->getBool("showfromopers", true);
 	}
 
 	void OnWhois(Whois::Context& whois) override
 	{
-		User* const source = whois.GetSource();
 		User* const dest = whois.GetTarget();
 		if (!dest->IsModeSet(sw) || whois.IsSelfWhois())
 			return;
 
-		if (!ShowWhoisFromOpers && source->IsOper())
+		User* const source = whois.GetSource();
+		if (source->HasPrivPermission("users/secret-whois"))
 			return;
 
 		if (IS_LOCAL(dest))