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

IgnoreList: use event queue for ignore timeouts

Browse Source
This commit is contained in:
Pragmatic Software 2020-03-06 13:23:40 -08:00
parent 25623ac80e
commit e98072f98d
1 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
PBot/IgnoreList.pm
View File

@ -22,6 +22,7 @@ sub initialize {
$self->{ignorelist} = PBot::DualIndexHashObject->new(pbot => $self->{pbot}, name => 'IgnoreList', filename => $self->{filename}); $self->{ignorelist} = PBot::DualIndexHashObject->new(pbot => $self->{pbot}, name => 'IgnoreList', filename => $self->{filename});
$self->{ignorelist}->load; $self->{ignorelist}->load;
$self->enqueue_ignores;
$self->{pbot}->{commands}->register(sub { $self->ignore_cmd(@_) }, "ignore", 1); $self->{pbot}->{commands}->register(sub { $self->ignore_cmd(@_) }, "ignore", 1);
$self->{pbot}->{commands}->register(sub { $self->unignore_cmd(@_) }, "unignore", 1); $self->{pbot}->{commands}->register(sub { $self->unignore_cmd(@_) }, "unignore", 1);
@ -31,8 +32,26 @@ sub initialize {
$self->{pbot}->{capabilities}->add('chanop', 'can-ignore', 1); $self->{pbot}->{capabilities}->add('chanop', 'can-ignore', 1);
$self->{pbot}->{capabilities}->add('chanop', 'can-unignore', 1); $self->{pbot}->{capabilities}->add('chanop', 'can-unignore', 1);
}
$self->{pbot}->{timer}->register(sub { $self->check_ignore_timeouts }, 10); sub enqueue_ignores {
my ($self) = @_;
my $now = time;
foreach my $channel ($self->{ignorelist}->get_keys) {
foreach my $hostmask ($self->{ignorelist}->get_keys($channel)) {
my $timeout = $self->{ignorelist}->get_data($channel, $hostmask, 'timeout');
next if $timeout == -1; # permanent ignore
my $interval = $timeout - $now;
$interval = 0 if $interval < 0;
$self->{pbot}->{timer}->enqueue_event(sub {
$self->remove($channel, $hostmask);
}, $interval, "ignore_timeout $channel $hostmask"
);
}
}
} }
sub add { sub add {
@ -45,7 +64,7 @@ sub add {
} }
my $regex = quotemeta $hostmask; my $regex = quotemeta $hostmask;
$regex =~ s/\\\*/.*/g; $regex =~ s/\\\*/.*?/g;
$regex =~ s/\\\?/./g; $regex =~ s/\\\?/./g;
my $data = { my $data = {
@ -62,12 +81,29 @@ sub add {
$self->{ignorelist}->add($channel, $hostmask, $data); $self->{ignorelist}->add($channel, $hostmask, $data);
if ($length > 0) {
$self->{pbot}->{timer}->dequeue_event("ignore_timeout $channel $hostmask");
$self->{pbot}->{timer}->enqueue_event(sub {
$self->remove($channel, $hostmask);
}, $length, "ignore_timeout $channel $hostmask"
);
}
my $duration = $data->{timeout} == -1 ? 'all eternity' : duration $length; my $duration = $data->{timeout} == -1 ? 'all eternity' : duration $length;
return "$hostmask ignored for $duration"; return "$hostmask ignored for $duration";
} }
sub remove { sub remove {
my ($self, $channel, $hostmask) = @_; my ($self, $channel, $hostmask) = @_;
if ($hostmask !~ /!/) {
$hostmask .= '!*@*';
} elsif ($hostmask !~ /@/) {
$hostmask .= '@*';
}
$self->{pbot}->{timer}->dequeue_event("ignore_timeout $channel $hostmask");
return $self->{ignorelist}->remove($channel, $hostmask); return $self->{ignorelist}->remove($channel, $hostmask);
} }
@ -86,23 +122,6 @@ sub is_ignored {
return 0; return 0;
} }
sub check_ignore_timeouts {
my ($self) = @_;
my $now = time;
foreach my $channel ($self->{ignorelist}->get_keys) {
foreach my $hostmask ($self->{ignorelist}->get_keys($channel)) {
my $timeout = $self->{ignorelist}->get_data($channel, $hostmask, 'timeout');
next if $timeout == -1; # permanent ignore
if ($now >= $timeout) {
$self->{pbot}->{logger}->log("Unignoring $hostmask in channel $channel.\n");
$self->remove($channel, $hostmask);
}
}
}
}
sub ignore_cmd { sub ignore_cmd {
my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_; my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_;