From e3abae44a797703e508ce1eacd21427ed576b3aa Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Tue, 11 Feb 2025 11:44:05 +0000
Subject: Make email confirmation a bit smarter.

---
 modules/nickserv/ns_set.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/nickserv/ns_set.cpp b/modules/nickserv/ns_set.cpp
index ec01dc00b..a1291fe26 100644
--- a/modules/nickserv/ns_set.cpp
+++ b/modules/nickserv/ns_set.cpp
@@ -598,7 +598,8 @@ public:
 		if (MOD_RESULT == EVENT_STOP)
 			return;
 
-		if (!param.empty() && Config->GetModule("nickserv")->Get<bool>("confirmemailchanges") && !source.IsServicesOper())
+		const auto nsmailreg = Config->GetModule("ns_register")->Get<const Anope::string>("registration").equals_ci("mail");
+		if (!param.empty() && Config->GetModule("nickserv")->Get<bool>("confirmemailchanges", nsmailreg ? "yes" : "no") && !source.IsServicesOper())
 		{
 			if (SendConfirmMail(source.GetUser(), source.GetAccount(), source.service, param))
 			{
-- 
cgit