mirror of
https://github.com/pragma-/pbot.git
synced 2024-10-05 02:48:50 +02:00
FactoidCommands: improve output of factshow -p to be more like it was without -p
This commit is contained in:
parent
f34cf704cc
commit
8f98d3d55c
@ -1160,13 +1160,19 @@ sub factshow {
|
|||||||
my ($channel, $trigger) = $self->find_factoid_with_optional_channel($from, $args, 'factshow', usage => $usage);
|
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
|
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 $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') {
|
if ($factoids->{$channel}->{$trigger}->{type} eq 'module') {
|
||||||
$result .= ' [module]';
|
$result .= ' [module]';
|
||||||
@ -1174,7 +1180,6 @@ sub factshow {
|
|||||||
|
|
||||||
$channel = 'global' if $channel eq '.*';
|
$channel = 'global' if $channel eq '.*';
|
||||||
$chan = 'global' if $chan eq '.*';
|
$chan = 'global' if $chan eq '.*';
|
||||||
|
|
||||||
$result = "[$channel] $result" if $channel ne $chan;
|
$result = "[$channel] $result" if $channel ne $chan;
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user