Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

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

diff --git a/extensions/m_okick.c b/extensions/m_okick.c
index 2a47a2dba0f7abcad8631ea6e7fa3ad0c3094993..c09c42a074f150be1447ee9c113b663415437cd0 100644 (file)
--- a/extensions/m_okick.c
+++ b/extensions/m_okick.c
@@ -68,6 +68,7 @@ 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')
@@ -136,8 +137,11 @@ mo_okick(struct Client *client_p, struct Client *source_p, int parc, const char
        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(source_p) && chptr->mode.mode & MODE_NOREJOIN)
-               channel_metadata_time_add(chptr, text, rb_current_time());
+       if(MyClient(who) && chptr->mode.mode & MODE_NOREJOIN)
+               channel_metadata_time_add(chptr, text, rb_current_time(), "KICKNOREJOIN");
        return 0;
 }