Unify oper:{global,local}_kill

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

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index eb6056dae6c2f4850727d3b3043b8582c29584f1..b155677c6d0f2263a0c7b5cb04840e65ea178bce 100644 (file)
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -40,6 +40,7 @@
 #include "chmode.h"
 #include "ratelimit.h"
 #include "s_assert.h"
+#include "hook.h"
 
 static const char join_desc[] = "Provides the JOIN and TS6 SJOIN commands to facilitate joining and creating channels";
 
@@ -49,6 +50,7 @@ static void ms_sjoin(struct MsgBuf *, struct Client *, struct Client *, int, con
 
 static int h_can_create_channel;
 static int h_channel_join;
+static int h_channel_lowerts;
 
 struct Message join_msgtab = {
        "JOIN", 0, 0, 0, 0,
@@ -65,6 +67,7 @@ mapi_clist_av1 join_clist[] = { &join_msgtab, &sjoin_msgtab, NULL };
 mapi_hlist_av1 join_hlist[] = {
        { "can_create_channel", &h_can_create_channel },
        { "channel_join", &h_channel_join },
+       { "channel_lowerts", &h_channel_lowerts },
        { NULL, NULL },
 };
 
@@ -144,7 +147,6 @@ static void
 m_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        static char jbuf[BUFSIZE];
-       static char parabuf[MODEBUFLEN];
        struct Channel *chptr = NULL, *chptr2 = NULL;
        struct ConfItem *aconf;
        char *name;
@@ -207,7 +209,7 @@ m_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
                        continue;
                }
 
-               if(splitmode && !IsOper(source_p) && (*name != '&') &&
+               if(splitmode && !IsOperGeneral(source_p) && (*name != '&') &&
                   ConfigChannel.no_join_on_split)
                {
                        sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
@@ -267,7 +269,7 @@ m_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
                                continue;
                        }
 
-                       if(splitmode && !IsOper(source_p) && (*name != '&') &&
+                       if(splitmode && !IsOperGeneral(source_p) && (*name != '&') &&
                           ConfigChannel.no_create_on_split)
                        {
                                sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
@@ -318,7 +320,7 @@ m_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
                chptr = chptr2;
 
                if(flags == 0 &&
-                               !IsOper(source_p) && !IsExemptSpambot(source_p))
+                               !IsOperGeneral(source_p) && !IsExemptSpambot(source_p))
                        check_spambot_warning(source_p, name);
 
                /* add the user to the channel */
@@ -346,7 +348,7 @@ m_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
                        chptr->mode.mode |= ConfigChannel.autochanmodes;
                        modes = channel_modes(chptr, &me);
 
-                       sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s",
+                       sendto_channel_local(&me, ONLY_CHANOPS, chptr, ":%s MODE %s %s",
                                             me.name, chptr->chname, modes);
 
                        sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
@@ -435,7 +437,7 @@ ms_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        /* making a channel TS0 */
        if(!isnew && !newts && oldts)
        {
-               sendto_channel_local(ALL_MEMBERS, chptr,
+               sendto_channel_local(&me, ALL_MEMBERS, chptr,
                                     ":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to 0",
                                     me.name, chptr->chname, chptr->chname, (long) oldts);
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -467,7 +469,7 @@ ms_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                }
                /* If setting -j, clear join throttle state -- jilles */
                chptr->join_count = chptr->join_delta = 0;
-               sendto_channel_local(ALL_MEMBERS, chptr,
+               sendto_channel_local(&me, ALL_MEMBERS, chptr,
                                     ":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to %ld",
                                     me.name, chptr->chname, chptr->chname,
                                     (long) oldts, (long) newts);
@@ -475,7 +477,7 @@ ms_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                 * capitalization timestamped like modes are -- jilles */
                strcpy(chptr->chname, parv[2]);
                if(*modebuf != '\0')
-                       sendto_channel_local(ALL_MEMBERS, chptr,
+                       sendto_channel_local(source_p->servptr, ALL_MEMBERS, chptr,
                                             ":%s MODE %s %s %s",
                                             source_p->servptr->name,
                                             chptr->chname, modebuf, parabuf);
@@ -483,6 +485,12 @@ ms_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 
                /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
                set_channel_mlock(client_p, source_p, chptr, NULL, false);
+
+               hook_data_channel hookdata;
+               hookdata.client = source_p;
+               hookdata.chptr = chptr;
+
+               call_hook(h_channel_lowerts, &hookdata);
        }
 
        if(!IsMember(source_p, chptr))
@@ -616,7 +624,7 @@ ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 
        if(!isnew && !newts && oldts)
        {
-               sendto_channel_local(ALL_MEMBERS, chptr,
+               sendto_channel_local(&me, ALL_MEMBERS, chptr,
                                     ":%s NOTICE %s :*** Notice -- TS for %s "
                                     "changed from %ld to 0",
                                     me.name, chptr->chname, chptr->chname, (long) oldts);
@@ -732,7 +740,7 @@ ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
                                        'q', ALL_MEMBERS);
                chptr->bants++;
 
-               sendto_channel_local(ALL_MEMBERS, chptr,
+               sendto_channel_local(&me, ALL_MEMBERS, chptr,
                                     ":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to %ld",
                                     me.name, chptr->chname, chptr->chname,
                                     (long) oldts, (long) newts);
@@ -745,7 +753,7 @@ ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
        }
 
        if(*modebuf != '\0')
-               sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s %s %s",
+               sendto_channel_local(fakesource_p, ALL_MEMBERS, chptr, ":%s MODE %s %s %s",
                                     fakesource_p->name, chptr->chname, modebuf, parabuf);
 
        *modebuf = *parabuf = '\0';
@@ -852,7 +860,7 @@ ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
                                if(pargs >= MAXMODEPARAMS)
                                {
                                        *mbuf = '\0';
-                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                       sendto_channel_local(fakesource_p, ALL_MEMBERS, chptr,
                                                             ":%s MODE %s %s %s %s %s %s",
                                                             fakesource_p->name, chptr->chname,
                                                             modebuf,
@@ -876,7 +884,7 @@ ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
                if(pargs >= MAXMODEPARAMS)
                {
                        *mbuf = '\0';
-                       sendto_channel_local(ALL_MEMBERS, chptr,
+                       sendto_channel_local(fakesource_p, ALL_MEMBERS, chptr,
                                             ":%s MODE %s %s %s %s %s %s",
                                             fakesource_p->name,
                                             chptr->chname,
@@ -911,7 +919,7 @@ ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
        *mbuf = '\0';
        if(pargs)
        {
-               sendto_channel_local(ALL_MEMBERS, chptr,
+               sendto_channel_local(fakesource_p, ALL_MEMBERS, chptr,
                                     ":%s MODE %s %s %s %s %s %s",
                                     fakesource_p->name, chptr->chname, modebuf,
                                     para[0], CheckEmpty(para[1]),
@@ -958,12 +966,12 @@ do_join_0(struct Client *client_p, struct Client *source_p)
        while((ptr = source_p->user->channel.head))
        {
                if(MyConnect(source_p) &&
-                  !IsOper(source_p) && !IsExemptSpambot(source_p))
+                  !IsOperGeneral(source_p) && !IsExemptSpambot(source_p))
                        check_spambot_warning(source_p, NULL);
 
                msptr = ptr->data;
                chptr = msptr->chptr;
-               sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s",
+               sendto_channel_local(source_p, ALL_MEMBERS, chptr, ":%s!%s@%s PART %s",
                                     source_p->name,
                                     source_p->username, source_p->host, chptr->chname);
                remove_user_from_channel(msptr);
@@ -979,7 +987,7 @@ check_channel_name_loc(struct Client *source_p, const char *name)
        if(EmptyString(name))
                return false;
 
-       if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p))
+       if(ConfigFileEntry.disable_fake_channels && !IsOperGeneral(source_p))
        {
                for(p = name; *p; ++p)
                {
@@ -1203,7 +1211,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
                                if(count >= MAXMODEPARAMS)
                                {
                                        *mbuf = '\0';
-                                       sendto_channel_local(ALL_MEMBERS, chptr,
+                                       sendto_channel_local(source_p, ALL_MEMBERS, chptr,
                                                             ":%s MODE %s %s %s %s %s %s",
                                                             source_p->name, chptr->chname,
                                                             lmodebuf, lpara[0], lpara[1],
@@ -1235,7 +1243,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
                if(count >= MAXMODEPARAMS)
                {
                        *mbuf = '\0';
-                       sendto_channel_local(ALL_MEMBERS, chptr,
+                       sendto_channel_local(source_p, ALL_MEMBERS, chptr,
                                             ":%s MODE %s %s %s %s %s %s",
                                             source_p->name, chptr->chname, lmodebuf,
                                             lpara[0], lpara[1], lpara[2], lpara[3]);
@@ -1251,7 +1259,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
        if(count != 0)
        {
                *mbuf = '\0';
-               sendto_channel_local(ALL_MEMBERS, chptr,
+               sendto_channel_local(source_p, ALL_MEMBERS, chptr,
                                     ":%s MODE %s %s %s %s %s %s",
                                     source_p->name, chptr->chname, lmodebuf,
                                     EmptyString(lpara[0]) ? "" : lpara[0],
@@ -1301,7 +1309,7 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
                        *mbuf = '\0';
                        *(pbuf - 1) = '\0';
 
-                       sendto_channel_local(mems, chptr, "%s %s", lmodebuf, lparabuf);
+                       sendto_channel_local(source_p, mems, chptr, "%s %s", lmodebuf, lparabuf);
 
                        cur_len = mlen;
                        mbuf = lmodebuf + mlen;
@@ -1322,7 +1330,7 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
 
        *mbuf = '\0';
        *(pbuf - 1) = '\0';
-       sendto_channel_local(mems, chptr, "%s %s", lmodebuf, lparabuf);
+       sendto_channel_local(source_p, mems, chptr, "%s %s", lmodebuf, lparabuf);
 
        list->head = list->tail = NULL;
        list->length = 0;