/*
* m_join
- * parv[0] = sender prefix
* parv[1] = channel
* parv[2] = channel password (key)
*/
struct ConfItem *aconf;
char *name;
char *key = NULL;
+ const char *modes;
int i, flags = 0;
char *p = NULL, *p2 = NULL;
char *chanlist;
char *mykey;
- int successful_join_count = 0; /* Number of channels successfully joined */
jbuf[0] = '\0';
{
sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS),
me.name, source_p->name, name);
- if(successful_join_count)
- source_p->localClient->last_join_time = rb_current_time();
return 0;
}
- if(flags == 0) /* if channel doesn't exist, don't penalize */
- successful_join_count++;
-
if(chptr == NULL) /* If I already have a chptr, no point doing this */
{
chptr = get_or_create_channel(source_p, name, NULL);
{
sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
me.name, source_p->name, name);
- if(successful_join_count > 0)
- successful_join_count--;
continue;
}
}
- if(!IsOper(source_p) && !IsExemptSpambot(source_p))
- check_spambot_warning(source_p, name);
-
/* can_join checks for +i key, bans etc */
if((i = can_join(source_p, chptr, key)))
{
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);
}
+ if(flags == 0 &&
+ !IsOper(source_p) && !IsExemptSpambot(source_p))
+ check_spambot_warning(source_p, name);
+
/* add the user to the channel */
add_user_to_channel(chptr, source_p, flags);
if (chptr->mode.join_num &&
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
{
channel_member_names(chptr, source_p, 1);
- if(successful_join_count)
- source_p->localClient->last_join_time = rb_current_time();
-
hook_info.client = source_p;
hook_info.chptr = chptr;
hook_info.key = key;
/*
* 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[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[])
else
modes = empty_modes;
- /* working on the presumption eventually itll be more efficient to
- * build a TS6 buffer without checking its needed..
- */
mlen_uid = rb_sprintf(buf_uid, ":%s SJOIN %ld %s %s :",
use_id(source_p), (long) chptr->channelts, parv[2], modes);
ptr_uid = buf_uid + mlen_uid;
* output - NONE
* side effects - Use has decided to join 0. This is legacy
* from the days when channels were numbers not names. *sigh*
- * There is a bunch of evilness necessary here due to
- * anti spambot code.
*/
static void
do_join_0(struct Client *client_p, struct Client *source_p)
sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p));
- if(source_p->user->channel.head && MyConnect(source_p) &&
- !IsOper(source_p) && !IsExemptSpambot(source_p))
- check_spambot_warning(source_p, NULL);
-
while((ptr = source_p->user->channel.head))
{
+ if(MyConnect(source_p) &&
+ !IsOper(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",
static int
check_channel_name_loc(struct Client *source_p, const char *name)
{
+ const char *p;
+
s_assert(name != NULL);
if(EmptyString(name))
return 0;
if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p))
{
- for(; *name; ++name)
+ for(p = name; *p; ++p)
{
- if(!IsChanChar(*name) || IsFakeChanChar(*name))
+ if(!IsChanChar(*p) || IsFakeChanChar(*p))
return 0;
}
}
else
{
- for(; *name; ++name)
+ for(p = name; *p; ++p)
{
- if(!IsChanChar(*name))
+ if(!IsChanChar(*p))
return 0;
}
}
+ if(ConfigChannel.only_ascii_channels)
+ {
+ for(p = name; *p; ++p)
+ if(*p < 33 || *p > 126)
+ return 0;
+ }
+
return 1;
}
*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]);
*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++ = '-';
*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],
projects / irc / rqf / shadowircd.git / blobdiff