From 2942a44fd8f572a7ab8f96df3d92d5d50882e126 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Sat, 28 Dec 2019 22:02:22 -0800 Subject: [PATCH] AntiKickAutoRejoin: do not enforce logged-in admins; respect whitelisted users --- Plugins/AntiKickAutoRejoin.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Plugins/AntiKickAutoRejoin.pm b/Plugins/AntiKickAutoRejoin.pm index f399c042..10e7ab43 100644 --- a/Plugins/AntiKickAutoRejoin.pm +++ b/Plugins/AntiKickAutoRejoin.pm @@ -46,7 +46,7 @@ sub on_kick { $channel = lc $channel; return 0 if not $self->{pbot}->{chanops}->can_gain_ops($channel); - return 0 if $reason eq '*BANG!*'; + return 0 if $reason eq '*BANG!*'; # roulette if (not exists $self->{kicks}->{$channel} or not exists $self->{kicks}->{$channel}->{$target}) { @@ -64,6 +64,8 @@ sub on_join { $channel = lc $channel; return 0 if not $self->{pbot}->{chanops}->can_gain_ops($channel); + return 0 if $self->{pbot}->{antiflood}->whitelisted($channel, "$nick!$user\@$host"); + return 0 if $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host"); if (exists $self->{kicks}->{$channel} and exists $self->{kicks}->{$channel}->{$nick}) {