<clarkson>Now its time to do the NOOZ.</clarkson>

[irc/rqf/shadowircd.git] / extensions / m_okick.c

diff --git a/extensions/m_okick.c b/extensions/m_okick.c
index 8fd76437d63e42289fbdcb94f1526da3ad50a65f..c09c42a074f150be1447ee9c113b663415437cd0 100644 (file)
--- a/extensions/m_okick.c
+++ b/extensions/m_okick.c
@@ -20,14 +20,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_okick.c 3117 2007-01-02 13:11:04Z jilles $
+ *  $Id: m_okick.c 3554 2007-08-10 22:31:14Z jilles $
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -49,11 +48,10 @@ struct Message okick_msgtab = {
 
 mapi_clist_av1 okick_clist[] = { &okick_msgtab, NULL };
 
-DECLARE_MODULE_AV1(okick, NULL, NULL, okick_clist, NULL, NULL, "$Revision: 3117 $");
+DECLARE_MODULE_AV1(okick, NULL, NULL, okick_clist, NULL, NULL, "$Revision: 3554 $");
 
 /*
 ** m_okick
-**      parv[0] = sender prefix
 **      parv[1] = channel
 **      parv[2] = client to kick
 **      parv[3] = kick comment
@@ -70,11 +68,12 @@ mo_okick(struct Client *client_p, struct Client *source_p, int parc, const char
        char *name;
        char *p = NULL;
        char *user;
+       char *text = rb_strdup("");
        static char buf[BUFSIZE];
 
        if(*parv[2] == '\0')
        {
-               sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "KICK");
+               sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS), me.name, source_p->name, "KICK");
                return 0;
        }
 
@@ -109,14 +108,14 @@ mo_okick(struct Client *client_p, struct Client *source_p, int parc, const char
 
        if((target_p = find_client(user)) == NULL)
        {
-               sendto_one(source_p, form_str(ERR_NOSUCHNICK), me.name, parv[0], user);
+               sendto_one(source_p, form_str(ERR_NOSUCHNICK), me.name, source_p->name, user);
                return 0;
        }
 
        if((msptr = find_channel_membership(chptr, target_p)) == NULL)
        {
                sendto_one(source_p, form_str(ERR_USERNOTINCHANNEL),
-                          me.name, parv[0], parv[1], parv[2]);
+                          me.name, source_p->name, parv[1], parv[2]);
                return 0;
        }
 
@@ -135,8 +134,14 @@ mo_okick(struct Client *client_p, struct Client *source_p, int parc, const char
 
        sendto_channel_local(ALL_MEMBERS, chptr, ":%s KICK %s %s :%s",
                             me.name, chptr->chname, who->name, comment);
-       sendto_server(&me, chptr, NOCAPS, NOCAPS,
-                     ":%s KICK %s %s :%s", me.name, chptr->chname, who->name, comment);
+       sendto_server(&me, chptr, CAP_TS6, NOCAPS,
+                     ":%s KICK %s %s :%s", me.id, chptr->chname, who->id, comment);
        remove_user_from_channel(msptr);
+
+       rb_sprintf(text, "K%s", who->id);
+
+       /* we don't need to track NOREJOIN stuff unless it's our client being kicked */
+       if(MyClient(who) && chptr->mode.mode & MODE_NOREJOIN)
+               channel_metadata_time_add(chptr, text, rb_current_time(), "KICKNOREJOIN");
        return 0;
 }