GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-26 13:59:47 +01:00
Code Issues Projects Releases Wiki Activity

Factoids: improve factoid variable expansion (now aware of --keyword-override and ref_from)

Browse Source
This commit is contained in:
Pragmatic Software 2019-12-14 10:09:28 -08:00
parent 75b7d05a69
commit eef14f68c9
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
PBot/Factoids.pm
View File

@ -412,12 +412,26 @@ sub expand_special_vars {
} }
sub expand_factoid_vars { sub expand_factoid_vars {
my ($self, $from, $nick, $root_keyword, $action, @exclude) = @_; my ($self, $stuff, @exclude) = @_;
$root_keyword = lc $root_keyword; my $from = length $stuff->{ref_from} ? $stuff->{ref_from} : $stuff->{from};
my $nick = $stuff->{nick};
my $root_keyword = $stuff->{keyword_override} ? $stuff->{keyword_override} : $stuff->{root_keyword};
my $action = $stuff->{action};
my $debug = 0; my $debug = 0;
my $depth = 0; my $depth = 0;
if ($debug) {
$self->{pbot}->{logger}->log("enter expand_factoid_vars\n");
use Data::Dumper;
$self->{pbot}->{logger}->log(Dumper $stuff);
}
if ($action =~ m/^\/call --keyword-override=([^ ]+)/i) {
$root_keyword = $1;
}
while (1) { while (1) {
last if ++$depth >= 1000; last if ++$depth >= 1000;
@ -513,6 +527,7 @@ sub expand_factoid_vars {
} }
when ('title') { when ('title') {
$mylist[$line] = ucfirst lc $mylist[$line]; $mylist[$line] = ucfirst lc $mylist[$line];
$mylist[$line] =~ s/ (\w)/' ' . uc $1/ge;
} }
when ('json') { when ('json') {
$mylist[$line] = $self->escape_json($mylist[$line]); $mylist[$line] = $self->escape_json($mylist[$line]);
@ -692,7 +707,8 @@ sub execute_code_factoid_using_vm {
$stuff->{no_nickoverride} = 0; $stuff->{no_nickoverride} = 0;
} }
$stuff->{code} = $self->expand_factoid_vars($stuff->{from}, $stuff->{nick}, $stuff->{root_keyword}, $stuff->{code}); $stuff->{action} = $stuff->{code};
$stuff->{code} = $self->expand_factoid_vars($stuff);
if ($self->{factoids}->hash->{$stuff->{channel}}->{$stuff->{keyword}}->{'allow_empty_args'}) { if ($self->{factoids}->hash->{$stuff->{channel}}->{$stuff->{keyword}}->{'allow_empty_args'}) {
$stuff->{code} = $self->expand_action_arguments($stuff->{code}, $stuff->{arguments}, ''); $stuff->{code} = $self->expand_action_arguments($stuff->{code}, $stuff->{arguments}, '');
@ -921,9 +937,11 @@ sub handle_action {
$root_channel = $channel; $root_channel = $channel;
$root_keyword = $keyword; $root_keyword = $keyword;
} }
my $kw = length $self->{factoids}->hash->{$root_channel}->{$root_keyword}->{keyword_override} ? $self->{factoids}->hash->{$root_channel}->{$root_keyword}->{keyword_override} : $stuff->{root_keyword}; if (not length $stuff->{keyword_override} and length $self->{factoids}->hash->{$root_channel}->{$root_keyword}->{keyword_override}) {
$kw = $stuff->{keyword_override} if length $stuff->{keyword_override}; $stuff->{keyword_override} = $self->{factoids}->hash->{$root_channel}->{$root_keyword}->{keyword_override};
$action = $self->expand_factoid_vars($stuff->{from}, $stuff->{nick}, $kw, $action); }
$stuff->{action} = $action;
$action = $self->expand_factoid_vars($stuff);
} }
if (length $stuff->{arguments}) { if (length $stuff->{arguments}) {
@ -1010,9 +1028,11 @@ sub handle_action {
$root_channel = $channel; $root_channel = $channel;
$root_keyword = $keyword; $root_keyword = $keyword;
} }
my $kw = length $self->{factoids}->hash->{$root_channel}->{$root_keyword}->{keyword_override} ? $self->{factoids}->hash->{$root_channel}->{$root_keyword}->{keyword_override} : $stuff->{root_keyword}; if (not length $stuff->{keyword_override} and length $self->{factoids}->hash->{$root_channel}->{$root_keyword}->{keyword_override}) {
$kw = $stuff->{keyword_override} if length $stuff->{keyword_override}; $stuff->{keyword_override} = $self->{factoids}->hash->{$root_channel}->{$root_keyword}->{keyword_override};
$action = $self->expand_factoid_vars($stuff->{from}, $stuff->{nick}, $kw, $action); }
$stuff->{action} = $action;
$action = $self->expand_factoid_vars($stuff);
if ($self->{factoids}->hash->{$channel}->{$keyword}->{'allow_empty_args'}) { if ($self->{factoids}->hash->{$channel}->{$keyword}->{'allow_empty_args'}) {
$action = $self->expand_action_arguments($action, $stuff->{arguments}, ''); $action = $self->expand_action_arguments($action, $stuff->{arguments}, '');