Convert WriteToSnoMask/WriteGlobalSno to use fmtlib format strings.

17 files changed, 59 insertions, 59 deletions

diff --git a/src/coremods/core_loadmodule.cpp b/src/coremods/core_loadmodule.cpp
index 2ddec3dd0..2e5da5915 100644
--- a/src/coremods/core_loadmodule.cpp
+++ b/src/coremods/core_loadmodule.cpp
@@ -44,7 +44,7 @@ CmdResult CommandLoadmodule::Handle(User* user, const Params& parameters)
 {
 	if (ServerInstance->Modules.Load(parameters[0]))
 	{
-		ServerInstance->SNO.WriteGlobalSno('a', "NEW MODULE: %s loaded %s", user->nick.c_str(), parameters[0].c_str());
+		ServerInstance->SNO.WriteGlobalSno('a', "NEW MODULE: {} loaded {}", user->nick, parameters[0]);
 		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded.");
 		return CmdResult::SUCCESS;
 	}
@@ -86,7 +86,7 @@ CmdResult CommandUnloadmodule::Handle(User* user, const Params& parameters)
 
 	if (m && ServerInstance->Modules.Unload(m))
 	{
-		ServerInstance->SNO.WriteGlobalSno('a', "MODULE UNLOADED: %s unloaded %s", user->nick.c_str(), parameters[0].c_str());
+		ServerInstance->SNO.WriteGlobalSno('a', "MODULE UNLOADED: {} unloaded {}", user->nick, parameters[0]);
 		user->WriteNumeric(RPL_UNLOADEDMODULE, parameters[0], "Module successfully unloaded.");
 	}
 	else
diff --git a/src/coremods/core_oper/cmd_die.cpp b/src/coremods/core_oper/cmd_die.cpp
index d1ab8c1c0..dbc4d2034 100644
--- a/src/coremods/core_oper/cmd_die.cpp
+++ b/src/coremods/core_oper/cmd_die.cpp
@@ -70,7 +70,7 @@ CmdResult CommandDie::Handle(User* user, const Params& parameters)
 	else
 	{
 		ServerInstance->Logs.Error(MODNAME, "Failed /DIE command from %s", user->GetFullRealHost().c_str());
-		ServerInstance->SNO.WriteGlobalSno('a', "Failed DIE command from %s.", user->GetFullRealHost().c_str());
+		ServerInstance->SNO.WriteGlobalSno('a', "Failed DIE command from {}.", user->GetFullRealHost());
 		return CmdResult::FAILURE;
 	}
 }
diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp
index cd9dee907..04d416c06 100644
--- a/src/coremods/core_oper/cmd_kill.cpp
+++ b/src/coremods/core_oper/cmd_kill.cpp
@@ -115,9 +115,9 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters)
 	if ((!hideservicekills) || (!user->server->IsService()))
 	{
 		if (IS_LOCAL(user) && IS_LOCAL(target))
-			ServerInstance->SNO.WriteGlobalSno('k', "Local kill by %s: %s (%s)", user->nick.c_str(), target->GetFullRealHost().c_str(), parameters[1].c_str());
+			ServerInstance->SNO.WriteGlobalSno('k', "Local kill by {}: {} ({})", user->nick, target->GetFullRealHost(), parameters[1]);
 		else
-			ServerInstance->SNO.WriteToSnoMask('K', "Remote kill by %s: %s (%s)", user->nick.c_str(), target->GetFullRealHost().c_str(), parameters[1].c_str());
+			ServerInstance->SNO.WriteToSnoMask('K', "Remote kill by {}: {} ({})", user->nick, target->GetFullRealHost(), parameters[1]);
 	}
 
 	if (IS_LOCAL(target))
diff --git a/src/coremods/core_oper/cmd_oper.cpp b/src/coremods/core_oper/cmd_oper.cpp
index 10e098019..6cfe14ccd 100644
--- a/src/coremods/core_oper/cmd_oper.cpp
+++ b/src/coremods/core_oper/cmd_oper.cpp
@@ -49,8 +49,8 @@ CmdResult CommandOper::HandleLocal(LocalUser* user, const Params& parameters)
 	auto it = ServerInstance->Config->OperAccounts.find(parameters[0]);
 	if (it == ServerInstance->Config->OperAccounts.end())
 	{
-		ServerInstance->SNO.WriteGlobalSno('o', "%s (%s) [%s] failed to log into the \x02%s\x02 oper account because no account with that name exists.",
-			user->nick.c_str(), user->MakeHost().c_str(), user->GetIPString().c_str(), parameters[0].c_str());
+		ServerInstance->SNO.WriteGlobalSno('o', "{} ({}) [{}] failed to log into the \x02{}\x02 oper account because no account with that name exists.",
+			user->nick, user->MakeHost(), user->GetIPString(), parameters[0]);
 		return FailedOper(user, parameters[0]);
 	}
 
