diff --git a/PBot/AntiFlood.pm b/PBot/AntiFlood.pm index 29df13f7..388b8661 100644 --- a/PBot/AntiFlood.pm +++ b/PBot/AntiFlood.pm @@ -341,9 +341,7 @@ sub check_flood { $self->{pbot}->logger->log("$nick!$user\@$banmask banned for $timeout hours due to join flooding (offense #" . $self->message_history->{$account}->{channels}->{$channel}{offenses} . ").\n"); - $timeout = "several" if($timeout > 8); - - $self->{pbot}->conn->privmsg($nick, "You have been banned from $channel for $timeout hours due to join flooding. If your connection issues have been fixed, or this was an accident, you may request an unban at any time by responding to this message with: unbanme $channel"); + $self->{pbot}->conn->privmsg($nick, "You have been banned from $channel due to join flooding. If your connection issues have been fixed, or this was an accident, you may request an unban at any time by responding to this message with: unbanme $channel, otherwise you will be automatically unbanned in $timeout hours."); $self->message_history->{$account}->{channels}->{$channel}{join_watch} = $max_messages - 2; # give them a chance to rejoin } diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm index 9c2cb40b..6b2e5fee 100644 --- a/PBot/VERSION.pm +++ b/PBot/VERSION.pm @@ -13,7 +13,7 @@ use warnings; # These are set automatically by the build/commit script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 505, + BUILD_REVISION => 506, BUILD_DATE => "2014-03-05", };