GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-02 17:09:30 +01:00
Code Issues Projects Releases Wiki Activity

Fix factoid channel reference tag duplication

Browse Source
This commit is contained in:
Pragmatic Software 2017-11-20 16:12:13 -08:00
parent 767c0e7532
commit ba970cbc18
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PBot/Factoids.pm
View File

@ -738,8 +738,6 @@ sub interpreter {
if (not $stuff->{ref_from} or $stuff->{ref_from} eq '.*') { if (not $stuff->{ref_from} or $stuff->{ref_from} eq '.*') {
$stuff->{ref_from} = ""; $stuff->{ref_from} = "";
} else {
$stuff->{ref_from} = "[$stuff->{ref_from}] ";
} }
if (defined $channel and not $channel eq '.*' and not lc $channel eq $stuff->{from}) { if (defined $channel and not $channel eq '.*' and not lc $channel eq $stuff->{from}) {
@ -950,7 +948,12 @@ sub handle_action {
$stuff->{root_keyword} = $keyword unless defined $stuff->{root_keyword}; $stuff->{root_keyword} = $keyword unless defined $stuff->{root_keyword};
$stuff->{root_channel} = $channel; $stuff->{root_channel} = $channel;
return $stuff->{ref_from} . $self->{factoidmodulelauncher}->execute_module($stuff); my $result = $self->{factoidmodulelauncher}->execute_module($stuff);
if (length $result) {
return $stuff->{ref_from} . $result;
} else {
return "";
}
} }
elsif ($self->{factoids}->hash->{$channel}->{$keyword}->{type} eq 'text') { elsif ($self->{factoids}->hash->{$channel}->{$keyword}->{type} eq 'text') {
# Don't allow user-custom /msg factoids, unless factoid triggered by admin # Don't allow user-custom /msg factoids, unless factoid triggered by admin
@ -1020,7 +1023,11 @@ sub handle_action {
return ""; return "";
} }
if (length $result) {
return $stuff->{ref_from} . $result; return $stuff->{ref_from} . $result;
} else {
return "";
}
} else { } else {
$self->{pbot}->{logger}->log("($stuff->{from}): $stuff->{nick}!$stuff->{user}\@$stuff->{host}): Unknown command type for '$keyword'\n"); $self->{pbot}->{logger}->log("($stuff->{from}): $stuff->{nick}!$stuff->{user}\@$stuff->{host}): Unknown command type for '$keyword'\n");
return "/me blinks." . " $stuff->{ref_from}"; return "/me blinks." . " $stuff->{ref_from}";