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

Factoids: Fix expansions for real

Browse Source
This commit is contained in:
Pragmatic Software 2018-04-01 16:34:29 -07:00
parent 743f5c36b3
commit ec117c4aec
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PBot/Factoids.pm
View File

@ -492,18 +492,32 @@ sub expand_factoid_vars {
if (not length $mylist[$line]) { if (not length $mylist[$line]) {
$self->{pbot}->{logger}->log("No length!\n") if $debug; $self->{pbot}->{logger}->log("No length!\n") if $debug;
if ($debug) {
$self->{pbot}->{logger}->log("before: v: $v, offset: $offset\n");
$self->{pbot}->{logger}->log("$action\n");
$self->{pbot}->{logger}->log((" " x $offset) . "^\n");
}
substr($action, $offset) =~ s/\s*$a\$$v$modifier//; substr($action, $offset) =~ s/\s*$a\$$v$modifier//;
$offset += $-[0]; $offset += $-[0];
if ($debug) { if ($debug) {
$self->{pbot}->{logger}->log("after: \$-[0]: $-[0], offset: $offset\n"); $self->{pbot}->{logger}->log("after: \$-[0]: $-[0], offset: $offset, r: EMPTY\n");
$self->{pbot}->{logger}->log("$action\n"); $self->{pbot}->{logger}->log("$action\n");
$self->{pbot}->{logger}->log((" " x $offset) . "^\n"); $self->{pbot}->{logger}->log((" " x $offset) . "^\n");
} }
} else { } else {
substr($action, $offset) =~ s/$a\$$v$modifier/$mylist[$line]/;
$offset += $-[0];
if ($debug) { if ($debug) {
$self->{pbot}->{logger}->log("after: \$-[0]: $-[0], offset: $offset\n"); $self->{pbot}->{logger}->log("before: v: $v, offset: $offset\n");
$self->{pbot}->{logger}->log("$action\n");
$self->{pbot}->{logger}->log((" " x $offset) . "^\n");
}
substr($action, $offset) =~ s/($a\$$v$modifier)/$mylist[$line]/;
$offset += $-[0] + length $mylist[$line];
if ($debug) {
$self->{pbot}->{logger}->log("after: \$-[0]: $-[0], offset: $offset, r: $mylist[$line]\n");
$self->{pbot}->{logger}->log("$action\n"); $self->{pbot}->{logger}->log("$action\n");
$self->{pbot}->{logger}->log((" " x $offset) . "^\n"); $self->{pbot}->{logger}->log((" " x $offset) . "^\n");
} }