From 730c5ff10575d7bbf4ee76fc0c0fb255d3680bba Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Fri, 13 Jun 2008 23:55:37 +0200 Subject: [PATCH] Move -bqeI from lower TS SJOIN to a more logical place. This is possible because TS5 support was removed. --- modules/core/m_join.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/modules/core/m_join.c b/modules/core/m_join.c index 2ff9c9f..02269d1 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -765,6 +765,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 +984,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; }