Simp-O-Matic

commit 77adfd61b9b4c8fe94850be9850f8b55134b920a
parent 332b8b5b153bd5bd402a6b2f61188be3abf1c41c
Author: Demonstrandum <moi@knutsen.co>
Date:   Mon, 23 Mar 2020 16:38:34 +0000

Add yandex and darksky APU to secrets JSON.

Diffstat:
M
lib/commands/weather.ts
 | 
5
+++++

1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/lib/commands/weather.ts b/lib/commands/weather.ts
@@ -49,8 +49,13 @@ export default (home_scope: HomeScope) => {
 					.addFields(
 						{ name: 'daytime',   value: d.main.temp_max + '°C', inline: true },
 						{ name: 'nighttime', value: d.main.temp_min + '°C', inline: true },
+<<<<<<< HEAD
 						{ name: 'humidity',   value: d.main.humidity +  '%', inline: true },
 						{ name: 'wind', value: `${directions[Math.round(d.wind.deg / 45) % directions.length]}, ${d.wind.speed} ㎧`, inline: true })
+=======
+						{ name: 'humidity',   value: d.main.humidity +  '%' },
+						{ name: 'wind', value: `${directions[Math.round(d.wind.deg / 45)]} ${d.wind.speed} ㎧`, inline: true })
+>>>>>>> 718b951691d49b76925537e413e56c746b9f08bb
 				: new MessageEmbed()
 					.setTitle(`Cannot get weather information from ${location}.`);