From 78082792e52aaa056cb26e7ccd8ab14b24dfd568 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Sun, 25 Aug 2019 00:10:45 -0700 Subject: [PATCH] FuncCommand: clarify a comment --- PBot/FuncCommand.pm | 48 +++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/PBot/FuncCommand.pm b/PBot/FuncCommand.pm index 769d0475..e0e1632a 100644 --- a/PBot/FuncCommand.pm +++ b/PBot/FuncCommand.pm @@ -46,6 +46,8 @@ sub initialize { $self->init_funcs; } +# this is a subroutine so PBot::BotAdminCommands::reload() can reload +# the funcs without requiring a bot restart. sub init_funcs { my ($self) = @_; @@ -78,6 +80,29 @@ sub init_funcs { }; } +sub do_func { + my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_; + + my $func = $self->{pbot}->{interpreter}->shift_arg($stuff->{arglist}); + + if (not defined $func) { + return "Usage: func [arguments]"; + } + + if (not exists $self->{funcs}->{$func}) { + return "[No such func '$func']"; + } + + my @params; + while (my $param = $self->{pbot}->{interpreter}->shift_arg($stuff->{arglist})) { + push @params, $param; + } + + my $result = $self->{funcs}->{$func}->{subref}->(@params); + $result =~ s/\x1/1/g; + return $result; +} + sub func_help { my ($self, $func) = @_; @@ -171,27 +196,4 @@ sub func_sed { } use warnings; -sub do_func { - my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_; - - my $func = $self->{pbot}->{interpreter}->shift_arg($stuff->{arglist}); - - if (not defined $func) { - return "Usage: func [arguments]"; - } - - if (not exists $self->{funcs}->{$func}) { - return "[No such func '$func']"; - } - - my @params; - while (my $param = $self->{pbot}->{interpreter}->shift_arg($stuff->{arglist})) { - push @params, $param; - } - - my $result = $self->{funcs}->{$func}->{subref}->(@params); - $result =~ s/\x1/1/g; - return $result; -} - 1;