X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/8afeb720972cb6e862052ae5655ee46b13e7c5f9..8ee12f0c437eec8aa42af7b350c7e2a3ccafedbc:/modules/core/m_join.c?ds=sidebyside diff --git a/modules/core/m_join.c b/modules/core/m_join.c index 2ff9c9fa..b72f8303 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -40,6 +40,7 @@ #include "parse.h" #include "modules.h" #include "packet.h" +#include "chmode.h" static int m_join(struct Client *, struct Client *, int, const char **); static int ms_join(struct Client *, struct Client *, int, const char **); @@ -136,6 +137,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p struct ConfItem *aconf; char *name; char *key = NULL; + const char *modes; int i, flags = 0; char *p = NULL, *p2 = NULL; char *chanlist; @@ -302,11 +304,18 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) || (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL)) { - sendto_one(source_p, form_str(i), me.name, source_p->name, name); + /* might be wrong, but is there any other better location for such? + * see extensions/chm_operonly.c for other comments on this + * -- dwr + */ + if(i != ERR_CUSTOM) + sendto_one(source_p, form_str(i), me.name, source_p->name, name); + if(successful_join_count > 0) successful_join_count--; continue; } + sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); } @@ -333,17 +342,15 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p chptr->channelts = rb_current_time(); chptr->mode.mode |= MODE_TOPICLIMIT; chptr->mode.mode |= MODE_NOPRIVMSGS; + modes = channel_modes(chptr, &me); - sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s +nt", - me.name, chptr->chname); + sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s", + me.name, chptr->chname, modes); - if(*chptr->chname == '#') - { - sendto_server(client_p, chptr, CAP_TS6, NOCAPS, - ":%s SJOIN %ld %s +nt :@%s", - me.id, (long) chptr->channelts, - chptr->chname, source_p->id); - } + sendto_server(client_p, chptr, CAP_TS6, NOCAPS, + ":%s SJOIN %ld %s %s :@%s", + me.id, (long) chptr->channelts, + chptr->chname, modes, source_p->id); } else { @@ -381,14 +388,11 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p /* * ms_join - * - * inputs - - * output - none - * side effects - handles remote JOIN's sent by servers. In TSora - * remote clients are joined using SJOIN, hence a - * JOIN sent by a server on behalf of a client is an error. - * here, the initial code is in to take an extra parameter - * and use it for the TimeStamp on a new channel. + * parv[0] = sender prefix + * parv[1] = channel TS + * parv[2] = channel + * parv[3] = "+", formerly channel modes but now unused + * alternatively, a single "0" parameter parts all channels */ static int ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) @@ -564,48 +568,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char { switch (*(s++)) { - case 'i': - mode.mode |= MODE_INVITEONLY; - break; - case 'n': - mode.mode |= MODE_NOPRIVMSGS; - break; - case 'p': - mode.mode |= MODE_PRIVATE; - break; - case 's': - mode.mode |= MODE_SECRET; - break; - case 'm': - mode.mode |= MODE_MODERATED; - break; - case 't': - mode.mode |= MODE_TOPICLIMIT; - break; - case 'r': - mode.mode |= MODE_REGONLY; - break; - case 'L': - mode.mode |= MODE_EXLIMIT; - break; - case 'P': - mode.mode |= MODE_PERMANENT; - break; - case 'c': - mode.mode |= MODE_NOCOLOR; - break; - case 'g': - mode.mode |= MODE_FREEINVITE; - break; - case 'z': - mode.mode |= MODE_OPMODERATE; - break; - case 'F': - mode.mode |= MODE_FREETARGET; - break; - case 'Q': - mode.mode |= MODE_DISFORWARD; - break; case 'f': rb_strlcpy(mode.forward, parv[4 + args], sizeof(mode.forward)); args++; @@ -632,6 +594,11 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char if(parc < 5 + args) return 0; break; + default: + if(chmode_flags[(int) *s] != 0) + { + mode.mode |= chmode_flags[(int) *s]; + } } } @@ -765,6 +732,20 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char { del_invite(chptr, ptr->data); } + + if(rb_dlink_list_length(&chptr->banlist) > 0) + remove_ban_list(chptr, fakesource_p, &chptr->banlist, 'b', ALL_MEMBERS); + if(rb_dlink_list_length(&chptr->exceptlist) > 0) + remove_ban_list(chptr, fakesource_p, &chptr->exceptlist, + 'e', ONLY_CHANOPS); + if(rb_dlink_list_length(&chptr->invexlist) > 0) + remove_ban_list(chptr, fakesource_p, &chptr->invexlist, + 'I', ONLY_CHANOPS); + if(rb_dlink_list_length(&chptr->quietlist) > 0) + remove_ban_list(chptr, fakesource_p, &chptr->quietlist, + 'q', ALL_MEMBERS); + chptr->bants++; + sendto_channel_local(ALL_MEMBERS, chptr, ":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to %ld", me.name, chptr->chname, chptr->chname, @@ -970,27 +951,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid); - /* if the source does TS6 we have to remove our bans. */ - if(!keep_our_modes) - { - if(rb_dlink_list_length(&chptr->banlist) > 0) - remove_ban_list(chptr, fakesource_p, &chptr->banlist, 'b', ALL_MEMBERS); - - if(rb_dlink_list_length(&chptr->exceptlist) > 0) - remove_ban_list(chptr, fakesource_p, &chptr->exceptlist, - 'e', ONLY_CHANOPS); - - if(rb_dlink_list_length(&chptr->invexlist) > 0) - remove_ban_list(chptr, fakesource_p, &chptr->invexlist, - 'I', ONLY_CHANOPS); - - if(rb_dlink_list_length(&chptr->quietlist) > 0) - remove_ban_list(chptr, fakesource_p, &chptr->quietlist, - 'q', ALL_MEMBERS); - - chptr->bants++; - } - return 0; } @@ -1068,30 +1028,30 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode) int i; /* ok, first get a list of modes we need to add */ - for (i = 0; chmode_flags[i].letter; i++) + for (i = 0; i < 256; i++) { - if((mode->mode & chmode_flags[i].mode) && !(oldmode->mode & chmode_flags[i].mode)) + if((mode->mode & chmode_flags[i]) && !(oldmode->mode & chmode_flags[i])) { if(dir != MODE_ADD) { *mbuf++ = '+'; dir = MODE_ADD; } - *mbuf++ = chmode_flags[i].letter; + *mbuf++ = i; } } /* now the ones we need to remove. */ - for (i = 0; chmode_flags[i].letter; i++) + for (i = 0; i < 256; i++) { - if((oldmode->mode & chmode_flags[i].mode) && !(mode->mode & chmode_flags[i].mode)) + if((oldmode->mode & chmode_flags[i]) && !(mode->mode & chmode_flags[i])) { if(dir != MODE_DEL) { *mbuf++ = '-'; dir = MODE_DEL; } - *mbuf++ = chmode_flags[i].letter; + *mbuf++ = i; } } @@ -1221,7 +1181,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p) *mbuf = '\0'; sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s %s %s %s %s %s", - me.name, chptr->chname, + source_p->name, chptr->chname, lmodebuf, lpara[0], lpara[1], lpara[2], lpara[3]); @@ -1253,7 +1213,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p) *mbuf = '\0'; sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s %s %s %s %s %s", - me.name, chptr->chname, lmodebuf, + source_p->name, chptr->chname, lmodebuf, lpara[0], lpara[1], lpara[2], lpara[3]); mbuf = lmodebuf; *mbuf++ = '-'; @@ -1269,7 +1229,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p) *mbuf = '\0'; sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s %s %s %s %s %s", - me.name, chptr->chname, lmodebuf, + source_p->name, chptr->chname, lmodebuf, EmptyString(lpara[0]) ? "" : lpara[0], EmptyString(lpara[1]) ? "" : lpara[1], EmptyString(lpara[2]) ? "" : lpara[2],