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

Plugins/Wttr.pm: show nearest_area only when -location is requested

Browse Source
This commit is contained in:
Pragmatic Software 2021-04-04 23:15:23 -07:00
parent f6c870539d
commit 6bc9e9cf88
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Plugins/Wttr.pm
View File

@ -142,21 +142,9 @@ sub get_wttr {
return $error;
}
if (exists $wttr->{nearest_area}) {
my $areaName = $wttr->{nearest_area}->[0]->{areaName}->[0]->{value};
my $region = $wttr->{nearest_area}->[0]->{region}->[0]->{value};
my $country = $wttr->{nearest_area}->[0]->{country}->[0]->{value};
$location = '';
$location .= "$areaName, " if length $areaName;
$location .= "$region, " if length $region and $region ne $areaName;
$location .= "$country, " if length $country;
$location =~ s/, $//;
} else {
# title-case location
$location = ucfirst lc $location;
$location =~ s/( |\.)(\w)/$1 . uc $2/ge;
}
# title-case location
$location = ucfirst lc $location;
$location =~ s/( |\.)(\w)/$1 . uc $2/ge;
$location =~ s/United States of America/USA/;
@ -321,7 +309,21 @@ sub get_wttr {
when ('time') { $result .= "Observation time: $c->{'localObsDateTime'}; "; }
when ('location') {
$result .= "Observation location: $location";
if (exists $wttr->{nearest_area}) {
my $areaName = $wttr->{nearest_area}->[0]->{areaName}->[0]->{value};
my $region = $wttr->{nearest_area}->[0]->{region}->[0]->{value};
my $country = $wttr->{nearest_area}->[0]->{country}->[0]->{value};
my $location = '';
$location .= "$areaName, " if length $areaName;
$location .= "$region, " if length $region and $region ne $areaName;
$location .= "$country, " if length $country;
$location =~ s/, $//;
$result .= "Observation location: $location";
} else {
$result .= "Query location: $location";
}
}
when ('population') {