GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-10-14 06:57:25 +02:00
Code Issues Projects Releases Wiki Activity

Core/Factoids: properly restore invalid $variable expansions

Browse Source
This commit is contained in:
Pragmatic Software 2024-10-15 19:56:04 -07:00
parent 876d5a88bf
commit 597820c053
No known key found for this signature in database
GPG Key ID: CC916B6E3C84ECCE
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,35 +61,37 @@ sub expand_factoid_vars($self, $context, $action, %opts) {
while ($rest =~ s/(.*?)(?<!\\)\$([\w|{])/$2/ms) { while ($rest =~ s/(.*?)(?<!\\)\$([\w|{])/$2/ms) {
$result .= $1; $result .= $1;
my $var; my ($var, $orig_var);
my $modifiers;
my $extract_method; my $extract_method;
if ($rest =~ /^\{.*?\}/) { if ($rest =~ /^\{.*?\}/) {
($var, $rest) = $self->{pbot}->{interpreter}->extract_bracketed($rest, '{', '}'); ($var, $rest) = $self->{pbot}->{interpreter}->extract_bracketed($rest, '{', '}');
$orig_var = $var;
if ($var =~ /:/) { if ($var =~ /:/) {
my @stuff = split /:/, $var, 2; my @stuff = split /:/, $var, 2;
$var = $stuff[0]; $var = $stuff[0];
$rest = ':' . $stuff[1] . $rest; $modifiers = ':' . $stuff[1];
} }
$extract_method = 'bracket'; $extract_method = 'bracket';
} else { } else {
$rest =~ s/^(\w+)//; $rest =~ s/^(\w+)//;
$var = $1; $var = $orig_var = $1;
$extract_method = 'regex'; $extract_method = 'regex';
} }
if ($var =~ /^(?:_.*|[[:punct:]0-9]+|a|b|nick|channel|randomnick|arglen|args|arg\[.+\])$/i) { if ($var =~ /^(?:_.*|[[:punct:]0-9]+|a|b|nick|channel|randomnick|arglen|args|arg\[.+\])$/i) {
# skip identifiers with leading underscores, etc # skip identifiers with leading underscores, etc
$result .= $extract_method eq 'bracket' ? '${' . $var . '}' : '$' . $var; $result .= $extract_method eq 'bracket' ? '${' . $orig_var . '}' : '$' . $orig_var;
next; next;
} }
$matches++; $matches++;
# extract channel expansion modifier # extract channel expansion modifier
if ($rest =~ s/^:(#[^:]+|global)//i) { if ($var =~ s/:(#[^: ]+|global)//i || $rest =~ s/^:(#[^: ]+|global)//i) {
$from = $1; $from = $1;
$from = '.*' if lc $from eq 'global'; $from = '.*' if lc $from eq 'global';
} }
@ -101,7 +103,7 @@ sub expand_factoid_vars($self, $context, $action, %opts) {
my @factoids = $self->{pbot}->{factoids}->{data}->find($from, $var, exact_channel => 2, exact_trigger => 2); my @factoids = $self->{pbot}->{factoids}->{data}->find($from, $var, exact_channel => 2, exact_trigger => 2);
if (not @factoids or not $factoids[0]) { if (not @factoids or not $factoids[0]) {
$result .= $extract_method eq 'bracket' ? '${' . $var . '}' : '$' . $var; $result .= $extract_method eq 'bracket' ? '${' . $orig_var . '}' : '$' . $orig_var;
next; next;
} }
@ -113,13 +115,17 @@ sub expand_factoid_vars($self, $context, $action, %opts) {
if (++$recurse > 100) { if (++$recurse > 100) {
$self->{pbot}->{logger}->log("Factoids: variable expansion recursion limit reached\n"); $self->{pbot}->{logger}->log("Factoids: variable expansion recursion limit reached\n");
$result .= $extract_method eq 'bracket' ? '${' . $var . '}' : '$' . $var; $result .= $extract_method eq 'bracket' ? '${' . $orig_var . '}' : '$' . $orig_var;
next; next;
} }
goto ALIAS; goto ALIAS;
} }
if ($modifiers) {
$rest = $modifiers . $rest;
}
my $copy = $rest; my $copy = $rest;
my %settings = $self->{pbot}->{factoids}->{modifiers}->parse(\$copy); my %settings = $self->{pbot}->{factoids}->{modifiers}->parse(\$copy);
@ -182,7 +188,7 @@ sub expand_factoid_vars($self, $context, $action, %opts) {
$expansions++; $expansions++;
} else { } else {
$result .= $extract_method eq 'bracket' ? '${' . $var . '}' : '$' . $var; $result .= $extract_method eq 'bracket' ? '${' . $orig_var . '}' : '$' . $orig_var;
} }
} }

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 => 4801, BUILD_REVISION => 4803,
BUILD_DATE => "2024-10-15", BUILD_DATE => "2024-10-15",
}; };