@@ -58,8 +58,8 @@ CmdResult CommandOper::HandleLocal(LocalUser* user, const Params& parameters)
 	auto account = it->second;
 	if (!account->CheckPassword(parameters[1]))
 	{
-		ServerInstance->SNO.WriteGlobalSno('o', "%s (%s) [%s] failed to log into the \x02%s\x02 oper account because they specified the wrong password.",
-			user->nick.c_str(), user->MakeHost().c_str(), user->GetIPString().c_str(), parameters[0].c_str());
+		ServerInstance->SNO.WriteGlobalSno('o', "{} ({}) [{}] failed to log into the \x02{}\x02 oper account because they specified the wrong password.",
+			user->nick, user->MakeHost(), user->GetIPString(), parameters[0]);
 		return FailedOper(user, parameters[0]);
 	}
 
diff --git a/src/coremods/core_oper/cmd_rehash.cpp b/src/coremods/core_oper/cmd_rehash.cpp
index 7809f968f..b90e3cd48 100644
--- a/src/coremods/core_oper/cmd_rehash.cpp
+++ b/src/coremods/core_oper/cmd_rehash.cpp
@@ -79,8 +79,8 @@ CmdResult CommandRehash::Handle(User* user, const Params& parameters)
 	{
 		const std::string configfile = std::filesystem::path(ServerInstance->ConfigFileName).filename().string();
 		user->WriteRemoteNumeric(RPL_REHASHING, configfile, "Rehashing " + ServerInstance->Config->ServerName);
-		ServerInstance->SNO.WriteGlobalSno('r', "%s is rehashing %s on %s", user->nick.c_str(),
-			configfile.c_str(), ServerInstance->Config->ServerName.c_str());
+		ServerInstance->SNO.WriteGlobalSno('r', "{} is rehashing {} on {}", user->nick,
+			configfile, ServerInstance->Config->ServerName);
 
 		/* Don't do anything with the logs here -- logs are restarted
 		 * after the config thread has completed.
diff --git a/src/coremods/core_oper/cmd_restart.cpp b/src/coremods/core_oper/cmd_restart.cpp
index 72bcd1620..3ae3a8e2e 100644
--- a/src/coremods/core_oper/cmd_restart.cpp
+++ b/src/coremods/core_oper/cmd_restart.cpp
@@ -47,7 +47,7 @@ CmdResult CommandRestart::Handle(User* user, const Params& parameters)
 	ServerInstance->Logs.Normal(MODNAME, "Restart: %s", user->nick.c_str());
 	if (irc::equals(parameters[0], ServerInstance->Config->ServerName))
 	{
-		ServerInstance->SNO.WriteGlobalSno('a', "RESTART command from %s, restarting server.", user->GetFullRealHost().c_str());
+		ServerInstance->SNO.WriteGlobalSno('a', "RESTART command from {}, restarting server.", user->GetFullRealHost());
 
 		DieRestart::SendError("Server restarting.");
 
@@ -67,12 +67,12 @@ CmdResult CommandRestart::Handle(User* user, const Params& parameters)
 #endif
 
 		execvp(ServerInstance->Config->cmdline.argv[0], ServerInstance->Config->cmdline.argv);
-		ServerInstance->SNO.WriteGlobalSno('a', "Failed RESTART - could not execute '%s' (%s)",
+		ServerInstance->SNO.WriteGlobalSno('a', "Failed RESTART - could not execute '{}' ({})",
 			ServerInstance->Config->cmdline.argv[0], strerror(errno));
 	}
 	else
 	{
-		ServerInstance->SNO.WriteGlobalSno('a', "Failed RESTART Command from %s.", user->GetFullRealHost().c_str());
+		ServerInstance->SNO.WriteGlobalSno('a', "Failed RESTART Command from {}.", user->GetFullRealHost());
 	}
 	return CmdResult::FAILURE;
 }
diff --git a/src/coremods/core_oper/core_oper.cpp b/src/coremods/core_oper/core_oper.cpp
index 1a8d40925..17a32bd4c 100644
--- a/src/coremods/core_oper/core_oper.cpp
+++ b/src/coremods/core_oper/core_oper.cpp
@@ -89,8 +89,8 @@ public:
 
 		if (!automatic)
 		{
-			ServerInstance->SNO.WriteGlobalSno('o', "%s (%s) [%s] failed to log into the \x02%s\x02 oper account because they are connecting from the wrong user@host.",
-				user->nick.c_str(), user->MakeHost().c_str(), user->GetIPString().c_str(), oper->GetName().c_str());
+			ServerInstance->SNO.WriteGlobalSno('o', "{} ({}) [{}] failed to log into the \x02{}\x02 oper account because they are connecting from the wrong user@host.",
+				user->nick, user->MakeHost(), user->GetIPString(), oper->GetName());
 		}
 		return MOD_RES_DENY; // Host does not match.
 	}
@@ -104,9 +104,9 @@ public:
 		luser->WriteNumeric(RPL_YOUAREOPER, INSP_FORMAT("You are now {} {}", strchr("AEIOUaeiou", user->oper->GetType()[0]) ? "an" : "a",
 			user->oper->GetType()));
 
-		ServerInstance->SNO.WriteToSnoMask('o', "%s (%s) [%s] is now a server operator of type \x02%s\x02 (%susing account \x02%s\x02).",
-			user->nick.c_str(), user->MakeHost().c_str(), user->GetIPString().c_str(), user->oper->GetType().c_str(),
-			automatic ? "automatically " : "", user->oper->GetName().c_str());
+		ServerInstance->SNO.WriteToSnoMask('o', "{} ({}) [{}] is now a server operator of type \x02{}\x02 ({}using account \x02{}\x02).",
+			user->nick, user->MakeHost(), user->GetIPString(), user->oper->GetType(),
+			automatic ? "automatically " : "", user->oper->GetName());
 
 		const std::string vhost = luser->oper->GetConfig()->getString("vhost");
 		if (!vhost.empty())
diff --git a/src/coremods/core_oper/umode_o.cpp b/src/coremods/core_oper/umode_o.cpp
index f0373e7b0..c2810479f 100644
--- a/src/coremods/core_oper/umode_o.cpp
+++ b/src/coremods/core_oper/umode_o.cpp
@@ -48,7 +48,7 @@ bool ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, Modes::C
 	 * to your User!
 	 */
 	char snomask = IS_LOCAL(dest) ? 'o' : 'O';
-	ServerInstance->SNO.WriteToSnoMask(snomask, "User %s de-opered (by %s)", dest->nick.c_str(), source->nick.c_str());
+	ServerInstance->SNO.WriteToSnoMask(snomask, "User {} de-opered (by {})", dest->nick, source->nick);
 	dest->OperLogout();
 
 	return true;
diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp
index 8ebabc7be..61f094c8d 100644
--- a/src/coremods/core_reloadmodule.cpp
+++ b/src/coremods/core_reloadmodule.cpp
@@ -698,12 +698,12 @@ public:
 		{
 			Module* newmod = ServerInstance->Modules.Find(name);
 			datakeeper.Restore(newmod);
-			ServerInstance->SNO.WriteGlobalSno('a', "The %s module was reloaded.", passedname.c_str());
+			ServerInstance->SNO.WriteGlobalSno('a', "The {} module was reloaded.", passedname);
 		}
 		else
 		{
 			datakeeper.Fail();
-			ServerInstance->SNO.WriteGlobalSno('a', "Failed to reload the %s module.", passedname.c_str());
+			ServerInstance->SNO.WriteGlobalSno('a', "Failed to reload the {} module.", passedname);
 		}
 
 		auto* user = ServerInstance->Users.FindUUID(uuid);
diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp
index db86ab542..4b732d7b1 100644
--- a/src/coremods/core_stats.cpp
+++ b/src/coremods/core_stats.cpp
@@ -109,7 +109,7 @@ void CommandStats::DoStats(Stats::Context& stats)
 	if (!isPublic && !isRemoteOper && !isLocalOperWithPrivs)
 	{
 		const char* what = IS_LOCAL(user) ? "Stats" : "Remote stats";
-		ServerInstance->SNO.WriteToSnoMask('t', "%s '%c' denied for %s (%s)", what, statschar, user->nick.c_str(), user->MakeHost().c_str());
+		ServerInstance->SNO.WriteToSnoMask('t', "{} '{}' denied for {} ({})", what, statschar, user->nick, user->MakeHost());
 		stats.AddRow(481, (std::string("Permission Denied - STATS ") + statschar + " requires the servers/auspex priv."));
 		return;
 	}
@@ -118,7 +118,7 @@ void CommandStats::DoStats(Stats::Context& stats)
 	if (res == MOD_RES_DENY)
 	{
 		const char* what = IS_LOCAL(user) ? "Stats" : "Remote stats";
-		ServerInstance->SNO.WriteToSnoMask('t', "%s '%c' denied for %s (%s)", what, statschar, user->nick.c_str(), user->MakeHost().c_str());
+		ServerInstance->SNO.WriteToSnoMask('t', "{} '{}' denied for {} ({})", what, statschar, user->nick, user->MakeHost());
 		stats.AddRow(219, statschar, "End of /STATS report");
 		return;
 	}
@@ -357,8 +357,8 @@ void CommandStats::DoStats(Stats::Context& stats)
 	}
 
 	stats.AddRow(219, statschar, "End of /STATS report");
