Move -bqeI from lower TS SJOIN to a more logical place.
This is possible because TS5 support was removed.
This commit is contained in:
parent
316cbf11bc
commit
7b22c84fab
1 changed files with 14 additions and 21 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue