dominic/aprs-discord-bot
1
0
Fork 0
Code Releases Activity

fixed empty fields containing units

Browse source
This commit is contained in:
blakewenloe 2019-07-04 17:20:22 -04:00
parent c29625bf49
commit 05fb19d528
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/getWeather.js
View file

@ -36,30 +36,38 @@ function getWeather(callsign, message) {
);
return;
} else {
let temp = data.entries[0].temp || "Not available";
let temp = data.entries[0].temp
? `${data.entries[0].temp}C`
: "Not available";
let pressure = data.entries[0].pressure || "Not available";
let humidity = data.entries[0].humidity || "Not available";
let wind_direction = data.entries[0].wind_direction || "Not available";
let wind_speed = data.entries[0].wind_speed || "Not available";
let wind_gust = data.entries[0].wind_gust || "Not available";
let rain_1h = data.entries[0].rain_1h || "Not available";
let rain_24h = data.entries[0].rain_24h || "Not available";
let rain_mn = data.entries[0].rain_mn || "Not available";
let rain_1h = data.entries[0].rain_1h
? `${data.entries[0].rain_1h}mm`
: "Not available";
let rain_24h = data.entries[0].rain_24h
? `${data.entries[0].rain_24h}mm`
: "Not available";
let rain_mn = data.entries[0].rain_mn
? `${data.entries[0].rain_mn}mm`
: "Not available";
let luminosity = data.entries[0].luminosity || "Not available";
timeUpdated = new Date(data.entries[0].time * 1000);
let miniMapUrl = `http://www2.findu.com/cgi-bin/radar-find.cgi?call=${callsign}`;
let miniMapUrl = `http://www.findu.com/cgi-bin/radar-find.cgi?call=${callsign}`;
let locationEmbed = new Discord.RichEmbed()
.setColor(config.embed_color)
.setAuthor("APRS Bot")
.addField("Temp", `${temp}C`)
.addField("Temp", temp)
.addField("Pressure", pressure)
.addField("Humidity", humidity)
.addField("Wind direction", wind_direction)
.addField("Wind speed", wind_speed)
.addField("Wind gust", wind_gust)
.addField("Rainfall past 1hr", `${rain_1h}mm`)
.addField("Rainfall past 24hrs", `${rain_1h}mm`)
.addField("Rainfall since midnight", `${rain_mn}mm`)
.addField("Rainfall past 1hr", rain_1h)
.addField("Rainfall past 24hrs", rain_1h)
.addField("Rainfall since midnight", rain_mn)
.addField("Luminosity", luminosity)
.addField("Time", timeUpdated.toLocaleString("en-US", dateOptions))
.setImage(miniMapUrl)