From 18678c6a22f72152b7dacc356c791868b4e170c4 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Mon, 28 Jan 2019 17:15:25 +0000
Subject: Add ParamMode::IsParameterSecret and remove special casing of keys.

---
 src/channels.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/channels.cpp')

diff --git a/src/channels.cpp b/src/channels.cpp
index e5fd7265e..760b5c4bd 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -436,7 +436,7 @@ void Channel::Write(ClientProtocol::Event& protoev, char status, const CUList& e
 	}
 }
 
-const char* Channel::ChanModes(bool showkey)
+const char* Channel::ChanModes(bool showsecret)
 {
 	static std::string scratch;
 	std::string sparam;
@@ -455,9 +455,9 @@ const char* Channel::ChanModes(bool showkey)
 			if (!pm)
 				continue;
 
-			if (n == 'k' - 65 && !showkey)
+			if (pm->IsParameterSecret() && !showsecret)
 			{
-				sparam += " <key>";
+				sparam += " <" + pm->name + ">";
 			}
 			else
 			{
-- 
cgit v1.3.1-10-gc9f91