-	ServerInstance->SNO.WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",
-		(IS_LOCAL(user) ? "Stats" : "Remote stats"), statschar, user->nick.c_str(), user->ident.c_str(), user->GetRealHost().c_str());
+	ServerInstance->SNO.WriteToSnoMask('t', "{} '{}' requested by {} ({}@{})", (IS_LOCAL(user) ? "Stats" : "Remote stats"),
+		statschar, user->nick, user->ident, user->GetRealHost());
 }
 
 CmdResult CommandStats::Handle(User* user, const Params& parameters)
diff --git a/src/coremods/core_user/core_user.cpp b/src/coremods/core_user/core_user.cpp
index 2f4203f3c..9c9a6613d 100644
--- a/src/coremods/core_user/core_user.cpp
+++ b/src/coremods/core_user/core_user.cpp
@@ -238,8 +238,8 @@ public:
 				ServerInstance->Users.QuitUser(user, "No more local connections allowed from your host via this connect class.");
 				if (klass->maxconnwarn)
 				{
-					ServerInstance->SNO.WriteToSnoMask('a', "WARNING: maximum local connections for the %s class (%ld) exceeded by %s",
-						klass->GetName().c_str(), klass->maxlocal, user->GetIPString().c_str());
+					ServerInstance->SNO.WriteToSnoMask('a', "WARNING: maximum local connections for the {} class ({}) exceeded by {}",
+						klass->GetName(), klass->maxlocal, user->GetIPString());
 				}
 				return;
 			}
