Fix mode error messages when the character has been remapped.

5 files changed, 12 insertions, 6 deletions

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 0c39d3663..18cead382 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -174,7 +174,8 @@ public:
 			joinfloodsettings* f = jf.ext.Get(chan);
 			if (f && f->islocked())
 			{
-				user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, "This channel is temporarily unavailable (+j is set). Please try again later.");
+				user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, INSP_FORMAT("This channel is temporarily unavailable (+{} is set). Please try again later.",
+					jf.GetModeChar()));
 				return MOD_RES_DENY;
 			}
 		}
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 8634fca10..1e210d8dd 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -145,7 +145,8 @@ public:
 			const KickRejoinData* data = kr.ext.Get(chan);
 			if ((data) && !invapi->IsInvited(user, chan) && (!data->canjoin(user)))
 			{
-				user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, INSP_FORMAT("You must wait {} seconds after being kicked to rejoin (+J is set)", data->delay));
+				user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, INSP_FORMAT("You must wait {} seconds after being kicked to rejoin (+{} is set)",
+					data->delay, kr.GetModeChar()));
 				return MOD_RES_DENY;
 			}
 		}
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 41995c14f..862240c02 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -97,7 +97,8 @@ public:
 	{
 		if (!override && chan && chan->IsModeSet(oc) && !user->IsOper())
 		{
-			user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, INSP_FORMAT("Only server operators may join {} (+O is set)", chan->name));
+			user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, INSP_FORMAT("Only server operators may join {} (+{} is set)",
+				chan->name, oc.GetModeChar()));
 			return MOD_RES_DENY;
 		}
 		return MOD_RES_PASSTHRU;
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 864429b04..192a4a104 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -143,7 +143,8 @@ public:
 		else
 		{
 			/* m_nokicks.so was loaded and +Q was set, block! */
-			user->WriteNumeric(ERR_RESTRICTED, channel->name, INSP_FORMAT("Can't remove user {} from channel (+Q is set)", target->nick));
+			user->WriteNumeric(ERR_RESTRICTED, channel->name, INSP_FORMAT("Can't remove user {} from channel (+{} is set)",
+				target->nick, servprotectmode->GetModeChar()));
 			return CmdResult::FAILURE;
 		}
 
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 44723038d..d5037b195 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -180,13 +180,15 @@ public:
 		{
 			if (!api)
 			{
-				user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; unable to determine if you are a TLS user (+z is set)");
+				user->WriteNumeric(ERR_SECUREONLYCHAN, cname, INSP_FORMAT("Cannot join channel; unable to determine if you are a TLS user (+{} is set)",
+					sslm.GetModeChar()));
 				return MOD_RES_DENY;
 			}
 
 			if (!api->IsSecure(user))
 			{
-				user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; TLS users only (+z is set)");
+				user->WriteNumeric(ERR_SECUREONLYCHAN, cname, INSP_FORMAT("Cannot join channel; TLS users only (+{} is set)",
+					sslm.GetModeChar()));
 				return MOD_RES_DENY;
 			}
 		}