aboutsummaryrefslogtreecommitdiff
path: root/src/modules/m_callerid.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2023-01-23 07:42:07 +0000
committerGravatar Sadie Powell2023-01-23 13:07:53 +0000
commit5c4badf8ea3ba775854f0d26d3f2e0e119584faa (patch)
tree05dd2c5c545f12f71866be6422146477ddd30e3f /src/modules/m_callerid.cpp
parentVendor the fmtlib library. (diff)
Replace InspIRCd::Format with fmt::format.
Diffstat (limited to 'src/modules/m_callerid.cpp')
-rw-r--r--src/modules/m_callerid.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 4b392ae93..516d1d513 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -284,7 +284,7 @@ public:
callerid_data* dat = extInfo.Get(user, true);
if (dat->accepting.size() >= maxaccepts)
{
- user->WriteNumeric(ERR_ACCEPTFULL, InspIRCd::Format("Accept list is full (limit is %lu)", maxaccepts));
+ user->WriteNumeric(ERR_ACCEPTFULL, INSP_FORMAT("Accept list is full (limit is {})", maxaccepts));
return false;
}
if (!dat->accepting.insert(whotoadd).second)
@@ -422,12 +422,14 @@ public:
{
time_t now = ServerInstance->Time();
/* +g and *not* accepted */
- user->WriteNumeric(ERR_TARGUMODEG, dest->nick, InspIRCd::Format("is in +%c mode (server-side ignore).", myumode.GetModeChar()));
+ user->WriteNumeric(ERR_TARGUMODEG, dest->nick, INSP_FORMAT("is in +{} mode (server-side ignore).", myumode.GetModeChar()));
if (now > (dat->lastnotify + long(notify_cooldown)))
{
user->WriteNumeric(RPL_TARGNOTIFY, dest->nick, "has been informed that you messaged them.");
- dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick, InspIRCd::Format("%s@%s", user->ident.c_str(), user->GetDisplayedHost().c_str()), InspIRCd::Format("is messaging you, and you have user mode +%c set. Use /ACCEPT +%s to allow.",
- myumode.GetModeChar(), user->nick.c_str()));
+ dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick,
+ INSP_FORMAT("{}@{}", user->ident, user->GetDisplayedHost()),
+ INSP_FORMAT("is messaging you, and you have user mode +{} set. Use /ACCEPT +{} to allow.", myumode.GetModeChar(), user->nick)
+ );
dat->lastnotify = now;
}
return MOD_RES_DENY;