X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/bb55ebebe997ccf503fda4a26936e10f18fb8723..0f4ed4058d737caede02d4522673cac27bfb26a5:/modules/m_list.c

diff --git a/modules/m_list.c b/modules/m_list.c
index bb3da499..246a8de7 100644
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -43,10 +43,14 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_serv.h"
+#include "supported.h"
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
+#include "inline/stringops.h"
+#include "s_assert.h"
+#include "logger.h"
 
 static rb_dlink_list safelisting_clients = { NULL, NULL, 0 };
 
@@ -56,13 +60,15 @@ static void _moddeinit(void);
 static int m_list(struct Client *, struct Client *, int, const char **);
 static int mo_list(struct Client *, struct Client *, int, const char **);
 
+static void list_one_channel(struct Client *source_p, struct Channel *chptr, int visible);
+
 static void safelist_check_cliexit(hook_data_client_exit * hdata);
 static void safelist_client_instantiate(struct Client *, struct ListClient *);
 static void safelist_client_release(struct Client *);
 static void safelist_one_channel(struct Client *source_p, struct Channel *chptr);
 static void safelist_iterate_client(struct Client *source_p);
 static void safelist_iterate_clients(void *unused);
-static void safelist_channel_named(struct Client *source_p, const char *name);
+static void safelist_channel_named(struct Client *source_p, const char *name, int operspy);
 
 struct Message list_msgtab = {
 	"LIST", 0, 0, 0, MFLG_SLOW,
@@ -84,12 +90,26 @@ static int _modinit(void)
 {
 	iterate_clients_ev = rb_event_add("safelist_iterate_clients", safelist_iterate_clients, NULL, 3);
 
+	/* ELIST=[tokens]:
+	 *
+	 * M = mask search
+	 * N = !mask search
+	 * U = user count search (< >)
+	 * C = creation time search (C> C<)
+	 * T = topic search (T> T<)
+	 */
+	add_isupport("SAFELIST", isupport_string, "");
+	add_isupport("ELIST", isupport_string, "CTU");
+
 	return 0;
 }
 
 static void _moddeinit(void)
 {
 	rb_event_delete(iterate_clients_ev);
+
+	delete_isupport("SAFELIST");
+	delete_isupport("ELIST");
 }
 
 static void safelist_check_cliexit(hook_data_client_exit * hdata)
@@ -141,9 +161,11 @@ static int m_list(struct Client *client_p, struct Client *source_p, int parc, co
  */
 static int mo_list(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	struct ListClient params;
-	char *p, *args;
+	struct ListClient *params;
+	char *p;
+	char *args = NULL;
 	int i;
+	int operspy = 0;
 
 	if (source_p->localClient->safelist_data != NULL)
 	{
@@ -152,19 +174,41 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c
 		return 0;
 	}
 
-	/* XXX rather arbitrary -- jilles */
-	params.users_min = 3;
-	params.users_max = INT_MAX;
-	params.operspy = 0;
-
-	if (parc > 1 && parv[1] != NULL && !IsChannelName(parv[1]))
+	if (parc > 1)
 	{
 		args = LOCAL_COPY(parv[1]);
+	}
+
+	if (args && *args == '!' && IsOperSpy(source_p))
+	{
+		args++;
+		report_operspy(source_p, "LIST", args);
+		operspy = 1;
+	}
+
+	/* Single channel. */
+	if (args && IsChannelName(args))
+	{
+		safelist_channel_named(source_p, args, operspy);
+		return 0;
+	}
 
+	/* Multiple channels, possibly with parameters. */
+	params = rb_malloc(sizeof(struct ListClient));
+
+	/* XXX rather arbitrary -- jilles */
+	params->users_min = 3;
+	params->users_max = INT_MAX;
+	params->operspy = operspy;
+	params->created_min = params->topic_min =
+		params->created_max = params->topic_max = 0;
+
+	if (args && !EmptyString(args))
+	{
 		/* Cancel out default minimum. */
-		params.users_min = 0;
+		params->users_min = 0;
 
-		for (i = 0; i < 2; i++)
+		for (i = 0; i < 7; i++)
 		{
 			if ((p = strchr(args, ',')) != NULL)
 				*p++ = '\0';
@@ -174,28 +218,64 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c
 				args++;
 				if (IsDigit(*args))
 				{
-					params.users_max = atoi(args);
-					if (params.users_max == 0)
-						params.users_max = INT_MAX;
+					params->users_max = atoi(args);
+					if (params->users_max == 0)
+						params->users_max = INT_MAX;
 					else
-						params.users_max--;
+						params->users_max--;
 				}
-				else
-					params.users_max = INT_MAX;
 			}
 			else if (*args == '>')
 			{
 				args++;
 				if (IsDigit(*args))
-					params.users_min = atoi(args) + 1;
+					params->users_min = atoi(args) + 1;
 				else
-					params.users_min = 0;
+					params->users_min = 0;
 			}
-			/* Only accept operspy as the first option. */
-			else if (*args == '!' && IsOperSpy(source_p) && i == 0)
+			else if (*args == 'C' || *args == 'c')
 			{
-				params.operspy = 1;
-				report_operspy(source_p, "LIST", p);
+				args++;
+				if (*args == '>')
+				{
+					/* Creation time earlier than last x minutes. */
+					args++;
+					if (IsDigit(*args))
+					{
+						params->created_max = rb_current_time() - (60 * atoi(args));
+					}
+				}
+				else if (*args == '<')
+				{
+					/* Creation time within last x minutes. */
+					args++;
+					if (IsDigit(*args))
+					{
+						params->created_min = rb_current_time() - (60 * atoi(args));
+					}
+				}
+			}
+			else if (*args == 'T' || *args == 't')
+			{
+				args++;
+				if (*args == '>')
+				{
+					/* Topic change time earlier than last x minutes. */
+					args++;
+					if (IsDigit(*args))
+					{
+						params->topic_max = rb_current_time() - (60 * atoi(args));
+					}
+				}
+				else if (*args == '<')
+				{
+					/* Topic change time within last x minutes. */
+					args++;
+					if (IsDigit(*args))
+					{
+						params->topic_min = rb_current_time() - (60 * atoi(args));
+					}
+				}
 			}
 
 			if (EmptyString(p))
@@ -204,17 +284,35 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c
 				args = p;
 		}
 	}
-	else if (parc > 1 && IsChannelName(parv[1]))
-	{
-		safelist_channel_named(source_p, parv[1]);
-		return 0;
-	}
 
-	safelist_client_instantiate(source_p, &params);
+	safelist_client_instantiate(source_p, params);
 
 	return 0;
 }
 
+/*
+ * list_one_channel()
+ *
+ * inputs       - client pointer, channel pointer, whether normally visible
+ * outputs      - none
+ * side effects - a channel is listed
+ */
+static void list_one_channel(struct Client *source_p, struct Channel *chptr,
+		int visible)
+{
+	char topic[TOPICLEN + 1];
+
+	if (chptr->topic != NULL)
+		rb_strlcpy(topic, chptr->topic, sizeof topic);
+	else
+		topic[0] = '\0';
+	strip_colour(topic);
+	sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name,
+		   visible ? "" : "!",
+		   chptr->chname, rb_dlink_list_length(&chptr->members),
+		   topic);
+}
+
 /*
  * safelist_sendq_exceeded()
  *
@@ -238,7 +336,7 @@ static int safelist_sendq_exceeded(struct Client *client_p)
  * safelist_client_instantiate()
  *
  * inputs       - pointer to Client to be listed,
- *                struct ListClient to copy for params
+ *                pointer to ListClient for params
  * outputs      - none
  * side effects - the safelist process begins for a
  *                client.
@@ -248,19 +346,10 @@ static int safelist_sendq_exceeded(struct Client *client_p)
  */
 static void safelist_client_instantiate(struct Client *client_p, struct ListClient *params)
 {
-	struct ListClient *self;
-
 	s_assert(MyClient(client_p));
 	s_assert(params != NULL);
 
-	self = rb_malloc(sizeof(struct ListClient));
-
-	self->hash_indice = 0;
-	self->users_min = params->users_min;
-	self->users_max = params->users_max;
-	self->operspy = params->operspy;
-
-	client_p->localClient->safelist_data = self;
+	client_p->localClient->safelist_data = params;
 
 	sendto_one(client_p, form_str(RPL_LISTSTART), me.name, client_p->name);
 
@@ -298,41 +387,40 @@ static void safelist_client_release(struct Client *client_p)
 /*
  * safelist_channel_named()
  *
- * inputs       - client pointer, channel name
+ * inputs       - client pointer, channel name, operspy
  * outputs      - none
  * side effects - a named channel is listed
  */
-static void safelist_channel_named(struct Client *source_p, const char *name)
+static void safelist_channel_named(struct Client *source_p, const char *name, int operspy)
 {
 	struct Channel *chptr;
 	char *p;
-	char *n = LOCAL_COPY(name);
+	int visible;
 
 	sendto_one(source_p, form_str(RPL_LISTSTART), me.name, source_p->name);
 
-	if ((p = strchr(n, ',')))
+	if ((p = strchr(name, ',')))
 		*p = '\0';
 
-	if (*n == '\0')
+	if (*name == '\0')
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), name);
 		sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
 		return;
 	}
 
