GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-01-25 19:44:26 +01:00
Code Issues Projects Releases Wiki Activity

FactoidCommands: factshow now accepts -p option to paste contents

Browse Source
This commit is contained in:
Pragmatic Software 2019-06-30 20:12:41 -07:00
parent dea44fb405
commit f34cf704cc
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
PBot/FactoidCommands.pm
View File

@ -1132,16 +1132,38 @@ sub factshow {
$stuff->{preserve_whitespace} = 1; $stuff->{preserve_whitespace} = 1;
my ($chan, $trig) = $self->{pbot}->{interpreter}->split_args($stuff->{arglist}, 2); my $usage = "Usage: factshow [-p] [channel] <keyword>; -p to paste";
return $usage if not $arguments;
my $getopt_error;
local $SIG{__WARN__} = sub {
$getopt_error = shift;
chomp $getopt_error;
};
my ($paste);
my ($ret, $args) = GetOptionsFromString($arguments,
'p' => \$paste);
return "/say $getopt_error -- $usage" if defined $getopt_error;
return "Too many arguments -- $usage" if @$args > 2;
return "Missing argument -- $usage" if not @$args;
my ($chan, $trig) = @$args;
if (not defined $trig) { if (not defined $trig) {
$trig = $chan;
$chan = $from; $chan = $from;
} }
my ($channel, $trigger) = $self->find_factoid_with_optional_channel($from, $arguments, 'factshow'); $args = join(' ', map { $_ = "'$_'" if $_ =~ m/ /; $_; } @$args);
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: " . $factoids->{$channel}->{$trigger}->{action};
@ -1154,7 +1176,6 @@ sub factshow {
$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;
} }