GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-23 11:12:42 +01:00
Code Issues Projects Releases Wiki Activity

Corrected join flood to get correct time distance between join messages

Browse Source
This commit is contained in:
Pragmatic Software 2010-06-19 19:19:56 +00:00
parent e6f9296010
commit 547087b81d
3 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
PBot/AntiFlood.pm
View File

@ -39,6 +39,7 @@ sub initialize {
}
$self->{pbot} = $pbot;
$self->{FLOOD_IGNORE} = -1;
$self->{FLOOD_CHAT} = 0;
$self->{FLOOD_JOIN} = 1;
@ -67,6 +68,24 @@ sub get_flood_account {
return undef;
}
sub add_message {
my ($self, $account, $channel, $text, $mode) = @_;
my $now = gettimeofday;
#$self->{pbot}->logger->log("appending new message\n");
push(@{ ${ $self->message_history }{$account}{$channel}{messages} }, { timestamp => $now, msg => $text, mode => $mode });
my $length = $#{ ${ $self->message_history }{$account}{$channel}{messages} } + 1;
if($length >= $self->{pbot}->{MAX_NICK_MESSAGES}) {
my %msg = %{ shift(@{ ${ $self->message_history }{$account}{$channel}{messages} }) };
#$self->{pbot}->logger->log("shifting message off top: $msg{msg}, $msg{timestamp}\n");
$length--;
}
return $length;
}
sub check_flood {
my ($self, $channel, $nick, $user, $host, $text, $max_messages, $max_time, $mode) = @_;
my $now = gettimeofday;
@ -94,16 +113,7 @@ sub check_flood {
${ $self->message_history }{$account}{$channel}{messages} = [];
}
#$self->{pbot}->logger->log("appending new message\n");
push(@{ ${ $self->message_history }{$account}{$channel}{messages} }, { timestamp => $now, msg => $text, mode => $mode });
my $length = $#{ ${ $self->message_history }{$account}{$channel}{messages} } + 1;
if($length >= $self->{pbot}->{MAX_NICK_MESSAGES}) {
my %msg = %{ shift(@{ ${ $self->message_history }{$account}{$channel}{messages} }) };
#$self->{pbot}->logger->log("shifting message off top: $msg{msg}, $msg{timestamp}\n");
$length--;
}
my $length = $self->add_message($account, $channel, $text, $mode);
return if ($channel =~ /^#/) and (not exists $self->{pbot}->channels->channels->hash->{$channel} or $self->{pbot}->channels->channels->hash->{$channel}{chanop} == 0);
@ -122,7 +132,7 @@ sub check_flood {
${ $self->message_history }{$account}{$chan}{join_watch} = 0;
${ $self->message_history }{$account}{$chan}{messages} = [];
}
push(@{ ${ $self->message_history }{$account}{$chan}{messages} }, { timestamp => $now, msg => $text, mode => $mode }) unless $chan eq $channel;
$self->add_message($account, $chan, $text, $mode) unless $chan eq $channel;
}
# check QUIT message for netsplits, and decrement joinwatch if found
@ -134,6 +144,7 @@ sub check_flood {
${ $self->message_history }{$account}{$ch}{join_watch} = 0 if ${ $self->message_history }{$account}{$ch}{join_watch} < 0;
$self->{pbot}->logger->log("$nick $ch joinwatch adjusted: ${ $self->message_history }{$account}{$ch}{join_watch}\n");
}
$self->message_history->{$account}{$channel}{messages}->[$length - 1]{mode} = $self->{FLOOD_IGNORE};
}
# check QUIT message for Ping timeout
elsif($text =~ /^QUIT Ping timeout/) {
@ -144,6 +155,8 @@ sub check_flood {
${ $self->message_history }{$account}{$ch}{join_watch}++;
$self->{pbot}->logger->log("$nick $ch joinwatch adjusted: ${ $self->message_history }{$account}{$ch}{join_watch}\n");
}
} else {
$self->message_history->{$account}{$channel}{messages}->[$length - 1]{mode} = $self->{FLOOD_IGNORE};
}
}
} elsif($mode == $self->{FLOOD_CHAT}) {
@ -159,7 +172,23 @@ sub check_flood {
if($max_messages > 0 and $length >= $max_messages) {
$self->{pbot}->logger->log("More than $max_messages messages, comparing time differences ($max_time)\n") if $mode == $self->{FLOOD_JOIN};
my %msg = %{ @{ ${ $self->message_history }{$account}{$channel}{messages} }[$length - $max_messages] };
my %msg;
if($mode == $self->{FLOOD_CHAT}) {
%msg = %{ @{ ${ $self->message_history }{$account}{$channel}{messages} }[$length - $max_messages] };
} else {
my $count = 0;
my $i = $length - 1;
$self->{pbot}->logger->log("Checking flood history, i = $i\n");
for(; $i >= 0; $i--) {
$self->{pbot}->logger->log($i . " " . $self->message_history->{$account}{$channel}{messages}->[$i]{mode} ." " . $self->message_history->{$account}{$channel}{messages}->[$i]{msg} . " " . $self->message_history->{$account}{$channel}{messages}->[$i]{timestamp} . "\n");
next if $self->message_history->{$account}{$channel}{messages}->[$i]{mode} != $self->{FLOOD_JOIN};
last if ++$count >= 4;
}
$i = 0 if $i < 0;
print "using $i\n";
%msg = %{ @{ ${ $self->message_history }{$account}{$channel}{messages} }[$i] };
}
my %last = %{ @{ ${ $self->message_history }{$account}{$channel}{messages} }[$length - 1] };
$self->{pbot}->logger->log("Comparing " . int($last{timestamp}) . " against " . int($msg{timestamp}) . ": " . (int($last{timestamp} - $msg{timestamp})) . " seconds\n") if $mode == $self->{FLOOD_JOIN};

2
PBot/PBot.pm
View File

@ -103,7 +103,7 @@ sub initialize {
$max_msg_len = 430 unless defined $max_msg_len;
$MAX_FLOOD_MESSAGES = 4 unless defined $MAX_FLOOD_MESSAGES;
$MAX_NICK_MESSAGES = 8 unless defined $MAX_NICK_MESSAGES;
$MAX_NICK_MESSAGES = 12 unless defined $MAX_NICK_MESSAGES;
$self->{botnick} = $botnick;
$self->{username} = $username;

2
PBot/VERSION.pm
View File

@ -13,7 +13,7 @@ use warnings;
# These are set automatically by the build/commit script
use constant {
BUILD_NAME => "PBot",
BUILD_REVISION => 180,
BUILD_REVISION => 181,
BUILD_DATE => "2010-06-19",
};