GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-25 04:02:37 +01:00
Code Issues Projects Releases Wiki Activity

Factoids: Fix typo and edge case

Browse Source
This commit is contained in:
Pragmatic Software 2020-06-11 23:34:53 -07:00
parent c95afe65bc
commit 90b23d5391
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PBot/Factoids.pm
View File

@ -750,7 +750,7 @@ sub expand_factoid_vars {
my $var; my $var;
my $extract_method; my $extract_method;
if ($action =~ /^\{.*?\}/) { if ($rest =~ /^\{.*?\}/) {
($var, $rest) = $self->{pbot}->{interpreter}->extract_bracketed($rest, '{', '}'); ($var, $rest) = $self->{pbot}->{interpreter}->extract_bracketed($rest, '{', '}');
if ($var =~ /:/) { if ($var =~ /:/) {
@ -847,7 +847,15 @@ sub expand_factoid_vars {
} }
} }
last if $matches == 0 or $expansions == 0; if ($matches == 0 or $expansions == 0) {
if (length $rest) {
$rest = $result . $rest;
$result = '';
next;
} else {
last;
}
}
if (not length $rest) { if (not length $rest) {
$rest = $result; $rest = $result;