GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-02-18 06:20:41 +01:00
Code Issues Projects Releases Wiki Activity

Flood counter now per-channel

Browse Source
This commit is contained in:
Pragmatic Software 2010-04-06 19:15:42 +00:00
parent 116577aefb
commit b261265726
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PBot/BotAdminCommands.pm
View File

@ -122,6 +122,7 @@ sub ack_die {
my ($from, $nick, $user, $host, $arguments) = @_; my ($from, $nick, $user, $host, $arguments) = @_;
$self->{pbot}->logger->log("$nick!$user\@$host made me exit.\n"); $self->{pbot}->logger->log("$nick!$user\@$host made me exit.\n");
$self->{pbot}->factoids->save_factoids(); $self->{pbot}->factoids->save_factoids();
$self->{pbot}->ignorelist->save_ignores();
$self->{pbot}->conn->privmsg($from, "Good-bye.") if defined $from; $self->{pbot}->conn->privmsg($from, "Good-bye.") if defined $from;
$self->{pbot}->conn->quit("Departure requested."); $self->{pbot}->conn->quit("Departure requested.");
exit 0; exit 0;

32
PBot/IgnoreList.pm
View File

@ -37,8 +37,8 @@ sub initialize {
$self->{pbot} = $pbot; $self->{pbot} = $pbot;
$self->{ignore_list} = {}; $self->{ignore_list} = {};
$self->{ignore_flood_counter} = 0; $self->{ignore_flood_counter} = {};
$self->{last_timestamp} = gettimeofday; $self->{last_timestamp} = {};
$self->{filename} = $filename; $self->{filename} = $filename;
$pbot->timer->register(sub { $self->check_ignore_timeouts }, 10); $pbot->timer->register(sub { $self->check_ignore_timeouts }, 10);
@ -98,8 +98,12 @@ sub load_ignores {
Carp::croak "Duplicate ignore [$hostmask][$channel] found in $filename around line $i\n"; Carp::croak "Duplicate ignore [$hostmask][$channel] found in $filename around line $i\n";
} }
if($length == -1) {
${ $self->{ignore_list} }{$hostmask}{$channel} = $length;
} else {
${ $self->{ignore_list} }{$hostmask}{$channel} = gettimeofday + $length; ${ $self->{ignore_list} }{$hostmask}{$channel} = gettimeofday + $length;
} }
}
$self->{pbot}->logger->log(" $i entries in ignorelist\n"); $self->{pbot}->logger->log(" $i entries in ignorelist\n");
$self->{pbot}->logger->log("Done.\n"); $self->{pbot}->logger->log("Done.\n");
@ -141,26 +145,28 @@ sub check_ignore {
if(defined $channel) { # do not execute following if text is coming from STDIN ($channel undef) if(defined $channel) { # do not execute following if text is coming from STDIN ($channel undef)
if($channel =~ /^#/) { if($channel =~ /^#/) {
$self->{ignore_flood_counter}++; # TODO: make this per channel, e.g., ${ $self->{ignore_flood_counter} }{$channel}++ $self->{ignore_flood_counter}->{$channel}++; # TODO: make this per channel, e.g., ${ $self->{ignore_flood_counter} }{$channel}++
$pbot->logger->log("flood_msg: $self->{ignore_flood_counter}\n"); $pbot->logger->log("flood_msg: $self->{ignore_flood_counter}->{$channel}\n");
} }
if($now - $self->{last_timestamp} >= 30) { if(not exists $self->{last_timestamp}->{$channel}) {
$self->{last_timestamp} = $now; $self->{last_timestamp}->{$channel} = $now;
if($self->{ignore_flood_counter} > 0) { } elsif($now - $self->{last_timestamp}->{$channel} >= 30) {
$self->{ignore_flood_counter}--; $self->{last_timestamp}->{$channel} = $now;
$pbot->logger->log("flood_msg decremented to $self->{ignore_flood_counter}\n"); if($self->{ignore_flood_counter}->{$channel} > 0) {
$self->{ignore_flood_counter}->{$channel}--;
$pbot->logger->log("flood_msg decremented to $self->{ignore_flood_counter}->{$channel}\n");
} }
} }
if(($self->{ignore_flood_counter} > 4) or ($channel =~ /^#osdev$/i and $self->{ignore_flood_counter} >= 3)) { if(($self->{ignore_flood_counter}->{$channel} > 4) or ($channel =~ /^#osdev$/i and $self->{ignore_flood_counter}->{$channel} >= 3)) {
$pbot->logger->log("flood_msg exceeded! [$self->{ignore_flood_counter}]\n"); $pbot->logger->log("flood_msg exceeded! [$self->{ignore_flood_counter}->{$channel}]\n");
$self->{pbot}->{ignorelistcmds}->ignore_user("", "floodcontrol", "", "", ".* $channel 600"); $self->{pbot}->{ignorelistcmds}->ignore_user("", "floodcontrol", "", "", ".* $channel 600");
$self->{ignore_flood_counter} = 0; $self->{ignore_flood_counter}->{$channel} = 0;
if($channel =~ /^#/) { if($channel =~ /^#/) {
$pbot->conn->me($channel, "has been overwhelmed."); $pbot->conn->me($channel, "has been overwhelmed.");
$pbot->conn->me($channel, "lies down and falls asleep."); $pbot->conn->me($channel, "lies down and falls asleep.");
return; return 1;
} }
} }
} }