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

Timer: remove case-sensitivity

Browse Source
This commit is contained in:
Pragmatic Software 2020-04-05 20:33:14 -07:00
parent dde93db0ac
commit 3eac19d65e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PBot/Timer.pm
View File

@ -68,19 +68,24 @@ sub event_queue_cmd {
my ($regex) = $self->{pbot}->{interpreter}->shift_arg($stuff->{arglist}); my ($regex) = $self->{pbot}->{interpreter}->shift_arg($stuff->{arglist});
my $i = 0; my $i = 0;
my $events = 0;
foreach my $event (@{$self->{event_queue}}) { foreach my $event (@{$self->{event_queue}}) {
$i++; $i++;
if ($regex) { if ($regex) {
next unless $event->{id} =~ /$regex/; next unless $event->{id} =~ /$regex/i;
} }
$events++;
my $duration = concise duration $event->{timeout} - $seconds; my $duration = concise duration $event->{timeout} - $seconds;
$text .= " $i) in $duration: $event->{id}"; $text .= " $i) in $duration: $event->{id}";
$text .= ' [R]' if $event->{repeating}; $text .= ' [R]' if $event->{repeating};
$text .= ";\n"; $text .= ";\n";
} }
return "No events found." if $events == 0;
return $text; return $text;
}; };
@ -118,7 +123,6 @@ sub event_queue_cmd {
my ($regex) = $self->{pbot}->{interpreter}->split_args($stuff->{arglist}, 1); my ($regex) = $self->{pbot}->{interpreter}->split_args($stuff->{arglist}, 1);
return "Usage: eventqueue remove <event>" if not defined $regex; return "Usage: eventqueue remove <event>" if not defined $regex;
$regex =~ s/\*/.*?/g; $regex =~ s/\*/.*?/g;
print "regex: [$regex]\n";
return $self->dequeue_event($regex); return $self->dequeue_event($regex);
} }
@ -206,7 +210,7 @@ sub dequeue_event {
$id = quotemeta $id; $id = quotemeta $id;
$id =~ s/\\\.\\\*\\\?/.*?/g; $id =~ s/\\\.\\\*\\\?/.*?/g;
$id =~ s/\\\.\\\*/.*/g; $id =~ s/\\\.\\\*/.*/g;
my $regex = qr/^$id$/; my $regex = qr/^$id$/i;
my $count = @{$self->{event_queue}}; my $count = @{$self->{event_queue}};
@{$self->{event_queue}} = grep { $_->{id} !~ /$regex/i; } @{$self->{event_queue}}; @{$self->{event_queue}} = grep { $_->{id} !~ /$regex/i; } @{$self->{event_queue}};
my $removed = $count - @{$self->{event_queue}}; my $removed = $count - @{$self->{event_queue}};