From 4eb9a3ca0b7dfd4b4f8c34be694f7f30dbcc77a2 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Sun, 21 Feb 2010 01:12:04 +0100 Subject: [PATCH] JOIN 0: Make spambot check equivalent to PART's. --- modules/core/m_join.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/core/m_join.c b/modules/core/m_join.c index 439fab4a..3c3f7578 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -943,8 +943,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char * 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) @@ -959,12 +957,12 @@ 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",