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

Factoids: do not prefix nick if action has $args

This commit is contained in:
Pragmatic Software 2022-07-08 09:11:16 -07:00
parent a170b28a8b
commit 833c20efbb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/PBot/Core/Factoids/Interpreter.pm
View File

@ -343,11 +343,11 @@ sub handle_action {
$context->{arguments} = '';
$context->{original_arguments} = '';
} else {
# set nickprefix if args is a present nick and factoid action doesn't have $nick
if ($self->{pbot}->{factoids}->{data}->{storage}->get_data($channel, $keyword, 'type') eq 'text') {
# set nickprefix if args is a present nick and factoid action doesn't have $nick or $args
if (!$context->{nickprefix_disabled} && $self->{pbot}->{factoids}->{data}->{storage}->get_data($channel, $keyword, 'type') eq 'text') {
my $target = $self->{pbot}->{nicklist}->is_present_similar($context->{from}, $context->{arguments});
if ($target and $action !~ /\$\{?nick\b/) {
if ($target and $action !~ /\$\{?(?:nick|args)\b/) {
$context->{nickprefix} = $target unless $context->{nickprefix_forced};
$context->{nickprefix_disabled} = 0;
}