9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not check for spambot if the user is not allowed to join the channel.

Browse source
This commit is contained in:
Jilles Tjoelker 2010-02-21 01:07:32 +01:00
parent b2d64e51f0
commit cf3564d61f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/core/m_join.c
View file

@ -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 &&