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

FactoidCommands: improve output of factshow -p to be more like it was without -p

Browse Source
This commit is contained in:
Pragmatic Software 2019-06-30 20:21:09 -07:00
parent f34cf704cc
commit 8f98d3d55c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PBot/FactoidCommands.pm
View File

@ -1160,13 +1160,19 @@ sub factshow {
my ($channel, $trigger) = $self->find_factoid_with_optional_channel($from, $args, 'factshow', usage => $usage);
return $channel if not defined $trigger; # if $trigger is not defined, $channel is an error message
if ($paste) {
return $self->{pbot}->{webpaste}->paste($factoids->{$channel}->{$trigger}->{action});
}
my $trigger_text = $trigger =~ / / ? "\"$trigger\"" : $trigger;
my $result = "$trigger_text: " . $factoids->{$channel}->{$trigger}->{action};
my $result = "$trigger_text: ";
if ($paste) {
$result .= $self->{pbot}->{webpaste}->paste($factoids->{$channel}->{$trigger}->{action});
$channel = 'global' if $channel eq '.*';
$chan = 'global' if $chan eq '.*';
$result = "[$channel] $result" if $channel ne $chan;
return $result;
}
$result .= $factoids->{$channel}->{$trigger}->{action};
if ($factoids->{$channel}->{$trigger}->{type} eq 'module') {
$result .= ' [module]';
@ -1174,7 +1180,6 @@ sub factshow {
$channel = 'global' if $channel eq '.*';
$chan = 'global' if $chan eq '.*';
$result = "[$channel] $result" if $channel ne $chan;
return $result;
}