@@ -249,8 +249,8 @@ public:
 				ServerInstance->Users.QuitUser(user, "No more global connections allowed from your host via this connect class.");
 				if (klass->maxconnwarn)
 				{
-					ServerInstance->SNO.WriteToSnoMask('a', "WARNING: maximum global connections for the %s class (%ld) exceeded by %s",
-						klass->name.c_str(), klass->maxglobal, user->GetIPString().c_str());
+					ServerInstance->SNO.WriteToSnoMask('a', "WARNING: maximum global connections for the {} class ({}) exceeded by {}",
+						klass->GetName(), klass->maxglobal, user->GetIPString());
 				}
 				return;
 			}
diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp
index 2467c3f44..92f847f56 100644
--- a/src/coremods/core_xline/cmd_eline.cpp
+++ b/src/coremods/core_xline/cmd_eline.cpp
@@ -77,13 +77,13 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters)
 		{
 			if (!duration)
 			{
-				ServerInstance->SNO.WriteToSnoMask('x', "%s added a permanent E-line on %s: %s", user->nick.c_str(), target.c_str(), parameters[2].c_str());
+				ServerInstance->SNO.WriteToSnoMask('x', "{} added a permanent E-line on {}: {}", user->nick, target, parameters[2]);
 			}
 			else
 			{
-				ServerInstance->SNO.WriteToSnoMask('x', "%s added a timed E-line on %s, expires in %s (on %s): %s",
-					user->nick.c_str(), target.c_str(), Duration::ToString(duration).c_str(),
-					InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str());
+				ServerInstance->SNO.WriteToSnoMask('x', "{} added a timed E-line on {}, expires in {} (on {}): {}",
+					user->nick, target, Duration::ToString(duration),
+					InspIRCd::TimeString(ServerInstance->Time() + duration), parameters[2]);
 			}
 		}
 		else
