Fix cloaking users too early in cloak_user.

This commit is contained in:
Sadie Powell 2023-07-17 07:29:56 +01:00
parent f2e4711210
commit 4a303da1d5

View File

@ -282,8 +282,8 @@ public:
void OnAccountChange(User* user, const std::string& newaccount) override
{
LocalUser* luser = IS_LOCAL(user);
if (!luser || !cloakapi)
return;
if (!luser || luser->quitting || !luser->IsFullyConnected() || !cloakapi)
return; // User is uncloakable.
if (cloakapi->IsActiveCloak(accountcloak) || cloakapi->IsActiveCloak(accountidcloak))
cloakapi->ResetCloaks(luser, true);
@ -292,14 +292,20 @@ public:
void OnChangeRealUser(User* user, const std::string& newuser) override
{
LocalUser* luser = IS_LOCAL(user);
if (luser && cloakapi && cloakapi->IsActiveCloak(usernamecloak))
if (!luser || luser->quitting || !luser->IsFullyConnected() || !cloakapi)
return; // User is uncloakable.
if (cloakapi->IsActiveCloak(usernamecloak))
cloakapi->ResetCloaks(luser, true);
}
void OnUserPostNick(User* user, const std::string& oldnick) override
{
LocalUser* luser = IS_LOCAL(user);
if (luser && cloakapi && cloakapi->IsActiveCloak(nicknamecloak))
if (!luser || luser->quitting || !luser->IsFullyConnected() || !cloakapi)
return; // User is uncloakable.
if (cloakapi->IsActiveCloak(nicknamecloak))
cloakapi->ResetCloaks(luser, true);
}
};