From 21e7efdadfa685ac1ddcb0a0a515502bc873302b Mon Sep 17 00:00:00 2001
From: Robby
Date: Sun, 17 Feb 2019 15:58:31 +0100
Subject: Various text improvements: consistency, syntax, help and doc
 updates/fixes.

---
 src/modules/m_svshold.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/modules/m_svshold.cpp')

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 73fde6582..daffdf7d9 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -96,7 +96,7 @@ class CommandSvshold : public Command
  public:
 	CommandSvshold(Module* Creator) : Command(Creator, "SVSHOLD", 1)
 	{
-		flags_needed = 'o'; this->syntax = "<nickname> [<duration> :<reason>]";
+		flags_needed = 'o'; this->syntax = "<nick> [<duration> :<reason>]";
 	}
 
 	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
-- 
cgit v1.3.1-10-gc9f91


From ff7bebe90c6b348b0df28864e4954d04bd17256b Mon Sep 17 00:00:00 2001
From: Matt Schatz
Date: Sun, 17 Feb 2019 02:20:56 -0700
Subject: X-line expiries: use the new DurationString() function.

---
 src/modules/m_svshold.cpp | 4 ++--
 src/xline.cpp             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/modules/m_svshold.cpp')

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index daffdf7d9..dbf621932 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -58,8 +58,8 @@ public:
 	{
 		if (!silent)
 		{
-			ServerInstance->SNO->WriteToSnoMask('x', "Removing expired SVSHOLD %s (set by %s %ld seconds ago): %s",
-				nickname.c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time), reason.c_str());
+			ServerInstance->SNO->WriteToSnoMask('x', "Removing expired SVSHOLD %s (set by %s %s ago): %s",
+				nickname.c_str(), source.c_str(), InspIRCd::DurationString(ServerInstance->Time() - set_time).c_str(), reason.c_str());
 		}
 	}
 
diff --git a/src/xline.cpp b/src/xline.cpp
index ccdc58dc2..c5b952087 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -682,8 +682,8 @@ void ELine::OnAdd()
 void XLine::DisplayExpiry()
 {
 	bool onechar = (type.length() == 1);
-	ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %ld seconds ago): %s",
-		type.c_str(), (onechar ? "-line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time), reason.c_str());
+	ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %s ago): %s",
+		type.c_str(), (onechar ? "-line" : ""), Displayable().c_str(), source.c_str(), InspIRCd::DurationString(ServerInstance->Time() - set_time).c_str(), reason.c_str());
 }
 
 const std::string& ELine::Displayable()
-- 
cgit v1.3.1-10-gc9f91