Add Duration::ToHuman and update messages to use it.

6 files changed, 7 insertions, 7 deletions

diff --git a/src/coremods/core_oper/core_oper.cpp b/src/coremods/core_oper/core_oper.cpp
index 5363d9ae4..a34219e01 100644
--- a/src/coremods/core_oper/core_oper.cpp
+++ b/src/coremods/core_oper/core_oper.cpp
@@ -217,7 +217,7 @@ public:
 					std::string extra;
 					if (oper->IsAway())
 					{
-						const std::string awayperiod = Duration::ToString(ServerInstance->Time() - oper->away->time);
+						const std::string awayperiod = Duration::ToHuman(ServerInstance->Time() - oper->away->time);
 						const std::string awaytime = Time::ToString(oper->away->time);
 
 						extra = INSP_FORMAT(": away for {} [since {}] ({})", awayperiod, awaytime, oper->away->message);
@@ -226,7 +226,7 @@ public:
 					auto* loper = IS_LOCAL(oper);
 					if (loper)
 					{
-						const std::string idleperiod = Duration::ToString(ServerInstance->Time() - loper->idle_lastmsg);
+						const std::string idleperiod = Duration::ToHuman(ServerInstance->Time() - loper->idle_lastmsg);
 						const std::string idletime = Time::ToString(loper->idle_lastmsg);
 
 						extra += INSP_FORMAT("{} idle for {} [since {}]",  extra.empty() ? ':' : ',', idleperiod, idletime);
diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp
index c51081074..61e407ec2 100644
--- a/src/coremods/core_xline/cmd_eline.cpp
+++ b/src/coremods/core_xline/cmd_eline.cpp
@@ -83,7 +83,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters)
 			else
 			{
 				ServerInstance->SNO.WriteToSnoMask('x', "{} added a timed E-line on {}, expires in {} (on {}): {}",
-					user->nick, target, Duration::ToString(duration), Time::FromNow(duration), el->reason);
+					user->nick, target, Duration::ToHuman(duration), Time::FromNow(duration), el->reason);
 			}
 		}
 		else
diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp
index bf90946e0..59a393b5e 100644
--- a/src/coremods/core_xline/cmd_gline.cpp
+++ b/src/coremods/core_xline/cmd_gline.cpp
@@ -90,7 +90,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters)
 			else
 			{
 				ServerInstance->SNO.WriteToSnoMask('x', "{} added a timed G-line on {}, expires in {} (on {}): {}",
-					user->nick, target, Duration::ToString(duration), Time::FromNow(duration), gl->reason);
+					user->nick, target, Duration::ToHuman(duration), Time::FromNow(duration), gl->reason);
 			}
 
 			ServerInstance->XLines->ApplyLines();
diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp
index 46917d45f..68d5e8e62 100644
--- a/src/coremods/core_xline/cmd_kline.cpp
+++ b/src/coremods/core_xline/cmd_kline.cpp
@@ -90,7 +90,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters)
 			else
 			{
 				ServerInstance->SNO.WriteToSnoMask('x', "{} added a timed K-line on {}, expires in {} (on {}): {}",
-					user->nick, target, Duration::ToString(duration), Time::FromNow(duration), kl->reason);
+					user->nick, target, Duration::ToHuman(duration), Time::FromNow(duration), kl->reason);
 			}
 
 			ServerInstance->XLines->ApplyLines();
diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp
index 1b107d613..e8327d702 100644
--- a/src/coremods/core_xline/cmd_qline.cpp
+++ b/src/coremods/core_xline/cmd_qline.cpp
@@ -72,7 +72,7 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters)
 			else
 			{
 				ServerInstance->SNO.WriteToSnoMask('x', "{} added a timed Q-line on {}, expires in {} (on {}): {}",
-					user->nick, parameters[0], Duration::ToString(duration), Time::FromNow(duration), ql->reason);
+					user->nick, parameters[0], Duration::ToHuman(duration), Time::FromNow(duration), ql->reason);
 			}
 			ServerInstance->XLines->ApplyLines();
 		}
diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp
index 54ce96c98..6bd909932 100644
--- a/src/coremods/core_xline/cmd_zline.cpp
+++ b/src/coremods/core_xline/cmd_zline.cpp
@@ -89,7 +89,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters)
 			else
 			{
 				ServerInstance->SNO.WriteToSnoMask('x', "{} added a timed Z-line on {}, expires in {} (on {}): {}",
-					user->nick, ipaddr, Duration::ToString(duration), Time::FromNow(duration), zl->reason);
+					user->nick, ipaddr, Duration::ToHuman(duration), Time::FromNow(duration), zl->reason);
 			}
 			ServerInstance->XLines->ApplyLines();
 		}