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

Don't remove dollar-sign from unexpanded factoid vars

Browse Source
This commit is contained in:
Pragmatic Software 2015-07-06 20:01:17 -07:00
parent ed63fb3766
commit 1179a7e1f1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PBot/Factoids.pm
View File

@ -348,8 +348,6 @@ sub expand_factoid_vars {
my $line = int(rand($#mylist + 1)); my $line = int(rand($#mylist + 1));
$mylist[$line] =~ s/"//g; $mylist[$line] =~ s/"//g;
$action =~ s/\$$var/$mylist[$line]/; $action =~ s/\$$var/$mylist[$line]/;
} else {
$action =~ s/(?<!\\)\$$var/$var/;
} }
} }
@ -582,7 +580,7 @@ sub interpreter {
if($action =~ /^\/call\s+(.*)$/) { if($action =~ /^\/call\s+(.*)$/) {
my $command = $self->expand_factoid_vars($from, $1); my $command = $self->expand_factoid_vars($from, $1);
if(length $arguments) { if(length $arguments) {
$command = "$command $arguments"; $command .= " $arguments";
} }
$pbot->{logger}->log("[" . (defined $from ? $from : "stdin") . "] ($nick!$user\@$host) [$keyword] aliased to: [$command]\n"); $pbot->{logger}->log("[" . (defined $from ? $from : "stdin") . "] ($nick!$user\@$host) [$keyword] aliased to: [$command]\n");