From 7922b96408a4908c9ebba363cb9ca63dd195e178 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 10 May 2022 15:16:21 +0100
Subject: Use the servprotect mode to protect services.

Anope and Atheme already set this on their clients so no downstream
changes are needed.

Closes #781.
---
 src/modules/m_remove.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 74b4c2992..5b41b1ccf 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -36,6 +36,7 @@ class CommandRemove final
 {
 private:
 	ChanModeReference nokicksmode;
+	UserModeReference servprotectmode;
 
 public:
 	unsigned long protectedrank;
@@ -44,6 +45,7 @@ public:
 	CommandRemove(Module* Creator)
 		: Command(Creator, "REMOVE", 2, 3)
 		, nokicksmode(Creator, "nokick")
+		, servprotectmode(Creator, "servprotect")
 	{
 		syntax = { "<channel> <nick> [:<reason>]" };
 		translation = { TR_TEXT, TR_NICK, TR_TEXT };
@@ -84,7 +86,7 @@ public:
 			return CmdResult::FAILURE;
 		}
 
-		if (target->server->IsService())
+		if (target->IsModeSet(servprotectmode))
 		{
 			user->WriteNumeric(ERR_RESTRICTED, channame, "Only a service may remove a service from a channel.");
 			return CmdResult::FAILURE;
-- 
cgit v1.3.1-10-gc9f91