3
0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-25 12:12:34 +01:00

Plugins/Weather: weather can now accept a -u option to specify user account

This commit is contained in:
Pragmatic Software 2020-01-29 12:02:08 -08:00
parent 3f0b73a3b9
commit 71031b88a7

View File

@ -16,6 +16,7 @@ use feature 'unicode_strings';
use LWP::UserAgent::WithCache; use LWP::UserAgent::WithCache;
use XML::LibXML; use XML::LibXML;
use Getopt::Long qw(GetOptionsFromString);
use Carp (); use Carp ();
sub new { sub new {
@ -40,12 +41,35 @@ sub unload {
sub weathercmd { sub weathercmd {
my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_; my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_;
my $location_override = $self->{pbot}->{users}->get_loggedin_user_metadata($from, "$nick!$user\@$host", 'location') // ''; my $usage = "Usage: weather [-u <user account>] <location>";
Getopt::Long::Configure("bundling");
my $getopt_error;
local $SIG{__WARN__} = sub {
$getopt_error = shift;
chomp $getopt_error;
};
my ($user_override, $show_usage);
my ($ret, $args) = GetOptionsFromString($arguments,
'u=s' => \$user_override,
'h' => \$show_usage
);
return $usage if $show_usage;
return "/say $getopt_error -- $usage" if defined $getopt_error;
$arguments = "@$args";
my $hostmask = defined $user_override ? $user_override : "$nick!$user\@$host";
my $location_override = $self->{pbot}->{users}->get_loggedin_user_metadata($from, $hostmask, 'location') // '';
$arguments = $location_override if not length $arguments; $arguments = $location_override if not length $arguments;
if (defined $user_override and not length $location_override) {
return "User account $user_override not found.";
}
if (not length $arguments) { if (not length $arguments) {
return "Usage: weather <location>"; return $usage;
} }
return $self->get_weather($arguments); return $self->get_weather($arguments);