X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/be2d3c114fce653505ee3b202b40e1d6ce8750e7..8097430a810ac1535fe5304f74991b16ff58b064:/modules/m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index 91c88c4..ed0d799 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -242,6 +242,11 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 	int extra_space = 0;
 	int i;
 	char *m;
+	int showsecret = 0;
+	struct Metadata *md;
+
+	if(ConfigFileEntry.secret_channels_in_whois && IsOperSpy(source_p))
+		showsecret = 1;
 
 	if(target_p->user == NULL)
 	{
@@ -281,7 +286,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
 			visible = ShowChannel(source_p, chptr);
 
-			if(visible || operspy)
+			if(visible || operspy || showsecret)
 			{
 				if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5))
 				{
@@ -291,7 +296,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 				}
 
 				tlen = rb_sprintf(t, "%s%s%s ",
-						visible ? "" : "!",
+						visible ? "" : "*",
 						find_channel_status(msptr, 1),
 						chptr->chname);
 				t += tlen;
@@ -313,11 +318,16 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
 	if(IsOper(target_p))
 	{
-		sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
-				   target_p->name,
-				   IsService(target_p) ? ConfigFileEntry.servicestring :
-				   (IsAdmin(target_p) ? GlobalSetOptions.adminstring :
-				    GlobalSetOptions.operstring));
+		if(md = user_metadata_find(target_p, "OPERSTRING"))
+			sendto_one_numeric(source_p, 313, "%s :%s", target_p->name, md->value);
+		else
+			sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
+					target_p->name,
+					IsService(target_p) ? ConfigFileEntry.servicestring :
+				  	(IsAdmin(target_p) ? GlobalSetOptions.adminstring :
+				  	GlobalSetOptions.operstring));
+		if(md = user_metadata_find(target_p, "SWHOIS"))
+			sendto_one_numeric(source_p, 320, "%s :%s", target_p->name, md->value);
 	}
 
 	if(IsSSLClient(target_p))
@@ -333,18 +343,20 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 		sendto_one_numeric(source_p, RPL_WHOISBOT,
 				form_str(RPL_WHOISBOT),
 				target_p->name);
+	if(IsOper(source_p))
+	{
+		m = buf;
+		*m++ = '+';
 
-	m = buf;
-	*m++ = '+';
-
-	for (i = 0; i < 128; i++) /* >= 127 is extended ascii */
-		if (target_p->umodes & user_modes[i])
-			*m++ = (char) i;
-			*m = '\0';
+		for (i = 0; i < 128; i++) /* >= 127 is extended ascii */
+			if (target_p->umodes & user_modes[i])
+				*m++ = (char) i;
+				*m = '\0';
 
-	sendto_one_numeric(source_p, RPL_WHOISMODES,
-			form_str(RPL_WHOISMODES),
-			target_p->name, buf);
+		sendto_one_numeric(source_p, RPL_WHOISMODES,
+				form_str(RPL_WHOISMODES),
+				target_p->name, buf);
+	}
 
 	if(MyClient(target_p))
 	{