From d003a326aa04484eb336cf62da2a27b835c6cd00 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Sun, 22 May 2022 17:12:57 -0700 Subject: [PATCH] Plugins/Wttr: add -conditions to default option --- lib/PBot/Plugin/Wttr.pm | 12 +++++------- lib/PBot/VERSION.pm | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/PBot/Plugin/Wttr.pm b/lib/PBot/Plugin/Wttr.pm index a1e85693..ef1d4c63 100644 --- a/lib/PBot/Plugin/Wttr.pm +++ b/lib/PBot/Plugin/Wttr.pm @@ -196,13 +196,11 @@ sub get_wttr { } } - if ($sep eq '') { - $result .= "Cloud cover: $c->{'cloudcover'}%; Visibility: $c->{'visibility'}km; "; - $result .= "Wind: $c->{'windspeedKmph'}kph/$c->{'windspeedMiles'}mph $c->{'winddirDegree'}°/$c->{'winddir16Point'}; "; - $result .= "Humidity: $c->{'humidity'}%; Precip: $c->{'precipMM'}mm; Pressure: $c->{'pressure'}hPa; UV Index: $c->{'uvIndex'}"; - } else { - $result .= $conditions; - } + $result .= "$conditions; " if length $sep; + + $result .= "Cloud cover: $c->{'cloudcover'}%; Visibility: $c->{'visibility'}km; "; + $result .= "Wind: $c->{'windspeedKmph'}kph/$c->{'windspeedMiles'}mph $c->{'winddirDegree'}°/$c->{'winddir16Point'}; "; + $result .= "Humidity: $c->{'humidity'}%; Precip: $c->{'precipMM'}mm; Pressure: $c->{'pressure'}hPa; UV Index: $c->{'uvIndex'}"; $result .= ";\n"; } diff --git a/lib/PBot/VERSION.pm b/lib/PBot/VERSION.pm index c97be039..41e79a65 100644 --- a/lib/PBot/VERSION.pm +++ b/lib/PBot/VERSION.pm @@ -25,8 +25,8 @@ use PBot::Imports; # These are set by the /misc/update_version script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 4534, - BUILD_DATE => "2022-05-01", + BUILD_REVISION => 4536, + BUILD_DATE => "2022-05-22", }; sub initialize {}