GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-01-25 19:44:26 +01:00
Code Issues Projects Releases Wiki Activity

Interpreter: improve processing of embedded and split commands

Browse Source
This commit is contained in:
Pragmatic Software 2024-11-21 20:31:28 -08:00
parent bea5aa071b
commit 7a7730d039
No known key found for this signature in database
GPG Key ID: CC916B6E3C84ECCE
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/PBot/Core/Interpreter.pm
View File

@ -128,7 +128,7 @@ sub process_line($self, $from, $nick, $user, $host, $text, $tags = '', $is_comma
# otherwise try to parse any potential commands # otherwise try to parse any potential commands
if ($cmd_text =~ m/^\s*($nick_regex)[,:]?\s+$bot_trigger\{\s*(.+?)\s*\}\s*$/) { if ($cmd_text =~ m/^\s*($nick_regex)[,:]?\s+$bot_trigger\{\s*(.+?)\s*\}\s*$/) {
# "somenick: !{command}" # "somenick: !{command}"
$context->{addressed} = 1; $context->{addressed} = 1; # command explicitly invoked (output disambig/errors)
goto CHECK_EMBEDDED_CMD; goto CHECK_EMBEDDED_CMD;
} elsif ($cmd_text =~ m/^\s*$bot_trigger\{\s*(.+?)\s*\}\s*$/) { } elsif ($cmd_text =~ m/^\s*$bot_trigger\{\s*(.+?)\s*\}\s*$/) {
# "!{command}" # "!{command}"
@ -149,27 +149,27 @@ sub process_line($self, $from, $nick, $user, $host, $text, $tags = '', $is_comma
$self->{pbot}->{logger}->log("No similar nick for $possible_nick_prefix; disregarding command.\n"); $self->{pbot}->{logger}->log("No similar nick for $possible_nick_prefix; disregarding command.\n");
return 0; return 0;
} }
$context->{addressed} = 1; $context->{addressed} = 1; # command explicitly invoked
} elsif ($cmd_text =~ m/^$bot_trigger\s*(.+)$/) { } elsif ($cmd_text =~ m/^$bot_trigger\s*(.+)$/) {
# "!command" # "!command"
$command = $1; $command = $1;
$context->{addressed} = 1; $context->{addressed} = 1; # command explicitly invoked
} elsif ($cmd_text =~ m/^.?\s*$botnick\s*[,:]\s+(.+)$/i) { } elsif ($cmd_text =~ m/^.?\s*$botnick\s*[,:]\s+(.+)$/i) {
# "botnick: command" # "botnick: command"
$command = $1; $command = $1;
$context->{addressed} = 1; $context->{addressed} = 1; # command explicitly invoked
} elsif ($cmd_text =~ m/^.?\s*$botnick\s+(.+)$/i) { } elsif ($cmd_text =~ m/^.?\s*$botnick\s+(.+)$/i) {
# "botnick command" # "botnick command"
$command = $1; $command = $1;
$context->{addressed} = 0; $context->{addressed} = 0; # command NOT explicitly invoked (silence disambig/errors)
} elsif ($cmd_text =~ m/^(.+?),\s+$botnick[?!.]*$/i) { } elsif ($cmd_text =~ m/^(.+?),\s+$botnick[?!.]*$/i) {
# "command, botnick?" # "command, botnick?"
$command = $1; $command = $1;
$context->{addressed} = 1; $context->{addressed} = 1; # command explicitly invoked
} elsif ($cmd_text =~ m/^(.+?)\s+$botnick[?!.]*$/i) { } elsif ($cmd_text =~ m/^(.+?)\s+$botnick[?!.]*$/i) {
# "command botnick?" # "command botnick?"
$command = $1; $command = $1;
$context->{addressed} = 0; $context->{addressed} = 0; # command NOT explicitly invoked
} }
# check for embedded commands # check for embedded commands
@ -251,6 +251,14 @@ sub process_line($self, $from, $nick, $user, $host, $text, $tags = '', $is_comma
# increment processed counter # increment processed counter
$processed++; $processed++;
# reset context
delete $context->{subcmd};
delete $context->{pipe};
delete $context->{pipe_next};
delete $context->{command_split};
delete $context->{split_result};
delete $context->{add_nick};
} }
# return number of commands processed # return number of commands processed
@ -616,7 +624,10 @@ sub handle_result($self, $context, $result = $context->{result}) {
# finish piping # finish piping
if (exists $context->{pipe}) { if (exists $context->{pipe}) {
my ($pipe, $pipe_rest) = (delete $context->{pipe}, delete $context->{pipe_rest}); my ($pipe, $pipe_rest) = (
delete $context->{pipe},
delete $context->{pipe_rest}
);
if (not $context->{alldone}) { if (not $context->{alldone}) {
$context->{command} = "$pipe $result $pipe_rest"; $context->{command} = "$pipe $result $pipe_rest";
@ -683,6 +694,9 @@ sub handle_result($self, $context, $result = $context->{result}) {
$context->{split_result} .= $result; $context->{split_result} .= $result;
} }
delete $context->{ref_from};
delete $context->{add_nick};
$context->{result} = $self->interpret($context); $context->{result} = $self->interpret($context);
$self->handle_result($context); $self->handle_result($context);
return 0; return 0;
@ -693,8 +707,9 @@ sub handle_result($self, $context, $result = $context->{result}) {
my $botnick = $self->{pbot}->{conn}->nick; my $botnick = $self->{pbot}->{conn}->nick;
# reformat result to be more suitable for joining together # reformat result to be more suitable for joining together
$result =~ s!^/say !\n!i; $result =~ s!^/say !\n!i
$result =~ s!^/me !\n* $botnick !i; || $result =~ s!^/me !\n* $botnick !i
|| $result =~ s!^!\n!;
$result = $context->{split_result} . $result; $result = $context->{split_result} . $result;
delete $context->{split_result}; delete $context->{split_result};

2
lib/PBot/VERSION.pm
View File

@ -25,7 +25,7 @@ use PBot::Imports;
# These are set by the /misc/update_version script # These are set by the /misc/update_version script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 4856, BUILD_REVISION => 4857,
BUILD_DATE => "2024-11-21", BUILD_DATE => "2024-11-21",
}; };