@@ -98,7 +98,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters)
 
 		if (ServerInstance->XLines->DelLine(target.c_str(), "E", reason, user))
 		{
-			ServerInstance->SNO.WriteToSnoMask('x', "%s removed E-line on %s: %s", user->nick.c_str(), target.c_str(), reason.c_str());
+			ServerInstance->SNO.WriteToSnoMask('x', "{} removed E-line on {}: {}", user->nick, target, reason);
 		}
 		else
 		{
diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp
index 54cc506cb..4737170d3 100644
--- a/src/coremods/core_xline/cmd_gline.cpp
+++ b/src/coremods/core_xline/cmd_gline.cpp
@@ -84,13 +84,13 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters)
 		{
 			if (!duration)
 			{
-				ServerInstance->SNO.WriteToSnoMask('x', "%s added a permanent G-line on %s: %s", user->nick.c_str(), target.c_str(), parameters[2].c_str());
+				ServerInstance->SNO.WriteToSnoMask('x', "{} added a permanent G-line on {}: {}", user->nick, target, parameters[2]);
 			}
 			else
 			{
-				ServerInstance->SNO.WriteToSnoMask('x', "%s added a timed G-line on %s, expires in %s (on %s): %s",
-					user->nick.c_str(), target.c_str(), Duration::ToString(duration).c_str(),
-					InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str());
+				ServerInstance->SNO.WriteToSnoMask('x', "{} added a timed G-line on {}, expires in {} (on {}): {}",
+					user->nick, target, Duration::ToString(duration),
+					InspIRCd::TimeString(ServerInstance->Time() + duration), parameters[2]);
 			}
 
 			ServerInstance->XLines->ApplyLines();
@@ -108,7 +108,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters)
 
 		if (ServerInstance->XLines->DelLine(target.c_str(), "G", reason, user))
 		{
-			ServerInstance->SNO.WriteToSnoMask('x', "%s removed G-line on %s: %s", user->nick.c_str(), target.c_str(), reason.c_str());
+			ServerInstance->SNO.WriteToSnoMask('x', "{} removed G-line on {}: {}", user->nick, target, reason);
 		}
 		else
 		{
diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp
index ad185124f..7560557d3 100644
--- a/src/coremods/core_xline/cmd_kline.cpp
+++ b/src/coremods/core_xline/cmd_kline.cpp
@@ -84,13 +84,13 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters)
 		{
 			if (!duration)
 			{
-				ServerInstance->SNO.WriteToSnoMask('x', "%s added a permanent K-line on %s: %s", user->nick.c_str(), target.c_str(), parameters[2].c_str());
+				ServerInstance->SNO.WriteToSnoMask('x', "{} added a permanent K-line on {}: {}", user->nick, target, parameters[2]);
 			}
 			else
 			{
-				ServerInstance->SNO.WriteToSnoMask('x', "%s added a timed K-line on %s, expires in %s (on %s): %s",
-					user->nick.c_str(), target.c_str(), Duration::ToString(duration).c_str(),
-					InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str());
+				ServerInstance->SNO.WriteToSnoMask('x', "{} added a timed K-line on {}, expires in {} (on {}): {}",
+					user->nick, target, Duration::ToString(duration),
+					InspIRCd::TimeString(ServerInstance->Time() + duration), parameters[2]);
 			}
 
 			ServerInstance->XLines->ApplyLines();
@@ -107,7 +107,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters)
 
 		if (ServerInstance->XLines->DelLine(target.c_str(), "K", reason, user))
 		{
-			ServerInstance->SNO.WriteToSnoMask('x', "%s removed K-line on %s: %s", user->nick.c_str(), target.c_str(), reason.c_str());
+			ServerInstance->SNO.WriteToSnoMask('x', "{} removed K-line on {}: {}", user->nick, target, reason);
 		}
 		else
 		{
diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp
index 21713f669..cd075ea53 100644
--- a/src/coremods/core_xline/cmd_qline.cpp
+++ b/src/coremods/core_xline/cmd_qline.cpp
@@ -66,13 +66,13 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters)
 		{
 			if (!duration)
 			{
-				ServerInstance->SNO.WriteToSnoMask('x', "%s added a permanent Q-line on %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
+				ServerInstance->SNO.WriteToSnoMask('x', "{} added a permanent Q-line on {}: {}", user->nick, parameters[0], parameters[2]);
 			}
 			else
 			{
-				ServerInstance->SNO.WriteToSnoMask('x', "%s added a timed Q-line on %s, expires in %s (on %s): %s",
-					user->nick.c_str(), parameters[0].c_str(), Duration::ToString(duration).c_str(),
-					InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str());
+				ServerInstance->SNO.WriteToSnoMask('x', "{} added a timed Q-line on {}, expires in {} (on {}): {}",
+					user->nick, parameters[0], Duration::ToString(duration),
+					InspIRCd::TimeString(ServerInstance->Time() + duration), parameters[2]);
 			}
 			ServerInstance->XLines->ApplyLines();
 		}
@@ -88,7 +88,7 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters)
 
 		if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "Q", reason, user))
 		{
-			ServerInstance->SNO.WriteToSnoMask('x', "%s removed Q-line on %s: %s", user->nick.c_str(), parameters[0].c_str(), reason.c_str());
+			ServerInstance->SNO.WriteToSnoMask('x', "{} removed Q-line on {}: {}", user->nick, parameters[0], reason);
 		}
 		else
 		{
diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp
index 02f71cb7f..a4de0adc3 100644
--- a/src/coremods/core_xline/cmd_zline.cpp
+++ b/src/coremods/core_xline/cmd_zline.cpp
@@ -83,13 +83,13 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters)
 		{
 			if (!duration)
 			{
-				ServerInstance->SNO.WriteToSnoMask('x', "%s added a permanent Z-line on %s: %s", user->nick.c_str(), ipaddr, parameters[2].c_str());
+				ServerInstance->SNO.WriteToSnoMask('x', "{} added a permanent Z-line on {}: {}", user->nick, ipaddr, parameters[2]);
 			}
 			else
 			{
-				ServerInstance->SNO.WriteToSnoMask('x', "%s added a timed Z-line on %s, expires in %s (on %s): %s",
-					user->nick.c_str(), ipaddr, Duration::ToString(duration).c_str(),
-					InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str());
+				ServerInstance->SNO.WriteToSnoMask('x', "{} added a timed Z-line on {}, expires in {} (on {}): {}",
+					user->nick, ipaddr, Duration::ToString(duration),
+					InspIRCd::TimeString(ServerInstance->Time() + duration), parameters[2]);
 			}
 			ServerInstance->XLines->ApplyLines();
 		}
