ircd: send tags on every message

[solanum.git] / extensions / m_remove.c

diff --git a/extensions/m_remove.c b/extensions/m_remove.c
index e9a3e6460c551d4f7145c28ce3f3d63091b228c2..be2c24582c62ebda248fac6567893d18dbd43831 100644 (file)
--- a/extensions/m_remove.c
+++ b/extensions/m_remove.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_kick.c 3317 2007-03-28 23:17:06Z jilles $
  */
 
 #include "stdinc.h"
@@ -41,14 +39,16 @@
 #include "hook.h"
 #include "messages.h"
 
-unsigned int CAP_REMOVE;
-static char part_buf[REASONLEN + 1];
+static const char description[] = "Provides the REMOVE command, an alternative to KICK";
 
-static int m_remove(struct Client *, struct Client *, int, const char **);
+static void m_remove(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static void remove_quote_part(hook_data_privmsg_channel *);
 
+unsigned int CAP_REMOVE;
+static char part_buf[REASONLEN + 1];
+
 struct Message remove_msgtab = {
-       "REMOVE", 0, 0, 0, MFLG_SLOW,
+       "REMOVE", 0, 0, 0, 0,
        {mg_unreg, {m_remove, 3}, {m_remove, 3}, {m_remove, 3}, mg_ignore, {m_remove, 3}}
 };
 
@@ -57,25 +57,15 @@ mapi_hfn_list_av1 remove_hfnlist[] = {
        { "privmsg_channel", (hookfn) remove_quote_part },
        { NULL, NULL }
 };
+mapi_cap_list_av2 remove_cap_list[] = {
+       { MAPI_CAP_SERVER, "REMOVE", NULL, &CAP_REMOVE },
+       { 0, NULL, NULL, NULL }
+};
 
-static int
-modinit(void)
-{
-       CAP_REMOVE = capability_put(serv_capindex, "REMOVE");
-
-       return 0;
-}
+DECLARE_MODULE_AV2(remove, NULL, NULL, remove_clist, NULL, remove_hfnlist, remove_cap_list, NULL, description);
 
 static void
-moddeinit(void)
-{
-       capability_orphan(serv_capindex, "REMOVE");
-}
-
-DECLARE_MODULE_AV1(remove, modinit, moddeinit, remove_clist, NULL, remove_hfnlist, "$Revision: 3317 $");
-
-static int
-m_remove(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_remove(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct membership *msptr;
        struct Client *who;
@@ -100,7 +90,7 @@ m_remove(struct Client *client_p, struct Client *source_p, int parc, const char
        if(chptr == NULL)
        {
                sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL, form_str(ERR_NOSUCHCHANNEL), name);
-               return 0;
+               return;
        }
 
        if(!IsServer(source_p))
@@ -111,16 +101,16 @@ m_remove(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(get_channel_access(source_p, msptr, MODE_ADD) < CHFL_CHANOP)
+               if(get_channel_access(source_p, chptr, msptr, MODE_ADD, NULL) < CHFL_CHANOP)
                {
                        if(MyConnect(source_p))
                        {
                                sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
                                           me.name, source_p->name, name);
-                               return 0;
+                               return;
                        }
 
                        /* If its a TS 0 channel, do it the old way */
@@ -128,7 +118,7 @@ m_remove(struct Client *client_p, struct Client *source_p, int parc, const char
                        {
                                sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
                                           get_id(&me, source_p), get_id(source_p, source_p), name);
-                               return 0;
+                               return;
                        }
                }
 
@@ -161,7 +151,7 @@ m_remove(struct Client *client_p, struct Client *source_p, int parc, const char
 
        if(!(who = find_chasing(source_p, user, &chasing)))
        {
-               return 0;
+               return;
        }
 
        msptr = find_channel_membership(chptr, who);
@@ -172,7 +162,7 @@ m_remove(struct Client *client_p, struct Client *source_p, int parc, const char
                {
                        sendto_one(source_p, form_str(ERR_ISCHANSERVICE),
                                   me.name, source_p->name, who->name, chptr->chname);
-                       return 0;
+                       return;
                }
 
                if(MyClient(source_p))
@@ -189,7 +179,7 @@ m_remove(struct Client *client_p, struct Client *source_p, int parc, const char
                        call_hook(h_can_kick, &hookdata);
 
                        if (!hookdata.approved)
-                               return 0;
+                               return;
                }
 
                comment = LOCAL_COPY((EmptyString(parv[3])) ? who->name : parv[3]);
@@ -203,7 +193,7 @@ m_remove(struct Client *client_p, struct Client *source_p, int parc, const char
                 * - Personally, flame and I believe that server kicks shouldn't
                 *   be sent anyways.  Just waiting for some oper to abuse it...
                 */
-               sendto_channel_local(ALL_MEMBERS, chptr,
+               sendto_channel_local(who, ALL_MEMBERS, chptr,
                                     ":%s!%s@%s PART %s :requested by %s (%s)",
                                     who->name, who->username,
                                     who->host, name, source_p->name, comment);
@@ -220,8 +210,6 @@ m_remove(struct Client *client_p, struct Client *source_p, int parc, const char
        else if (MyClient(source_p))
                sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL,
                                   form_str(ERR_USERNOTINCHANNEL), user, name);
-
-       return 0;
 }
 
 static void