diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_botmode.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_customtitle.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_helpop.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_services_account.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_servprotect.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_sslinfo.cpp | 5 | ||||
| -rw-r--r-- | src/modules/m_swhois.cpp | 2 |
7 files changed, 9 insertions, 10 deletions
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp index 67f692b86..56c94c7c7 100644 --- a/src/modules/m_botmode.cpp +++ b/src/modules/m_botmode.cpp @@ -47,7 +47,7 @@ class ModuleBotMode : public Module { if (dst->IsModeSet(bm)) { - ServerInstance->SendWhoisLine(src, dst, 335, dst->nick+" :is a bot on "+ServerInstance->Config->Network); + ServerInstance->SendWhoisLine(src, dst, 335, ":is a bot on "+ServerInstance->Config->Network); } } }; diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 67eca6dda..6f9380506 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -89,7 +89,7 @@ class ModuleCustomTitle : public Module const std::string* ctitle = cmd.ctitle.get(dest); if (ctitle) { - ServerInstance->SendWhoisLine(user, dest, 320, "%s :%s", dest->nick.c_str(), ctitle->c_str()); + ServerInstance->SendWhoisLine(user, dest, 320, ":%s", ctitle->c_str()); } } /* Don't block anything */ diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index 2fe958a71..4c0af15af 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -143,7 +143,7 @@ class ModuleHelpop : public Module { if (dst->IsModeSet(ho)) { - ServerInstance->SendWhoisLine(src, dst, 310, dst->nick+" :is available for help."); + ServerInstance->SendWhoisLine(src, dst, 310, ":is available for help."); } } diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 26a53b4d7..1af06846e 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -162,13 +162,13 @@ class ModuleServicesAccount : public Module if (account) { - ServerInstance->SendWhoisLine(source, dest, 330, "%s %s :is logged in as", dest->nick.c_str(), account->c_str()); + ServerInstance->SendWhoisLine(source, dest, 330, "%s :is logged in as", account->c_str()); } if (dest->IsModeSet(m5)) { /* user is registered */ - ServerInstance->SendWhoisLine(source, dest, 307, "%s :is a registered nick", dest->nick.c_str()); + ServerInstance->SendWhoisLine(source, dest, 307, ":is a registered nick"); } } diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp index 340706142..edad324d1 100644 --- a/src/modules/m_servprotect.cpp +++ b/src/modules/m_servprotect.cpp @@ -60,7 +60,7 @@ class ModuleServProtectMode : public Module { if (dest->IsModeSet(bm)) { - ServerInstance->SendWhoisLine(user, dest, 310, dest->nick+" :is a Network Service on "+ServerInstance->Config->Network); + ServerInstance->SendWhoisLine(user, dest, 310, ":is a Network Service on "+ServerInstance->Config->Network); } } diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index f861f1236..03e9bed96 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -160,11 +160,10 @@ class ModuleSSLInfo : public Module ssl_cert* cert = cmd.CertExt.get(dest); if (cert) { - ServerInstance->SendWhoisLine(source, dest, 671, "%s :is using a secure connection", dest->nick.c_str()); + ServerInstance->SendWhoisLine(source, dest, 671, ":is using a secure connection"); bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly"); if ((!operonlyfp || source == dest || source->IsOper()) && !cert->fingerprint.empty()) - ServerInstance->SendWhoisLine(source, dest, 276, "%s :has client certificate fingerprint %s", - dest->nick.c_str(), cert->fingerprint.c_str()); + ServerInstance->SendWhoisLine(source, dest, 276, ":has client certificate fingerprint %s", cert->fingerprint.c_str()); } } diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 81abde6f7..ddc3726be 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -100,7 +100,7 @@ class ModuleSWhois : public Module std::string* swhois = cmd.swhois.get(dest); if (swhois) { - ServerInstance->SendWhoisLine(user, dest, 320, "%s :%s", dest->nick.c_str(), swhois->c_str()); + ServerInstance->SendWhoisLine(user, dest, 320, ":%s", swhois->c_str()); } } |