From db3320195eb8993045d5ad7375fad2d123527940 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Tue, 22 Jun 2021 13:56:15 -0700 Subject: [PATCH] EventQueue: improve usage message; `.*` and `*` both work in `remove` --- PBot/EventQueue.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PBot/EventQueue.pm b/PBot/EventQueue.pm index d65b1f3a..81b6a41e 100644 --- a/PBot/EventQueue.pm +++ b/PBot/EventQueue.pm @@ -33,7 +33,7 @@ sub initialize { sub cmd_eventqueue { my ($self, $context) = @_; - my $usage = "Usage: eventqueue list [filter regex] | add [-repeat] | remove "; + my $usage = "Usage: eventqueue list [filter regex] | add [-repeat] | remove "; my $command = $self->{pbot}->{interpreter}->shift_arg($context->{arglist}); @@ -119,8 +119,8 @@ sub cmd_eventqueue { if ($command eq 'remove') { my ($regex) = $self->{pbot}->{interpreter}->split_args($context->{arglist}, 1); - return "Usage: eventqueue remove " if not defined $regex; - $regex =~ s/\*/.*?/g; + return "Usage: eventqueue remove " if not defined $regex; + $regex =~ s/(?dequeue_event($regex); } @@ -264,6 +264,7 @@ sub dequeue_event { return $result; } +# invoke and remove all events matching regex sub execute_and_dequeue_event { my ($self, $id) = @_; return $self->dequeue_event($id, 1);