@@ -105,7 +105,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters)
 
 		if (ServerInstance->XLines->DelLine(target.c_str(), "Z", reason, user))
 		{
-			ServerInstance->SNO.WriteToSnoMask('x', "%s removed Z-line on %s: %s", user->nick.c_str(), target.c_str(), reason.c_str());
+			ServerInstance->SNO.WriteToSnoMask('x', "{} removed Z-line on {}: {}", user->nick, target, reason);
 		}
 		else
 		{
diff --git a/src/coremods/core_xline/core_xline.cpp b/src/coremods/core_xline/core_xline.cpp
index c99eeb577..6f0617176 100644
--- a/src/coremods/core_xline/core_xline.cpp
+++ b/src/coremods/core_xline/core_xline.cpp
@@ -43,8 +43,8 @@ bool InsaneBan::MatchesEveryone(const std::string& mask, MatcherBase& test, User
 	if (percent > itrigger)
 	{
 		const char* article = strchr("AEIOUaeiou", bantype) ? "an" : "a";
-		ServerInstance->SNO.WriteToSnoMask('x', "\002WARNING\002: %s tried to set add %s %c-line on %s which covers %.2f%% of the network which is more than the maximum of %.2f%%!",
-			user->nick.c_str(), article, bantype, mask.c_str(), percent, itrigger);
+		ServerInstance->SNO.WriteToSnoMask('x', "\002WARNING\002: {} tried to set add {} {}-line on {} which covers {:.2}% of the network which is more than the maximum of {:.2}%!",
+			user->nick.c_str(), article, bantype, mask, percent, itrigger);
 		user->WriteNotice(INSP_FORMAT("*** Unable to add {} {}-line on {} which covers {:.2}% of the network which is more than the maximum of {:.2}%!",
 			article, bantype, mask, percent, itrigger));
 		return true;
@@ -152,8 +152,8 @@ public:
 		// A Q-line matched the new nick, tell opers if the user is fully connected
 		if (user->IsFullyConnected())
 		{
-			ServerInstance->SNO.WriteGlobalSno('x', "Q-lined nickname %s from %s: %s",
-				newnick.c_str(), user->GetFullRealHost().c_str(), xline->reason.c_str());
+			ServerInstance->SNO.WriteGlobalSno('x', "Q-lined nickname {} from {}: {}",
+				newnick, user->GetFullRealHost(), xline->reason);
 		}
 
 		// Send a numeric because if we deny then the core doesn't reply anything