diff options
| author |  Sadie Powell | 2022-10-29 13:01:42 +0100 |
|---|---|---|
| committer | Sadie Powell | 2022-10-29 13:01:42 +0100 |
| commit | a46b8b8edea0caf94350895acd02f0c90a1027de (patch) | |
| tree | 378d05f11c9c3ea1e814e3b1d88f8a620bea4a9d /src/modules/m_callerid.cpp | |
| parent | More const correctness. (diff) | |
Allow UserManager::Find{Nick,UUID,} to ignore unregistered users.
Diffstat (limited to 'src/modules/m_callerid.cpp')
| -rw-r--r-- | src/modules/m_callerid.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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); |