X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/550e851c5eee26dad124e3caa6e60b07ea575d5a..83f7888d72cf1faba78a4c9ed9df4780b11534b3:/modules/m_who.c

diff --git a/modules/m_who.c b/modules/m_who.c
index f0260830..d47d44bb 100644
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -22,7 +22,6 @@
  *  USA
  */
 #include "stdinc.h"
-#include "common.h"
 #include "client.h"
 #include "channel.h"
 #include "hash.h"
@@ -92,8 +91,14 @@ _moddeinit(void)
 	delete_isupport("WHOX");
 }
 
+int doing_who_show_idle_hook;
+
 mapi_clist_av1 who_clist[] = { &who_msgtab, NULL };
-DECLARE_MODULE_AV2(who, _modinit, _moddeinit, who_clist, NULL, NULL, NULL, NULL, who_desc);
+mapi_hlist_av1 who_hlist[] = {
+	{ "doing_who_show_idle", &doing_who_show_idle_hook },
+	{ NULL, NULL }
+};
+DECLARE_MODULE_AV2(who, _modinit, _moddeinit, who_clist, who_hlist, NULL, NULL, NULL, who_desc);
 
 /*
 ** m_who
@@ -193,7 +198,7 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 
 		if(chptr != NULL)
 		{
-			if (!IsOper(source_p) && !ratelimit_client_who(source_p, rb_dlink_list_length(&chptr->members)/50))
+			if (!IsOperGeneral(source_p) && !ratelimit_client_who(source_p, rb_dlink_list_length(&chptr->members)/50))
 			{
 				sendto_one(source_p, form_str(RPL_LOAD2HI),
 						me.name, source_p->name, "WHO");
@@ -219,7 +224,7 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 	/* '/who nick' */
 
 	if(((target_p = find_named_person(mask)) != NULL) &&
-	   (!server_oper || IsOper(target_p)))
+	   (!server_oper || SeesOper(target_p, source_p)))
 	{
 		int isinvis = 0;
 
@@ -255,7 +260,7 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 		flood_endgrace(source_p);
 
 	/* it has to be a global who at this point, limit it */
-	if(!IsOper(source_p))
+	if(!IsOperGeneral(source_p))
 	{
 		if((last_used + ConfigFileEntry.pace_wait) > rb_current_time() || !ratelimit_client(source_p, 1))
 		{
@@ -315,7 +320,7 @@ who_common_channel(struct Client *source_p, struct Channel *chptr,
 		if(!IsInvisible(target_p) || IsMarked(target_p))
 			continue;
 
-		if(server_oper && !IsOper(target_p))
+		if(server_oper && !SeesOper(target_p, source_p))
 			continue;
 
 		SetMark(target_p);
@@ -325,7 +330,7 @@ who_common_channel(struct Client *source_p, struct Channel *chptr,
 			if((mask == NULL) ||
 					match(mask, target_p->name) || match(mask, target_p->username) ||
 					match(mask, target_p->host) || match(mask, target_p->servptr->name) ||
-					(IsOper(source_p) && match(mask, target_p->orighost)) ||
+					(IsOperGeneral(source_p) && match(mask, target_p->orighost)) ||
 					match(mask, target_p->info))
 			{
 				do_who(source_p, target_p, NULL, fmt);
@@ -368,8 +373,12 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers
 			who_common_channel(source_p, msptr->chptr, mask, server_oper, &maxmatches, fmt);
 		}
 	}
-	else if (!ConfigFileEntry.operspy_dont_care_user_info)
-		report_operspy(source_p, "WHO", mask);
+	else
+	{
+		maxmatches = INT_MAX;
+		if (!ConfigFileEntry.operspy_dont_care_user_info)
+			report_operspy(source_p, "WHO", mask);
+	}
 
 	/* second, list all matching visible clients and clear all marks
 	 * on invisible clients
@@ -388,7 +397,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers
 			continue;
 		}
 
-		if(server_oper && !IsOper(target_p))
+		if(server_oper && !SeesOper(target_p, source_p))
 			continue;
 
 		if(maxmatches > 0)
@@ -396,7 +405,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers
 			if(!mask ||
 					match(mask, target_p->name) || match(mask, target_p->username) ||
 					match(mask, target_p->host) || match(mask, target_p->servptr->name) ||
-					(IsOper(source_p) && match(mask, target_p->orighost)) ||
+					(IsOperGeneral(source_p) && match(mask, target_p->orighost)) ||
 					match(mask, target_p->info))
 			{
 				do_who(source_p, target_p, NULL, fmt);
@@ -436,7 +445,7 @@ do_who_on_channel(struct Client *source_p, struct Channel *chptr,
 		msptr = ptr->data;
 		target_p = msptr->client_p;
 
-		if(server_oper && !IsOper(target_p))
+		if(server_oper && !SeesOper(target_p, source_p))
 			continue;
 
 		if(member || !IsInvisible(target_p))
@@ -489,14 +498,14 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt
 	const char *q;
 
 	sprintf(status, "%c%s%s",
-		   target_p->user->away ? 'G' : 'H', IsOper(target_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : "");
+		   target_p->user->away ? 'G' : 'H', SeesOper(target_p, source_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : "");
 
 	if (fmt->fields == 0)
 		sendto_one(source_p, form_str(RPL_WHOREPLY), me.name,
 			   source_p->name, msptr ? msptr->chptr->chname : "*",
 			   target_p->username, target_p->host,
 			   target_p->servptr->name, target_p->name, status,
-			   ConfigServerHide.flatten_links && !IsOper(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount,
+			   ConfigServerHide.flatten_links && !IsOperGeneral(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount,
 			   target_p->info);
 	else
 	{
@@ -526,9 +535,21 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt
 		if (fmt->fields & FIELD_FLAGS)
 			append_format(str, sizeof str, &pos, " %s", status);
 		if (fmt->fields & FIELD_HOP)
-			append_format(str, sizeof str, &pos, " %d", ConfigServerHide.flatten_links && !IsOper(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount);
+			append_format(str, sizeof str, &pos, " %d", ConfigServerHide.flatten_links && !IsOperGeneral(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount);
 		if (fmt->fields & FIELD_IDLE)
-			append_format(str, sizeof str, &pos, " %d", (int)(MyClient(target_p) ? rb_current_time() - target_p->localClient->last : 0));
+		{
+			/* fire the doing_who_show_idle hook to allow modules to tell us whether to show the idle time */
+	                hook_data_client_approval hdata_showidle;
+
+	                hdata_showidle.client = source_p;
+	                hdata_showidle.target = target_p;
+	                hdata_showidle.approved = WHOIS_IDLE_SHOW;
+
+			call_hook(doing_who_show_idle_hook, &hdata_showidle);
+
+			append_format(str, sizeof str, &pos, " %d",
+				hdata_showidle.approved ? (int)(MyClient(target_p) ? rb_current_time() - target_p->localClient->last : 0) : 0);
+		}
 		if (fmt->fields & FIELD_ACCOUNT)
 		{
 			/* display as in whois */