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

[solanum.git] / modules / core / m_part.c

diff --git a/modules/core/m_part.c b/modules/core/m_part.c
index b0cd6b08baf4034510b0e69e76b80fbc96eab853..95e3e66f7058725e36e6b1bb26e556574e227a7c 100644 (file)
--- a/modules/core/m_part.c
+++ b/modules/core/m_part.c
@@ -40,11 +40,12 @@
 #include "s_conf.h"
 #include "packet.h"
 #include "inline/stringops.h"
+#include "hook.h"
 
-static int m_part(struct Client *, struct Client *, int, const char **);
+static int m_part(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message part_msgtab = {
-       "PART", 0, 0, 0, MFLG_SLOW,
+       "PART", 0, 0, 0, 0,
        {mg_unreg, {m_part, 2}, {m_part, 2}, mg_ignore, mg_ignore, {m_part, 2}}
 };
 
@@ -53,17 +54,19 @@ mapi_clist_av1 part_clist[] = { &part_msgtab, NULL };
 DECLARE_MODULE_AV1(part, NULL, NULL, part_clist, NULL, NULL, "$Revision: 98 $");
 
 static void part_one_client(struct Client *client_p,
-                           struct Client *source_p, char *name, char *reason);
+                           struct Client *source_p, char *name,
+                           const char *reason);
+static int can_send_part(struct Client *source_p, struct Channel *chptr, struct membership *msptr);
+static int do_message_hook(struct Client *source_p, struct Channel *chptr, const char **reason);
 
 
 /*
 ** m_part
-**      parv[0] = sender prefix
 **      parv[1] = channel
 **      parv[2] = reason
 */
 static int
-m_part(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_part(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        char *p, *name;
        char reason[REASONLEN + 1];
@@ -95,14 +98,13 @@ m_part(struct Client *client_p, struct Client *source_p, int parc, const char *p
  *             - pointer to source client to remove
  *             - char pointer of name of channel to remove from
  * output      - none
- * side effects        - remove ONE client given the channel name 
+ * side effects        - remove ONE client given the channel name
  */
 static void
-part_one_client(struct Client *client_p, struct Client *source_p, char *name, char *reason)
+part_one_client(struct Client *client_p, struct Client *source_p, char *name, const char *reason)
 {
        struct Channel *chptr;
        struct membership *msptr;
-       char reason2[BUFSIZE];
 
        if((chptr = find_channel(name)) == NULL)
        {
@@ -124,17 +126,13 @@ part_one_client(struct Client *client_p, struct Client *source_p, char *name, ch
         *  Remove user from the old channel (if any)
         *  only allow /part reasons in -m chans
         */
-       if(reason[0] && (is_chanop(msptr) || !MyConnect(source_p) ||
-                        ((can_send(chptr, source_p, msptr) > 0 &&
-                          (source_p->localClient->firsttime +
-                           ConfigFileEntry.anti_spam_exit_message_time) < rb_current_time()))))
+       if(!EmptyString(reason) &&
+               (!MyConnect(source_p) ||
+                (can_send_part(source_p, chptr, msptr) && do_message_hook(source_p, chptr, &reason))
+               )
+         )
        {
-               if(chptr->mode.mode & MODE_NOCOLOR)
-               {
-                       rb_strlcpy(reason2, reason, BUFSIZE);
-                       strip_colour(reason2);
-                       reason = reason2;
-               }
+
                sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
                              ":%s PART %s :%s", use_id(source_p), chptr->chname, reason);
                sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s :%s",
@@ -151,3 +149,59 @@ part_one_client(struct Client *client_p, struct Client *source_p, char *name, ch
        }
        remove_user_from_channel(msptr);
 }
+
+/*
+ * can_send_part - whether a part message can be sent.
+ *
+ * inputs:
+ *    - client parting
+ *    - channel being parted
+ *    - membership pointer
+ * outputs:
+ *    - 1 if message allowed
+ *    - 0 if message denied
+ * side effects:
+ *    - none.
+ */
+static int
+can_send_part(struct Client *source_p, struct Channel *chptr, struct membership *msptr)
+{
+       if (!can_send(chptr, source_p, msptr))
+               return 0;
+       /* Allow chanops to bypass anti_spam_exit_message_time for part messages. */
+       if (is_chanop(msptr))
+               return 1;
+       return (source_p->localClient->firsttime + ConfigFileEntry.anti_spam_exit_message_time) < rb_current_time();
+}
+
+/*
+ * do_message_hook - execute the message hook on a part message reason.
+ *
+ * inputs:
+ *    - client parting
+ *    - channel being parted
+ *    - pointer to reason
+ * outputs:
+ *    - 1 if message is allowed
+ *    - 0 if message is denied or message is now empty
+ * side effects:
+ *    - reason may be modified.
+ */
+static int
+do_message_hook(struct Client *source_p, struct Channel *chptr, const char **reason)
+{
+       hook_data_privmsg_channel hdata;
+
+       hdata.msgtype = MESSAGE_TYPE_PART;
+       hdata.source_p = source_p;
+       hdata.chptr = chptr;
+       hdata.text = *reason;
+       hdata.approved = 0;
+
+       call_hook(h_privmsg_channel, &hdata);
+
+       /* The reason may have been changed by a hook... */
+       *reason = hdata.text;
+
+       return (hdata.approved == 0 && !EmptyString(*reason));
+}