From 7266f8681d603c58e1281f3e7e2934d61f910ea4 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 12 Apr 2022 12:48:54 +0100
Subject: Add a numeric builder for the ERR_CHANOPRIVSNEEDED numeric.

This should make privilege errors more consistent.
---
 src/modules/m_rmode.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp
index eb7a018c4..ff5097c40 100644
--- a/src/modules/m_rmode.cpp
+++ b/src/modules/m_rmode.cpp
@@ -53,11 +53,8 @@ class CommandRMode : public Command
 
 		if (chan->GetPrefixValue(user) < mh->GetLevelRequired(false))
 		{
-			const PrefixMode* neededmh = ServerInstance->Modes.FindNearestPrefixMode(mh->GetLevelRequired(false));
-			if (neededmh)
-				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, chan->name, InspIRCd::Format("You must have channel %s access or above to unset channel mode %c", neededmh->name.c_str(), mh->GetModeChar()));
-			else
-				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, chan->name, InspIRCd::Format("You cannot unset channel mode %c", mh->GetModeChar()));
+			user->WriteNumeric(Numerics::ChannelPrivilegesNeeded(chan, mh->GetLevelRequired(false), InspIRCd::Format("unset channel mode %c (%s)",
+				mh->GetModeChar(), mh->name.c_str())));
 			return CMD_FAILURE;
 		}
 
-- 
cgit v1.3.1-10-gc9f91