msg: remove last vestiges of the fakelag system. charybdis has never supported fakelag.

[solanum.git] / modules / m_topic.c

diff --git a/modules/m_topic.c b/modules/m_topic.c
index c2c37f855b373e8c1df2e3abc14e7f2414001ae1..6ab83765c07c7ff4db29baaf03a9b5701e3d1401 100644 (file)
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -41,12 +41,13 @@
 #include "packet.h"
 #include "tgchange.h"
 #include "logger.h"
+#include "inline/stringops.h"
 
-static int m_topic(struct Client *, struct Client *, int, const char **);
-static int ms_topic(struct Client *, struct Client *, int, const char **);
+static int m_topic(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int 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}}
 };
 
@@ -59,7 +60,7 @@ DECLARE_MODULE_AV1(topic, NULL, NULL, topic_clist, NULL, NULL, "$Revision: 254 $
  *     parv[2] = new topic, if setting topic
  */
 static int
-m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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;
@@ -119,14 +120,20 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
                }
 
                if(((chptr->mode.mode & MODE_TOPICLIMIT) == 0 ||
-                                       get_channel_access(source_p, msptr, MODE_ADD, NULL) >= 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",
@@ -182,7 +189,7 @@ 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[])
+ms_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Channel *chptr = NULL;