Do not check for spambot if the user is not allowed to join the channel.
This commit is contained in:
parent
6af7e4faa6
commit
d5e959f179
|
@ -294,9 +294,6 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!IsOper(source_p) && !IsExemptSpambot(source_p))
|
|
||||||
check_spambot_warning(source_p, name);
|
|
||||||
|
|
||||||
/* can_join checks for +i key, bans etc */
|
/* can_join checks for +i key, bans etc */
|
||||||
if((i = can_join(source_p, chptr, key)))
|
if((i = can_join(source_p, chptr, key)))
|
||||||
{
|
{
|
||||||
|
@ -318,6 +315,9 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
|
||||||
sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname);
|
sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!IsOper(source_p) && !IsExemptSpambot(source_p))
|
||||||
|
check_spambot_warning(source_p, name);
|
||||||
|
|
||||||
/* add the user to the channel */
|
/* add the user to the channel */
|
||||||
add_user_to_channel(chptr, source_p, flags);
|
add_user_to_channel(chptr, source_p, flags);
|
||||||
if (chptr->mode.join_num &&
|
if (chptr->mode.join_num &&
|
||||||
|
|
Loading…
Reference in New Issue