m_info: Correct description of general::client_exit like in example confs.

[solanum.git] / modules / m_list.c

diff --git a/modules/m_list.c b/modules/m_list.c
index d60c832840418b94516db3bd377ba6220f8fceb4..2737282fb408f9ef7e52c5afd7a222ca2ce532e0 100644 (file)
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -48,6 +48,7 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
+#include "inline/stringops.h"
 
 static rb_dlink_list safelisting_clients = { NULL, NULL, 0 };
 
@@ -57,6 +58,8 @@ 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 *);
@@ -285,6 +288,29 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c
        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()
  *
@@ -367,6 +393,7 @@ static void safelist_channel_named(struct Client *source_p, const char *name, in
 {
        struct Channel *chptr;
        char *p;
+       int visible;
 
        sendto_one(source_p, form_str(RPL_LISTSTART), me.name, source_p->name);
 
@@ -389,11 +416,9 @@ static void safelist_channel_named(struct Client *source_p, const char *name, in
                return;
        }
 
-       if (!SecretChannel(chptr) || IsMember(source_p, chptr) || operspy)
-               sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name,
-                          (operspy && SecretChannel(chptr)) ? "!" : "",
-                          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;
@@ -410,8 +435,10 @@ static void safelist_channel_named(struct Client *source_p, const char *name, in
 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
@@ -432,10 +459,7 @@ static void safelist_one_channel(struct Client *source_p, struct Channel *chptr)
        if (safelist_data->created_max && chptr->channelts > safelist_data->created_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);
+       list_one_channel(source_p, chptr, visible);
 }
 
 /*