-	chptr = find_channel(n);
+	chptr = find_channel(name);
 
 	if (chptr == NULL)
 	{
-		sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), n);
+		sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), name);
 		sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
 		return;
 	}
 
-	if (!SecretChannel(chptr) || IsMember(source_p, chptr))
-		sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name, "",
-			   chptr->chname, rb_dlink_list_length(&chptr->members),
-			   chptr->topic == NULL ? "" : chptr->topic);
+	visible = !SecretChannel(chptr) || IsMember(source_p, chptr);
+	if (visible || operspy)
+		list_one_channel(source_p, chptr, visible);
 
 	sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
 	return;
@@ -349,18 +437,31 @@ static void safelist_channel_named(struct Client *source_p, const char *name)
 static void safelist_one_channel(struct Client *source_p, struct Channel *chptr)
 {
 	struct ListClient *safelist_data = source_p->localClient->safelist_data;
+	int visible;
 
-	if (SecretChannel(chptr) && !IsMember(source_p, chptr) && !safelist_data->operspy)
+	visible = !SecretChannel(chptr) || IsMember(source_p, chptr);
+	if (!visible && !safelist_data->operspy)
 		return;
 
 	if ((unsigned int)chptr->members.length < safelist_data->users_min
 	    || (unsigned int)chptr->members.length > safelist_data->users_max)
 		return;
 
-	sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name,
-		   (safelist_data->operspy && SecretChannel(chptr)) ? "!" : "",
-		   chptr->chname, rb_dlink_list_length(&chptr->members),
-		   chptr->topic == NULL ? "" : chptr->topic);
+	if (safelist_data->topic_min && chptr->topic_time < safelist_data->topic_min)
+		return;
+
+	/* If a topic TS is provided, don't show channels without a topic set. */
+	if (safelist_data->topic_max && (chptr->topic_time > safelist_data->topic_max
+		|| chptr->topic_time == 0))
+		return;
+
+	if (safelist_data->created_min && chptr->channelts < safelist_data->created_min)
+		return;
+
+	if (safelist_data->created_max && chptr->channelts > safelist_data->created_max)
+		return;
+
+	list_one_channel(source_p, chptr, visible);
 }
 
 /*
@@ -383,7 +484,7 @@ static void safelist_iterate_client(struct Client *source_p)
 			return;
 		}
 
-		RB_DLINK_FOREACH(ptr, channelTable[iter].head) 
+		RB_DLINK_FOREACH(ptr, channelTable[iter].head)
 			safelist_one_channel(source_p, (struct Channel *) ptr->data);
 	}
 
@@ -394,6 +495,6 @@ static void safelist_iterate_clients(void *unused)
 {
 	rb_dlink_node *n, *n2;
 
-	RB_DLINK_FOREACH_SAFE(n, n2, safelisting_clients.head) 
+	RB_DLINK_FOREACH_SAFE(n, n2, safelisting_clients.head)
 		safelist_iterate_client((struct Client *)n->data);
 }