X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/03e24016fcfe496622c6b411fd8f3b6ce15ae84e..6e749518bbfc54d5ca30ae9d849d7b58c5e23f35:/modules/m_list.c

diff --git a/modules/m_list.c b/modules/m_list.c
index f668e73..ab05e40 100644
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -34,11 +34,10 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
@@ -47,7 +46,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "event.h"
 
 static rb_dlink_list safelisting_clients = { NULL, NULL, 0 };
 
@@ -126,14 +124,14 @@ static int m_list(struct Client *client_p, struct Client *source_p, int parc, co
 	if (parc < 2 || !IsChannelName(parv[1]))
 	{
 		/* pace this due to the sheer traffic involved */
-		if (((last_used + ConfigFileEntry.pace_wait) > CurrentTime))
+		if (((last_used + ConfigFileEntry.pace_wait) > rb_current_time()))
 		{
 			sendto_one(source_p, form_str(RPL_LOAD2HI), me.name, source_p->name, "LIST");
 			sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
 			return 0;
 		}
 		else
-			last_used = CurrentTime;
+			last_used = rb_current_time();
 	}
 
 	return mo_list(client_p, source_p, parc, parv);
@@ -251,7 +249,7 @@ static void safelist_client_instantiate(struct Client *client_p, struct ListClie
 	s_assert(MyClient(client_p));
 	s_assert(params != NULL);
 
-	self = MyMalloc(sizeof(struct ListClient));
+	self = rb_malloc(sizeof(struct ListClient));
 
 	self->hash_indice = 0;
 	self->users_min = params->users_min;
@@ -285,7 +283,7 @@ static void safelist_client_release(struct Client *client_p)
 
 	rb_dlinkFindDestroy(client_p, &safelisting_clients);
 
-	MyFree(client_p->localClient->safelist_data);
+	rb_free(client_p->localClient->safelist_data);
 
 	client_p->localClient->safelist_data = NULL;
 
@@ -326,7 +324,7 @@ static void safelist_channel_named(struct Client *source_p, const char *name)
 		return;
 	}
 
-	if (ShowChannel(source_p, chptr))
+	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);