From e1c4c30743e1d1a5e4ca6be43360b09d6d88adfb Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Wed, 5 Mar 2014 14:32:24 +0000 Subject: [PATCH] Slight rewording of join-flood notification message to improve awareness of automatic unbanning --- PBot/AntiFlood.pm | 4 +--- PBot/VERSION.pm | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) 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", };