client: refactor del_all_accepts to allow skipping own accept list

[solanum.git] / modules / m_topic.c

diff --git a/modules/m_topic.c b/modules/m_topic.c
index 15cc4756eaf8f609fc6804faedd5922c2f8859b7..214e4a94468885162e4e58d81473082a2f4763f0 100644 (file)
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_topic.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
@@ -40,25 +38,30 @@
 #include "modules.h"
 #include "packet.h"
 #include "tgchange.h"
+#include "logger.h"
+#include "inline/stringops.h"
+
+static const char topic_desc[] =
+       "Provides the TOPIC command to set, remove, and inspect channel topics";
 
-static int m_topic(struct Client *, struct Client *, int, const char **);
-static int ms_topic(struct Client *, struct Client *, int, const char **);
+static void m_topic(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_topic(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message topic_msgtab = {
-       "TOPIC", 0, 0, 0, MFLG_SLOW,
+       "TOPIC", 0, 0, 0, 0,
        {mg_unreg, {m_topic, 2}, {m_topic, 2}, {ms_topic, 5}, mg_ignore, {m_topic, 2}}
 };
 
 mapi_clist_av1 topic_clist[] = { &topic_msgtab, NULL };
-DECLARE_MODULE_AV1(topic, NULL, NULL, topic_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(topic, NULL, NULL, topic_clist, NULL, NULL, NULL, NULL, topic_desc);
 
 /*
  * m_topic
  *      parv[1] = channel name
  *     parv[2] = new topic, if setting topic
  */
-static int
-m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Channel *chptr = NULL;
        struct membership *msptr;
@@ -80,7 +83,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
                {
                        sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
                                        me.name, source_p->name, "TOPIC");
-                       return 0;
+                       return;
                }
        }
 
@@ -93,7 +96,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
        {
                sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
                                form_str(ERR_NOSUCHCHANNEL), name);
-               return 0;
+               return;
        }
 
        /* setting topic */
@@ -105,33 +108,39 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
                {
                        sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
                                        form_str(ERR_NOTONCHANNEL), name);
-                       return 0;
+                       return;
                }
 
                if(MyClient(source_p) && !is_chanop_voiced(msptr) &&
-                               !IsOper(source_p) &&
+                               !IsOperGeneral(source_p) &&
                                !add_channel_target(source_p, chptr))
                {
                        sendto_one(source_p, form_str(ERR_TARGCHANGE),
                                   me.name, source_p->name, chptr->chname);
-                       return 0;
+                       return;
                }
 
                if(((chptr->mode.mode & MODE_TOPICLIMIT) == 0 ||
-                                       get_channel_access(source_p, msptr) >= CHFL_CHANOP) &&
+                                       get_channel_access(source_p, chptr, msptr, MODE_ADD, NULL) >= CHFL_CHANOP) &&
                                (!MyClient(source_p) ||
                                 can_send(chptr, source_p, msptr)))
                {
+                       char topic[TOPICLEN + 1];
                        char topic_info[USERHOST_REPLYLEN];
-                       rb_sprintf(topic_info, "%s!%s@%s",
+                       rb_strlcpy(topic, parv[2], sizeof(topic));
+                       sprintf(topic_info, "%s!%s@%s",
                                        source_p->name, source_p->username, source_p->host);
-                       set_channel_topic(chptr, parv[2], topic_info, rb_current_time());
+
+                       if (ConfigChannel.strip_topic_colors)
+                               strip_colour(topic);
+
+                       set_channel_topic(chptr, topic, topic_info, rb_current_time());
 
                        sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
                                        ":%s TOPIC %s :%s",
                                        use_id(source_p), chptr->chname,
                                        chptr->topic == NULL ? "" : chptr->topic);
-                       sendto_channel_local(ALL_MEMBERS,
+                       sendto_channel_local(source_p, ALL_MEMBERS,
                                        chptr, ":%s!%s@%s TOPIC %s :%s",
                                        source_p->name, source_p->username,
                                        source_p->host, chptr->chname,
@@ -151,7 +160,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
                {
                        sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
                                        form_str(ERR_NOTONCHANNEL), name);
-                       return 0;
+                       return;
                }
                if(chptr->topic == NULL)
                        sendto_one(source_p, form_str(RPL_NOTOPIC),
@@ -163,11 +172,10 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 
                        sendto_one(source_p, form_str(RPL_TOPICWHOTIME),
                                        me.name, source_p->name, chptr->chname,
-                                       chptr->topic_info, chptr->topic_time);
+                                       chptr->topic_info,
+                                       (long long)chptr->topic_time);
                }
        }
-
-       return 0;
 }
 
 /*
@@ -179,19 +187,17 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
  *
  * Let servers always set a topic
  */
-static int
-ms_topic(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Channel *chptr = NULL;
 
        if((chptr = find_channel(parv[1])) == NULL)
-               return 0;
+               return;
 
        set_channel_topic(chptr, parv[4], parv[2], atoi(parv[3]));
 
-       sendto_channel_local(ALL_MEMBERS, chptr, ":%s TOPIC %s :%s",
-                            source_p->name, parv[1], 
+       sendto_channel_local(source_p, ALL_MEMBERS, chptr, ":%s TOPIC %s :%s",
+                            source_p->name, parv[1],
                             chptr->topic == NULL ? "" : chptr->topic);
-
-       return 0;
 }