GitHub
/
pbot
mirror of https://github.com/pragma-/pbot.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct expansion of $nick and $args and such

This commit is contained in:
Pragmatic Software 2017-08-28 23:15:57 -07:00
parent 9fbafec4fd
commit 3d7388b402
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
PBot/Factoids.pm
View File

@ -371,7 +371,7 @@ sub find_factoid {
} }
sub expand_factoid_vars { sub expand_factoid_vars {
my ($self, $from, $root_keyword, $action, @exclude) = @_; my ($self, $from, $nick, $root_keyword, $action, @exclude) = @_;
$root_keyword = lc $root_keyword; $root_keyword = lc $root_keyword;
@ -452,6 +452,12 @@ sub expand_factoid_vars {
} }
$action =~ s/\\\$/\$/g; $action =~ s/\\\$/\$/g;
$action =~ s/\$nick/$nick/g;
$action =~ s/\$channel/$from/g;
$action =~ s/\$randomnick/my $random = $self->{pbot}->{nicklist}->random_nick($from); $random ? $random : $nick/ge;
$action =~ s/\$0\b/$root_keyword/g;
return $action; return $action;
} }
@ -545,7 +551,7 @@ sub execute_code_factoid {
my %uniq = map { $_, 1 } @names; my %uniq = map { $_, 1 } @names;
@names = keys %uniq; @names = keys %uniq;
$code = $self->expand_factoid_vars($from, $root_keyword, $code, @names); $code = $self->expand_factoid_vars($from, $tonick ? $tonick : $nick, $root_keyword, $code, @names);
my %signals = %SIG; my %signals = %SIG;
alarm 0; alarm 0;
@ -564,7 +570,7 @@ sub execute_code_factoid {
if (not defined $safe) { if (not defined $safe) {
$safe = Safe->new; $safe = Safe->new;
$safe->permit_only(qw/:base_core rv2gv padany concat subst join sort mapstart grepstart/); $safe->permit_only(qw/:base_core rv2gv padany rand srand concat subst join sort mapstart grepstart/);
$safe->deny(qw/entersub/); $safe->deny(qw/entersub/);
# some default stuff # some default stuff
@ -610,7 +616,8 @@ sub execute_code_factoid {
%SIG = %signals; %SIG = %signals;
alarm 1; alarm 1;
$action = $self->expand_factoid_vars($from, $root_keyword, $action); $action = $self->expand_factoid_vars($from, $tonick ? $tonick : $nick, $root_keyword, $action);
$action = $self->expand_action_arguments($action, $arguments, $tonick ? $tonick : $nick);
return $action; return $action;
} }
@ -774,7 +781,7 @@ sub interpreter {
# Check if it's an alias # Check if it's an alias
if($action =~ /^\/call\s+(.*)$/) { if($action =~ /^\/call\s+(.*)$/) {
my $command = $self->expand_factoid_vars($from, $root_keyword, $1); my $command = $self->expand_factoid_vars($from, $tonick ? $tonick : $nick, $root_keyword, $1);
if(length $arguments) { if(length $arguments) {
$command .= " $arguments"; $command .= " $arguments";
} }
@ -809,12 +816,8 @@ sub interpreter {
return "/msg $nick $ref_from$keyword is currently disabled."; return "/msg $nick $ref_from$keyword is currently disabled.";
} }
$action =~ s/\$nick/$nick/g; $action = $self->expand_factoid_vars($from, $tonick ? $tonick : $nick, $root_keyword, $action);
$action =~ s/\$channel/$from/g; $action = $self->expand_action_arguments($action, $arguments, $tonick ? $tonick : $nick);
$action =~ s/\$randomnick/my $random = $self->{pbot}->{nicklist}->random_nick($from); $random ? $random : $nick/ge;
$action =~ s/\$0\b/$root_keyword/g;
$action = $self->expand_factoid_vars($from, $root_keyword, $action);
if($self->{factoids}->hash->{$channel}->{$keyword}->{type} eq 'module') { if($self->{factoids}->hash->{$channel}->{$keyword}->{type} eq 'module') {
my $preserve_whitespace = $self->{factoids}->hash->{$channel}->{$keyword}->{preserve_whitespace}; my $preserve_whitespace = $self->{factoids}->hash->{$channel}->{$keyword}->{preserve_whitespace};