diff options
| author | Robby- <robby@chat.be> | 2013-09-30 20:40:42 +0200 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-10-05 00:33:02 -0400 |
| commit | ba5a3f5f00609a5d82abd9e255dc93ee44d0e8f4 (patch) | |
| tree | 4af9c6014a53eec8d218b40e958db73e7273861b /modules/commands/os_forbid.cpp | |
| parent | 7b6c08b53a3ee5339aeeebd04892d6c9a1de5465 (diff) | |
Don't explicitly reference services nicks.
os_forbid: If NickServ is available, have it send the forbid reason instead of OperServ.
Diffstat (limited to 'modules/commands/os_forbid.cpp')
| -rw-r--r-- | modules/commands/os_forbid.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/commands/os_forbid.cpp b/modules/commands/os_forbid.cpp index 485f66ee7..4eac5071b 100644 --- a/modules/commands/os_forbid.cpp +++ b/modules/commands/os_forbid.cpp @@ -197,7 +197,7 @@ class CommandOSForbid : public Command delete na; } - source.Reply(_("\002%d\002 nicknames dropped."), na_matches); + source.Reply(_("\002%d\002 nickname(s) dropped."), na_matches); break; } case FT_CHAN: @@ -256,7 +256,7 @@ class CommandOSForbid : public Command delete ci; } - source.Reply(_("\002%d\002 channels cleared, and \002%d\002 channels dropped."), chan_matches, ci_matches); + source.Reply(_("\002%d\002 channel(s) cleared, and \002%d\002 channel(s) dropped."), chan_matches, ci_matches); break; } @@ -394,11 +394,11 @@ class OSForbid : public Module ForbidData *d = this->forbidService.FindForbid(u->nick, FT_NICK); if (d != NULL) { - BotInfo *OperServ = Config->GetClient("OperServ"); - if (OperServ) - { - u->SendMessage(OperServ, _("This nickname has been forbidden: %s"), d->reason.c_str()); - } + BotInfo *bi = Config->GetClient("NickServ"); + if (!bi) + bi = Config->GetClient("OperServ"); + if (bi) + u->SendMessage(bi, _("This nickname has been forbidden: %s"), d->reason.c_str()); if (nickserv) nickserv->Collide(u, NULL); } |