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

Factoid/Variables: minor refactor, no semantic changes

Browse Source
This commit is contained in:
Pragmatic Software 2024-11-02 17:58:14 -07:00
parent c6f6823df9
commit 73c4ed465d
No known key found for this signature in database
GPG Key ID: CC916B6E3C84ECCE
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/PBot/Core/Factoids/Variables.pm
View File

@ -217,6 +217,7 @@ sub expand_action_arguments($self, $action, $input, $nick) {
my %h; my %h;
if (not defined $input or $input eq '') { if (not defined $input or $input eq '') {
$input = '';
%h = (args => $nick); %h = (args => $nick);
} else { } else {
%h = (args => $input); %h = (args => $input);
@ -226,18 +227,16 @@ sub expand_action_arguments($self, $action, $input, $nick) {
$jsonargs =~ s/^{".*":"//; $jsonargs =~ s/^{".*":"//;
$jsonargs =~ s/"}$//; $jsonargs =~ s/"}$//;
if (not defined $input or $input eq '') {
$input = "";
$action =~ s/\$args:json|\$\{args:json\}/$jsonargs/ge;
$action =~ s/\$args(?![[\w])|\$\{args(?![[\w])\}/$nick/g;
} else {
$action =~ s/\$args:json|\$\{args:json\}/$jsonargs/g;
$action =~ s/\$args(?![[\w])|\$\{args(?![[\w])\}/$input/g;
}
my @args = $self->{pbot}->{interpreter}->split_line($input); my @args = $self->{pbot}->{interpreter}->split_line($input);
$action =~ s/\$arglen\b|\$\{arglen\}/scalar @args/eg; $action =~ s/\$arglen\b|\$\{arglen\}/scalar @args/eg;
$action =~ s/\$args:json|\$\{args:json\}/$jsonargs/g;
if ($input eq '') {
$action =~ s/\$p?args(?![[\w])|\$\{p?args(?![[\w])\}/$nick/g;
} else {
$action =~ s/\$args(?![[\w])|\$\{args(?![[\w])\}/$input/g;
}
my $depth = 0; my $depth = 0;
my $const_action = $action; my $const_action = $action;
@ -248,7 +247,7 @@ sub expand_action_arguments($self, $action, $input, $nick) {
last if ++$depth >= 100; last if ++$depth >= 100;
if ($arg eq '*') { if ($arg eq '*') {
if (not defined $input or $input eq '') { if ($input eq '') {
$action =~ s/\$arg\[\*\]|\$\{arg\[\*\]\}/$nick/; $action =~ s/\$arg\[\*\]|\$\{arg\[\*\]\}/$nick/;
} else { } else {
$action =~ s/\$arg\[\*\]|\$\{arg\[\*\]\}/$input/; $action =~ s/\$arg\[\*\]|\$\{arg\[\*\]\}/$input/;

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 => 4822, BUILD_REVISION => 4823,
BUILD_DATE => "2024-11-02", BUILD_DATE => "2024-11-02",
}; };