From b63a7a4d22a9bd1698c0f76ac1219977489877ee Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Fri, 17 Jan 2025 17:36:47 +0000
Subject: [PATCH] Make /CBAN behave like documented.

---
 docs/conf/help.example.conf |  2 +-
 src/modules/m_cban.cpp      | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/conf/help.example.conf b/docs/conf/help.example.conf
index 283d79a28..696ec63ae 100644
--- a/docs/conf/help.example.conf
+++ b/docs/conf/help.example.conf
@@ -571,7 +571,7 @@ Sends a message to all users with the +g snomask.
 ">
 
 <helptopic key="cban" title="/CBAN <channelmask> [<duration> [:<reason>]]" value="
-Sets or removes a global channel based ban. You must specify all three parameters
+Sets or removes a global channel based ban. You must specify two or more parameters
 to add a ban, and one parameter to remove a ban (just the channelmask).
 
 The duration may be specified in seconds, or in the format
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 84576db23..d7cb4b0b2 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -125,26 +125,25 @@ public:
 		else
 		{
 			// Adding - XXX todo make this respect <insane> tag perhaps..
-			unsigned long duration;
-			if (!Duration::TryFrom(parameters[1], duration))
+			unsigned long duration = 0;
+			if (parameters.size() > 2 && !Duration::TryFrom(parameters[1], duration))
 			{
 				user->WriteNotice("*** Invalid duration for CBan.");
 				return CmdResult::FAILURE;
 			}
 
-			const char* reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied";
-			auto* r = new CBan(ServerInstance->Time(), duration, user->nick, reason, parameters[0]);
+			auto* r = new CBan(ServerInstance->Time(), duration, user->nick, parameters.back(), parameters[0]);
 			if (ServerInstance->XLines->AddLine(r, user))
 			{
 				if (!duration)
 				{
-					ServerInstance->SNO.WriteToSnoMask('x', "{} added a permanent CBan on {}: {}", user->nick, parameters[0], reason);
+					ServerInstance->SNO.WriteToSnoMask('x', "{} added a permanent CBan on {}: {}",
+						user->nick, parameters[0], r->reason);
 				}
 				else
 				{
 					ServerInstance->SNO.WriteToSnoMask('x', "{} added a timed CBan on {}, expires in {} (on {}): {}",
-						user->nick, parameters[0], Duration::ToString(duration),
-						Time::FromNow(duration), reason);
+						user->nick, parameters[0], Duration::ToString(duration), Time::FromNow(duration), r->reason);
 				}
 			}
 			else