diff --git a/PBot/AntiFlood.pm b/PBot/AntiFlood.pm index 9d06479d..336ff4f9 100644 --- a/PBot/AntiFlood.pm +++ b/PBot/AntiFlood.pm @@ -700,8 +700,8 @@ sub check_bans { foreach my $baninfo (@$bans) { $self->{pbot}->logger->log("anti-flood: [check-bans] $mask evaded $baninfo->{banmask} banned in $baninfo->{channel} by $baninfo->{owner}, banning $banmask\n"); - my ($bannick) = $banmask =~ m/^([^!]+)/; - $self->{pbot}->chanops->add_op_command($baninfo->{channel}, "kick $bannick $baninfo->{channel} Ban evasion"); + my ($bannick) = $mask =~ m/^([^!]+)/; + $self->{pbot}->chanops->add_op_command($baninfo->{channel}, "kick $baninfo->{channel} $bannick Ban evasion"); $self->{pbot}->chanops->ban_user_timed($banmask, $baninfo->{channel}, 60 * 60 * 12); $self->message_history->{$mask}->{channels}->{$channel}{validated} = 0; return; diff --git a/PBot/ChanOpCommands.pm b/PBot/ChanOpCommands.pm index 17ed1baf..9b42d11b 100644 --- a/PBot/ChanOpCommands.pm +++ b/PBot/ChanOpCommands.pm @@ -119,6 +119,7 @@ sub kick_user { $self->{pbot}->chanops->add_op_command($from, "kick $from $1 $2"); $self->{pbot}->chanops->gain_ops($from); + return "/msg $nick Kicking $1 from $from with reason '$2'"; } 1; diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 1614e456..44771e94 100644 --- a/PBot/VERSION.pm +++ b/PBot/VERSION.pm @@ -13,8 +13,8 @@ use warnings; # These are set automatically by the build/commit script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 548, - BUILD_DATE => "2014-04-19", + BUILD_REVISION => 549, + BUILD_DATE => "2014-04-21", }; 1;