X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/7cc7a2c041e01b98f5569e11c8d7da7350a93439..6c7315ec36fd3e74da6a0220c04625bd23c31596:/modules/m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index 950dbfa..3fc8f12 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_whois.c 3536 2007-07-14 21:50:21Z jilles $
  */
 
 #include "stdinc.h"
@@ -43,6 +42,7 @@
 #include "modules.h"
 #include "hook.h"
 #include "s_newconf.h"
+#include "s_user.h"
 
 static void do_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static void single_whois(struct Client *source_p, struct Client *target_p, int operspy);
@@ -228,7 +228,6 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
 static void
 single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 {
-	const char *awaymsg;
 	char buf[BUFSIZE];
 	rb_dlink_node *ptr;
 	struct membership *msptr;
@@ -240,8 +239,13 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 	hook_data_client hdata;
 	int visible;
 	int extra_space = 0;
-	struct DictionaryIter iter;
-	struct MetadataEntry *md;
+	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 +285,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 +295,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;
@@ -307,22 +311,51 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 			   target_p->name, target_p->servptr->name,
 			   target_p->servptr->info);
 
-	if((awaymsg = get_metadata(target_p, "away")) != NULL)
+	if(target_p->user->away)
 		sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
-				   target_p->name, awaymsg);
+				   target_p->name, target_p->user->away);
 
 	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")) != NULL)
+			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")) != NULL)
+			sendto_one_numeric(source_p, 320, "%s :%s", target_p->name, md->value);
 	}
 
 	if(IsSSLClient(target_p))
 		sendto_one_numeric(source_p, RPL_WHOISSECURE, form_str(RPL_WHOISSECURE),
 				   target_p->name);
+	if((source_p == target_p || IsOper(source_p)) &&
+			target_p->certfp != NULL)
+		sendto_one_numeric(source_p, RPL_WHOISCERTFP,
+				form_str(RPL_WHOISCERTFP),
+				target_p->name, target_p->certfp);
+
+	if(IsSetBot(target_p))
+		sendto_one_numeric(source_p, RPL_WHOISBOT,
+				form_str(RPL_WHOISBOT),
+				target_p->name);
+	if(IsOper(source_p))
+	{
+		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';
+
+		sendto_one_numeric(source_p, RPL_WHOISMODES,
+				form_str(RPL_WHOISMODES),
+				target_p->name, buf);
+	}
 
 	if(MyClient(target_p))
 	{
@@ -369,17 +402,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 		}
 	}
 
-	DICTIONARY_FOREACH(md, &iter, target_p->user->metadata)
-	{
-		/* XXX: hack around "away" for legacy clients. --nenolod */
-		if (!irccmp(md->key, "away"))
-			continue;
-
-		sendto_one_numeric(source_p, RPL_WHOISMETADATA,
-				   form_str(RPL_WHOISMETADATA),
-				   target_p->name, md->key, md->value);
-	}
-
 	hdata.client = source_p;
 	hdata.target = target_p;