From a46b8b8edea0caf94350895acd02f0c90a1027de Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sat, 29 Oct 2022 13:01:42 +0100
Subject: Allow UserManager::Find{Nick,UUID,} to ignore unregistered users.

---
 src/modules/m_callerid.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 215b2648d..51dcc87cc 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -113,8 +113,8 @@ struct CallerIDExtInfo final
 
 		while (s.GetToken(tok))
 		{
-			auto u = ServerInstance->Users.Find(tok);
-			if ((u) && (u->registered == REG_ALL) && (!u->quitting))
+			auto u = ServerInstance->Users.Find(tok, true);
+			if (u && !u->quitting)
 			{
 				if (dat->accepting.insert(u).second)
 				{
@@ -172,11 +172,11 @@ class CommandAccept final
 
 		User* target;
 		if (!cmdfrom || !IS_LOCAL(cmdfrom))
-			target = ServerInstance->Users.Find(tok);
+			target = ServerInstance->Users.Find(tok, true);
 		else
-			target = ServerInstance->Users.FindNick(tok);
+			target = ServerInstance->Users.FindNick(tok, true);
 
-		if ((!target) || (target->registered != REG_ALL) || (target->quitting))
+		if (target && target->quitting)
 			target = nullptr;
 
 		return std::make_pair(target, !remove);
-- 
cgit v1.3.1-10-gc9f91