From a909bf763a661401cb03c6aac04effa958a4e632 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Mon, 17 Jul 2023 10:06:39 +0100
Subject: Move checks for whether a user is cloakable to {Get,Reset}Cloaks.

---
 src/modules/m_cloak_user.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

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

diff --git a/src/modules/m_cloak_user.cpp b/src/modules/m_cloak_user.cpp
index 3204bec64..d76b74a62 100644
--- a/src/modules/m_cloak_user.cpp
+++ b/src/modules/m_cloak_user.cpp
@@ -282,8 +282,8 @@ public:
 	void OnAccountChange(User* user, const std::string& newaccount) override
 	{
 		LocalUser* luser = IS_LOCAL(user);
-		if (!luser || luser->quitting || !luser->IsFullyConnected() || !cloakapi)
-			return; // User is uncloakable.
+		if (!luser || !cloakapi)
+			return;
 
 		if (cloakapi->IsActiveCloak(accountcloak) || cloakapi->IsActiveCloak(accountidcloak))
 			cloakapi->ResetCloaks(luser, true);
@@ -292,20 +292,14 @@ public:
 	void OnChangeRealUser(User* user, const std::string& newuser) override
 	{
 		LocalUser* luser = IS_LOCAL(user);
-		if (!luser || luser->quitting || !luser->IsFullyConnected() || !cloakapi)
-			return; // User is uncloakable.
-
-		if (cloakapi->IsActiveCloak(usernamecloak))
+		if (luser && cloakapi && cloakapi->IsActiveCloak(usernamecloak))
 			cloakapi->ResetCloaks(luser, true);
 	}
 
 	void OnUserPostNick(User* user, const std::string& oldnick) override
 	{
 		LocalUser* luser = IS_LOCAL(user);
-		if (!luser || luser->quitting || !luser->IsFullyConnected() || !cloakapi)
-			return; // User is uncloakable.
-
-		if (cloakapi->IsActiveCloak(nicknamecloak))
+		if (luser && cloakapi && cloakapi->IsActiveCloak(nicknamecloak))
 			cloakapi->ResetCloaks(luser, true);
 	}
 };
-- 
cgit v1.3.1-10-gc9f91