summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2016-09-30 21:06:44 -0400
committerAdam <Adam@anope.org>2016-09-30 21:06:44 -0400
commitd8428f74b0023aaa165e4b573259e9658579e42b (patch)
tree585493b92df99a8eac334e0758e2fbf413fb86c5
parentec984804292d8b05c3ce2b0a98f68f91fde004b7 (diff)
Various find by nick fixes
-rw-r--r--modules/memoserv/main/memoserv.cpp2
-rw-r--r--modules/nickserv/group.cpp2
-rw-r--r--modules/nickserv/info.cpp2
-rw-r--r--modules/nickserv/main/nickserv.cpp8
4 files changed, 7 insertions, 7 deletions
diff --git a/modules/memoserv/main/memoserv.cpp b/modules/memoserv/main/memoserv.cpp
index 60457bb93..a8e9b4e81 100644
--- a/modules/memoserv/main/memoserv.cpp
+++ b/modules/memoserv/main/memoserv.cpp
@@ -95,7 +95,7 @@ class MemoServCore : public Module, public MemoServ::MemoServService
if (mi == NULL)
return MEMO_INVALID_TARGET;
- User *sender = User::Find(source);
+ User *sender = User::Find(source, true);
if (sender != NULL && !sender->HasPriv("memoserv/no-limit") && !force)
{
time_t send_delay = Config->GetModule("memoserv")->Get<time_t>("senddelay");
diff --git a/modules/nickserv/group.cpp b/modules/nickserv/group.cpp
index 1d0e02d6d..7c0f41809 100644
--- a/modules/nickserv/group.cpp
+++ b/modules/nickserv/group.cpp
@@ -280,7 +280,7 @@ class CommandNSUngroup : public Command
source.Reply(_("\002{0}\002 has been ungrouped from \002{1}\002."), na->GetNick(), oldcore->GetDisplay());
- User *user = User::Find(na->GetNick());
+ User *user = User::Find(na->GetNick(), true);
if (user)
/* The user on the nick who was ungrouped may be identified to the old group, set -r */
user->RemoveMode(source.service, "REGISTERED");
diff --git a/modules/nickserv/info.cpp b/modules/nickserv/info.cpp
index 1ed8b2d23..593cfa116 100644
--- a/modules/nickserv/info.cpp
+++ b/modules/nickserv/info.cpp
@@ -50,7 +50,7 @@ class CommandNSInfo : public Command
bool nick_online = false, show_hidden = false;
/* Is the real owner of the nick we're looking up online? -TheShadow */
- User *u2 = User::Find(na->GetNick());
+ User *u2 = User::Find(na->GetNick(), true);
if (u2 && u2->Account() == na->GetAccount())
{
nick_online = true;
diff --git a/modules/nickserv/main/nickserv.cpp b/modules/nickserv/main/nickserv.cpp
index 40d6f3767..8f33caf87 100644
--- a/modules/nickserv/main/nickserv.cpp
+++ b/modules/nickserv/main/nickserv.cpp
@@ -316,7 +316,7 @@ class NickServCore : public Module, public NickServ::NickServService
if (guestnick.length() > nicklen)
guestnick = guestnick.substr(0, nicklen);
}
- while (User::Find(guestnick) && i++ < 10);
+ while (User::Find(guestnick, true) && i++ < 10);
if (i == 11)
u->Kill(*NickServ, "Services nickname-enforcer kill");
@@ -338,7 +338,7 @@ class NickServCore : public Module, public NickServ::NickServService
IRCD->SendSVSHoldDel(na->GetNick());
else
{
- User *u = User::Find(na->GetNick());
+ User *u = User::Find(na->GetNick(), true);
if (u && u->server == Me)
{
u->Quit();
@@ -416,7 +416,7 @@ class NickServCore : public Module, public NickServ::NickServService
void OnDelNick(NickServ::Nick *na) override
{
- User *u = User::Find(na->GetNick());
+ User *u = User::Find(na->GetNick(), true);
if (u && u->Account() == na->GetAccount())
{
IRCD->SendLogout(u);
@@ -642,7 +642,7 @@ class NickServCore : public Module, public NickServ::NickServService
for (NickServ::Nick *na : nick_type.List<NickServ::Nick *>())
{
- User *u = User::Find(na->GetNick());
+ User *u = User::Find(na->GetNick(), true);
if (u && (u->IsIdentified(true) || u->IsRecognized()))
na->SetLastSeen(Anope::CurTime);